1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
This commit is contained in:
SoundSSGood
2023-06-06 14:37:48 +03:00
parent ee8c8dca7b
commit f6c2d5cba7
5 changed files with 21 additions and 9 deletions

View File

@@ -1941,13 +1941,14 @@ void AssembledArtifact::applyGs(CGameState *gs)
if(!vstd::contains(combinedArt->artType->possibleSlots[artSet->bearerType()], al.slot)
&& vstd::contains(combinedArt->artType->possibleSlots[artSet->bearerType()], pos))
al.slot = pos;
if(al.slot == pos)
pos = ArtifactPosition::PRE_FIRST;
}
else
{
al.slot = std::min(al.slot, pos);
}
if(al.slot == pos)
pos = ArtifactPosition::PRE_FIRST;
}
combinedArt->addAsConstituent(constituentInstance, pos);
}