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

Fixed https://bugs.vcmi.eu/view.php?id=2998

Browse Source
This commit is contained in:
AlexVinS 2018-08-12 15:01:05 +03:00
parent b56f862094
commit de5f1461ba
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AI/VCAI/VCAI.cpp
View File

@ -551,9 +551,10 @@ void VCAI::objectPropertyChanged(const SetObjectProperty * sop)
void VCAI::buildChanged(const CGTownInstance * town, BuildingID buildingID, int what) void VCAI::buildChanged(const CGTownInstance * town, BuildingID buildingID, int what)
{ {
LOG_TRACE_PARAMS(logAi, "what '%i'", what); LOG_TRACE_PARAMS(logAi, "what '%i'", what);
if (town->getOwner() == playerID && what == 1) //built
completeGoal(sptr(Goals::BuildThis(buildingID, town)));
NET_EVENT_HANDLER; NET_EVENT_HANDLER;
if(town->getOwner() == playerID && what == 1) //built
completeGoal(sptr(Goals::BuildThis(buildingID, town)));
} }
void VCAI::heroBonusChanged(const CGHeroInstance * hero, const Bonus & bonus, bool gain) void VCAI::heroBonusChanged(const CGHeroInstance * hero, const Bonus & bonus, bool gain)
@ -705,6 +706,7 @@ void VCAI::showGarrisonDialog(const CArmedInstance * up, const CGHeroInstance *
void VCAI::showMapObjectSelectDialog(QueryID askID, const Component & icon, const MetaString & title, const MetaString & description, const std::vector<ObjectInstanceID> & objects) void VCAI::showMapObjectSelectDialog(QueryID askID, const Component & icon, const MetaString & title, const MetaString & description, const std::vector<ObjectInstanceID> & objects)
{ {
NET_EVENT_HANDLER;
status.addQuery(askID, "Map object select query"); status.addQuery(askID, "Map object select query");
requestActionASAP([=](){ answerQuery(askID, 0); }); requestActionASAP([=](){ answerQuery(askID, 0); });
@ -841,7 +843,7 @@ void VCAI::mainLoop()
invalidPathHeroes.clear(); invalidPathHeroes.clear();
while (basicGoals.size()) while (basicGoals.size())
{ {
vstd::removeDuplicates(basicGoals); //TODO: container which does this automagically without has would be nice vstd::removeDuplicates(basicGoals); //TODO: container which does this automagically without has would be nice
goalsToAdd.clear(); goalsToAdd.clear();
@ -893,7 +895,7 @@ void VCAI::mainLoop()
throw cannotFulfillGoalException("Goal %s is neither abstract nor elementar!" + basicGoal->name()); throw cannotFulfillGoalException("Goal %s is neither abstract nor elementar!" + basicGoal->name());
} }
} }
//now choose one elementar goal to realize //now choose one elementar goal to realize
Goals::TGoalVec possibleGoals(elementarGoals.begin(), elementarGoals.end()); //copy to vector Goals::TGoalVec possibleGoals(elementarGoals.begin(), elementarGoals.end()); //copy to vector
Goals::TSubgoal goalToRealize = sptr(Goals::Invalid()); Goals::TSubgoal goalToRealize = sptr(Goals::Invalid());
@ -1418,7 +1420,7 @@ void VCAI::wander(HeroPtr h)
dests.push_back(*boost::max_element(townsReachable, compareReinforcements)); dests.push_back(*boost::max_element(townsReachable, compareReinforcements));
} }
else if(townsNotReachable.size()) else if(townsNotReachable.size())
{ {
//TODO pick the truly best //TODO pick the truly best
const CGTownInstance * t = *boost::max_element(townsNotReachable, compareReinforcements); const CGTownInstance * t = *boost::max_element(townsNotReachable, compareReinforcements);
logAi->debug("%s can't reach any town, we'll try to make our way to %s at %s", h->name, t->name, t->visitablePos().toString()); logAi->debug("%s can't reach any town, we'll try to make our way to %s at %s", h->name, t->name, t->visitablePos().toString());
@ -2085,7 +2087,7 @@ void VCAI::tryRealize(Goals::Trade & g) //trade
logAi->debug("Traded %d of %s for %d of %s at %s", toGive, res, toGet, g.resID, obj->getObjectName()); logAi->debug("Traded %d of %s for %d of %s at %s", toGive, res, toGet, g.resID, obj->getObjectName());
accquiredResources += toGet; //FIXME: this is incorrect, always equal to 1 accquiredResources += toGet; //FIXME: this is incorrect, always equal to 1
} }
//if (accquiredResources >= g.value) //if (accquiredResources >= g.value)
if (ah->freeResources()[g.resID] >= g.value) if (ah->freeResources()[g.resID] >= g.value)
throw goalFulfilledException(sptr(g)); //we traded all we needed throw goalFulfilledException(sptr(g)); //we traded all we needed
} }
@ -2118,7 +2120,7 @@ void VCAI::tryRealize(Goals::BuyArmy & g)
{ {
auto ci = infoFromDC(t->creatures[i]); auto ci = infoFromDC(t->creatures[i]);
ci.level = i; //this is important for Dungeon Summoning Portal ci.level = i; //this is important for Dungeon Summoning Portal
creaturesInDwellings.push_back(ci); creaturesInDwellings.push_back(ci);
} }
vstd::erase_if(creaturesInDwellings, [](const creInfo & ci) -> bool vstd::erase_if(creaturesInDwellings, [](const creInfo & ci) -> bool
{ {