games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

check amount of artifacts on hero when checking requirements of a quest that requires artifact(s)

Browse Source 
fixes case when 2 or more identical artifacts are required
This commit is contained in:
Andrey Filipenkov
2022-10-01 09:28:32 +03:00
parent 86708841f8
commit aa217236b3
6 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/CArtHandler.cpp
View File

@@ -1191,18 +1191,27 @@ CArtifactInstance* CArtifactSet::getArt(ArtifactPosition pos, bool excludeLocked
ArtifactPosition CArtifactSet::getArtPos(int aid, bool onlyWorn, bool allowLocked) const
{
const auto result = getAllArtPositions(aid, onlyWorn, allowLocked, false);
return result.empty() ? ArtifactPosition{ArtifactPosition::PRE_FIRST} : result[0];
}
std::vector<ArtifactPosition> CArtifactSet::getAllArtPositions(int aid, bool onlyWorn, bool allowLocked, bool getAll) const
{
std::vector<ArtifactPosition> result;
for(auto i = artifactsWorn.cbegin(); i != artifactsWorn.cend(); i++)
if(i->second.artifact->artType->id == aid && (allowLocked || !i->second.locked))
return i->first;
result.push_back(i->first);
if(onlyWorn)
return ArtifactPosition::PRE_FIRST;
return result;
if(!getAll && !result.empty())
return result;
for(int i = 0; i < artifactsInBackpack.size(); i++)
if(artifactsInBackpack[i].artifact->artType->id == aid)
return ArtifactPosition(GameConstants::BACKPACK_START + i);
result.push_back(ArtifactPosition(GameConstants::BACKPACK_START + i));
return ArtifactPosition::PRE_FIRST;
return result;
}
ArtifactPosition CArtifactSet::getArtPos(const CArtifactInstance *art) const
@@ -1237,8 +1246,19 @@ bool CArtifactSet::hasArt(
bool searchBackpackAssemblies,
bool allowLocked) const
{
return getArtPos(aid, onlyWorn, allowLocked) != ArtifactPosition::PRE_FIRST ||
(searchBackpackAssemblies && getHiddenArt(aid));
return getArtPosCount(aid, onlyWorn, searchBackpackAssemblies, allowLocked) > 0;
}
unsigned CArtifactSet::getArtPosCount(int aid, bool onlyWorn, bool searchBackpackAssemblies, bool allowLocked) const
{
const auto allPositions = getAllArtPositions(aid, onlyWorn, allowLocked, true);
if(!allPositions.empty())
return allPositions.size();
if(searchBackpackAssemblies && getHiddenArt(aid))
return 1;
return 0;
}
std::pair<const CCombinedArtifactInstance *, const CArtifactInstance *>