games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

CArtifactSet cleanup

Browse Source
This commit is contained in:
SoundSSGood
2024-09-19 16:51:59 +03:00
parent b9ae7f1138
commit 586a32a616
14 changed files with 112 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/rewardable/Limiter.cpp
View File

@ -143,10 +143,28 @@ bool Rewardable::Limiter::heroAllowed(const CGHeroInstance * hero) const
for(const auto & elem : artifactsRequirements)
{
// check required amount of artifacts
if(hero->getArtPosCount(elem.first, false, true, true) < elem.second)
size_t artCnt = 0;
for(const auto & [slot, slotInfo] : hero->artifactsWorn)
if(slotInfo.artifact->getTypeId() == elem.first)
artCnt++;
for(auto & slotInfo : hero->artifactsInBackpack)
if(slotInfo.artifact->getTypeId() == elem.first)
{
artCnt++;
}
else if(slotInfo.artifact->isCombined())
{
for(const auto & partInfo : slotInfo.artifact->getPartsInfo())
if(partInfo.art->getTypeId() == elem.first)
artCnt++;
}
if(artCnt < elem.second)
return false;
if(!hero->hasArt(elem.first))
reqSlots += hero->getAssemblyByConstituent(elem.first)->getPartsInfo().size() - 2;
// Check if art has no own slot. (As part of combined in backpack)
if(hero->getArtPos(elem.first, false) == ArtifactPosition::PRE_FIRST)
reqSlots += hero->getCombinedArtWithPart(elem.first)->getPartsInfo().size() - 2;
}
if(!ArtifactUtils::isBackpackFreeSlots(hero, reqSlots))
return false;