games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

- ResourceManager now returns abstract goal so it can be decomposed many times

Browse Source
This commit is contained in:
DJWarmonger 2018-07-26 16:15:37 +02:00
parent 1450d408a2
commit e5b979d4ad
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AI/VCAI/Goals.cpp
View File

@ -716,6 +716,7 @@ TGoalVec Explore::getAllPossibleSubgoals()
}
}
auto primaryHero = ai->primaryHero().h;
for(auto h : heroes)
{
auto sm = ai->getCachedSectorMap(h);
@ -734,15 +735,18 @@ TGoalVec Explore::getAllPossibleSubgoals()
}
else
{
ai->markHeroUnableToExplore(h); //there is no freely accessible tile, do not poll this hero anymore
//possible issues when gathering army to break
if(hero.h == h || (!hero && h == ai->primaryHero().h)) //check this only ONCE, high cost
//FIXME: possible issues when gathering army to break
if(hero.h == h || //exporation is assigned to this hero
(!hero && h == primaryHero)) //not assigned to specific hero, let our main hero do the job
{
t = ai->explorationDesperate(h);
if(t.valid()) //don't waste time if we are completely blocked
t = ai->explorationDesperate(h); //check this only ONCE, high cost
if (t.valid()) //don't waste time if we are completely blocked
{
ret.push_back(sptr(Goals::ClearWayTo(t, h).setisAbstract(true)));
continue;
}
}
ai->markHeroUnableToExplore(h); //there is no freely accessible tile, do not poll this hero anymore
}
}
//we either don't have hero yet or none of heroes can explore

3
AI/VCAI/ResourceManager.cpp
View File

@ -150,7 +150,8 @@ Goals::TSubgoal ResourceManager::collectResourcesForOurGoal(ResourceObjective &o
if (resourceType == Res::GOLD)
goalPriority *= 1000;
return Goals::sptr(Goals::CollectRes(resourceType, amountToCollect));
//this is abstract goal and might take soem time to complete
return Goals::sptr(Goals::CollectRes(resourceType, amountToCollect).setisAbstract(true));
}
Goals::TSubgoal ResourceManager::whatToDo() const //suggest any goal