1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

assemble in backpack initial

This commit is contained in:
SoundSSGood
2022-11-17 19:43:54 +02:00
parent 1893212abb
commit 2d078132bf
5 changed files with 70 additions and 40 deletions

View File

@@ -4036,7 +4036,7 @@ bool CGameHandler::assembleArtifacts (ObjectInstanceID heroID, ArtifactPosition
CArtifact *combinedArt = VLC->arth->objects[assembleTo];
if (!combinedArt->constituents)
COMPLAIN_RET("assembleArtifacts: Artifact being attempted to assemble is not a combined artifacts!");
if (!vstd::contains(destArtifact->assemblyPossibilities(hero), combinedArt))
if (!vstd::contains(destArtifact->assemblyPossibilities(hero, true), combinedArt))
COMPLAIN_RET("assembleArtifacts: It's impossible to assemble requested artifact!");
if(ArtifactUtils::checkSpellbookIsNeeded(hero, assembleTo, artifactSlot))