games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Merge pull request #5652 from kdmcser/hang_fix

Browse Source 
Prevent AI from repeatedly swapping the same artifacts
This commit is contained in:
Ivan Savenko
2025-04-27 13:56:11 +03:00
committed by GitHub
parent 3921b9e214 9dc07b00ff
commit 4f20bc102b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
AI/Nullkiller/AIGateway.cpp
View File

@@ -1039,6 +1039,7 @@ void AIGateway::pickBestArtifacts(const CGHeroInstance * h, const CGHeroInstance
auto equipBest = [](const CGHeroInstance * h, const CGHeroInstance * otherh, bool giveStuffToFirstHero) -> void
{
bool changeMade = false;
std::set<std::pair<CArtifactInstance *, CArtifactInstance *> > swappedSet;
do
{
changeMade = false;
@@ -1119,6 +1120,15 @@ void AIGateway::pickBestArtifacts(const CGHeroInstance * h, const CGHeroInstance
//combined artifacts are not always allowed to move
if(artifactScore > otherArtifactScore && artifact->canBePutAt(target, slot, true))
{
auto swapPair = std::minmax(artifact, otherSlot->artifact);
if (swappedSet.find(swapPair) != swappedSet.end())
{
logAi->warn(
"Artifacts % s < -> % s have already swapped before, ignored.",
artifact->getType()->getJsonKey(),
otherSlot->artifact->getType()->getJsonKey());
continue;
}
logAi->trace(
"Exchange artifacts %s <-> %s",
artifact->getType()->getJsonKey(),
@@ -1138,6 +1148,7 @@ void AIGateway::pickBestArtifacts(const CGHeroInstance * h, const CGHeroInstance
}
changeMade = true;
swappedSet.insert(swapPair);
break;
}
}