games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Fix for wander - AI sitting at town will buy troops.

Browse Source
This commit is contained in:
DJWarmonger 2018-07-27 07:20:08 +02:00
parent 301565b315
commit ea19716fb9
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
AI/VCAI/VCAI.cpp
View File

@ -1453,6 +1453,17 @@ bool VCAI::canRecruitAnyHero(const CGTownInstance * t) const
void VCAI::wander(HeroPtr h) void VCAI::wander(HeroPtr h)
{ {
auto visitTownIfAny = [this](HeroPtr h) -> bool
{
if (h->visitedTown)
{
townVisitsThisWeek[h].insert(h->visitedTown);
buildArmyIn(h->visitedTown);
return true;
}
};
//unclaim objects that are now dangerous for us //unclaim objects that are now dangerous for us
auto reservedObjsSetCopy = reservedHeroesMap[h]; auto reservedObjsSetCopy = reservedHeroesMap[h];
for(auto obj : reservedObjsSetCopy) for(auto obj : reservedObjsSetCopy)
@ -1585,26 +1596,23 @@ void VCAI::wander(HeroPtr h)
//wander should not cause heroes to be reserved - they are always considered free //wander should not cause heroes to be reserved - they are always considered free
logAi->debug("Of all %d destinations, object oid=%d seems nice", dests.size(), dest.id.getNum()); logAi->debug("Of all %d destinations, object oid=%d seems nice", dests.size(), dest.id.getNum());
if(!goVisitObj(dest, h)) if (!goVisitObj(dest, h))
{ {
if(!dest) if (!dest)
{ {
logAi->debug("Visit attempt made the object (id=%d) gone...", dest.id.getNum()); logAi->debug("Visit attempt made the object (id=%d) gone...", dest.id.getNum());
} }
else else
{ {
logAi->debug("Hero %s apparently used all MPs (%d left)", h->name, h->movement); logAi->debug("Hero %s apparently used all MPs (%d left)", h->name, h->movement);
return; break;
} }
} }
} else //we reached our destination
visitTownIfAny(h);
if(h->visitedTown)
{
townVisitsThisWeek[h].insert(h->visitedTown);
buildArmyIn(h->visitedTown);
} }
} }
visitTownIfAny(h); //in case hero is just sitting in town
} }
void VCAI::setGoal(HeroPtr h, Goals::TSubgoal goal) void VCAI::setGoal(HeroPtr h, Goals::TSubgoal goal)