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

Commiting some minor tweaks before next dev version.

Browse Source
This commit is contained in:
DjWarmonger 2014-02-23 16:55:42 +00:00
parent d66f0222f2
commit 94c8f01732
3 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AI/VCAI/Goals.cpp
View File

@ -486,7 +486,10 @@ TGoalVec ClearWayTo::getAllPossibleSubgoals()
if (topObj)
{
if (vstd::contains(ai->reservedObjs, topObj) && !vstd::contains(ai->reservedHeroesMap[h], topObj))
{
throw goalFulfilledException (sptr(Goals::ClearWayTo(tile, h)));
continue; //do not capure object reserved by other hero
}
if (topObj->ID == Obj::HERO && cb->getPlayerRelations(h->tempOwner, topObj->tempOwner) != PlayerRelations::ENEMIES)
if (topObj != hero.get(true)) //the hero we want to free
@ -523,7 +526,7 @@ TGoalVec ClearWayTo::getAllPossibleSubgoals()
if (ret.empty())
{
logAi->warnStream() << "There is no known way to clear the way to tile " + tile();
throw goalFulfilledException (sptr(*this)); //make sure asigned hero gets unlocked
throw goalFulfilledException (sptr(Goals::ClearWayTo(tile))); //make sure asigned hero gets unlocked
}
return ret;

88
AI/VCAI/VCAI.cpp
View File

@ -1409,7 +1409,7 @@ void VCAI::completeGoal (Goals::TSubgoal goal)
{
for (auto p : lockedHeroes)
{
if (p.second == goal || p.second->fulfillsMe(goal)) //we could have fulfilled goals of other heroes by chance
if (*(p.second) == *goal || p.second->fulfillsMe(goal)) //we could have fulfilled goals of other heroes by chance
{
logAi->debugStream() << boost::format("%s") % p.second->completeMessage();
lockedHeroes.erase (lockedHeroes.find(p.first)); //is it safe?
@ -2712,8 +2712,7 @@ void SectorMap::exploreNewSector(crint3 pos, int num)
{
auto obj = t->visitableObjects.front();
if (vstd::contains(ai->knownSubterraneanGates, obj))
{ //not really sure what does it do, but subtrranean gates do not make one sector
//toVisit.push(ai->knownSubterraneanGates[obj]->visitablePos());
{
s.subterraneanGates.push_back (obj);
}
}
@ -2875,10 +2874,13 @@ For ship construction etc, another function (goal?) is needed
int sourceSector = retreiveTile(h->visitablePos()),
destinationSector = retreiveTile(dst);
if(sourceSector != destinationSector)
const Sector *src = &infoOnSectors[sourceSector],
*dest = &infoOnSectors[destinationSector];
if(sourceSector != destinationSector) //use ships, shipyards etc..
{
const Sector *src = &infoOnSectors[sourceSector],
*dest = &infoOnSectors[destinationSector];
if (ai->isAccessibleForHero(dst, h)) //pathfinder can find a way using ships and gates if tile is not blocked by objects
return dst;
std::map<const Sector*, const Sector*> preds;
std::queue<const Sector *> sectorQueue;
@ -2918,8 +2920,6 @@ For ship construction etc, another function (goal?) is needed
if(!preds[dest])
{
//write("test.txt");
//ai->completeGoal (sptr(Goals::Explore(h))); //if we can't find the way, seemingly all tiles were explored
//TODO: more organized way?
return ret;
//throw cannotFulfillGoalException(boost::str(boost::format("Cannot find connection between sectors %d and %d") % src->id % dst->id));
@ -2934,7 +2934,9 @@ For ship construction etc, another function (goal?) is needed
if(preds[dest])
{
//TODO: would be nice to find sectors in loop
const Sector *sectorToReach = toTraverse.at(toTraverse.size() - 2);
if(!src->water && sectorToReach->water) //embark
{
//embark on ship -> look for an EP with a boat
@ -3022,6 +3024,12 @@ For ship construction etc, another function (goal?) is needed
}
else //use subterranean gates
{
//auto t = findFirstVisitableTile (h, dst);
//if (t.valid())
// return t;
//TODO: pop sectors linked by Subterranean Gate in loop
auto firstGate = boost::find_if(src->subterraneanGates, [=](const CGObjectInstance * gate) -> bool
{
//make sure no hero block the way
@ -3050,34 +3058,7 @@ For ship construction etc, another function (goal?) is needed
}
else
{
int3 curtile = dst;
while(curtile != h->visitablePos())
{
auto topObj = cb->getTopObj(curtile);
if (topObj && topObj->ID == Obj::HERO && topObj != h.h)
{
logAi->warnStream() << ("Another allied hero stands in our way");
return ret;
}
if(cb->getPathInfo(curtile)->reachable())
{
return curtile;
}
else
{
auto i = parent.find(curtile);
if(i != parent.end())
{
assert(curtile != i->second);
curtile = i->second;
}
else
{
return ret;
//throw cannotFulfillGoalException("Unreachable tile in sector? Should not happen!");
}
}
}
return findFirstVisitableTile(h, dst);
}
//FIXME: find out why this line is reached
@ -3085,6 +3066,41 @@ For ship construction etc, another function (goal?) is needed
return ret;
}
int3 SectorMap::findFirstVisitableTile (HeroPtr h, crint3 dst)
{
int3 ret(-1,-1,-1);
int3 curtile = dst;
while(curtile != h->visitablePos())
{
auto topObj = cb->getTopObj(curtile);
if (topObj && topObj->ID == Obj::HERO && topObj != h.h)
{
logAi->warnStream() << ("Another allied hero stands in our way");
return ret;
}
if(cb->getPathInfo(curtile)->reachable())
{
return curtile;
}
else
{
auto i = parent.find(curtile);
if(i != parent.end())
{
assert(curtile != i->second);
curtile = i->second;
}
else
{
return ret;
//throw cannotFulfillGoalException("Unreachable tile in sector? Should not happen!");
}
}
}
return ret;
}
void SectorMap::makeParentBFS(crint3 source)
{
parent.clear();

1
AI/VCAI/VCAI.h
View File

@ -110,6 +110,7 @@ struct SectorMap
void makeParentBFS(crint3 source);
int3 firstTileToGet(HeroPtr h, crint3 dst); //if h wants to reach tile dst, which tile he should visit to clear the way?
int3 findFirstVisitableTile(HeroPtr h, crint3 dst);
};
//Set of buildings for different goals. Does not include any prerequisites.