games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Artifact assembling changes

Browse Source
This commit is contained in:
SoundSSGood
2023-09-12 18:30:48 +03:00
parent 7f321b2fcb
commit 82eb2f8a2b
10 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ArtifactUtils.cpp
View File

@@ -116,7 +116,7 @@ DLL_LINKAGE bool ArtifactUtils::isBackpackFreeSlots(const CArtifactSet * target,
}
DLL_LINKAGE std::vector<const CArtifact*> ArtifactUtils::assemblyPossibilities(
const CArtifactSet * artSet, const ArtifactID & aid, bool equipped)
const CArtifactSet * artSet, const ArtifactID & aid)
{
std::vector<const CArtifact*> arts;
const auto * art = aid.toArtifact();
@@ -130,23 +130,10 @@ DLL_LINKAGE std::vector<const CArtifact*> ArtifactUtils::assemblyPossibilities(
for(const auto constituent : artifact->getConstituents()) //check if all constituents are available
{
if(equipped)
if(!artSet->hasArt(constituent->getId(), false, false, false))
{
// Search for equipped arts
if(!artSet->hasArt(constituent->getId(), true, false, false))
{
possible = false;
break;
}
}
else
{
// Search in backpack
if(!artSet->hasArtBackpack(constituent->getId()))
{
possible = false;
break;
}
possible = false;
break;
}
}
if(possible)