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

Fixed what merge-conflict-handling had broken.

Browse Source 
Restored exploration-without relying on memory but with included whirlpool
This commit is contained in:
Xilmi
2024-07-24 15:21:17 +02:00
parent b83a214763
commit 34e4ab45ee
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
AI/Nullkiller/Behaviors/ExplorationBehavior.cpp
View File

@@ -33,7 +33,7 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * ai) const
{
Goals::TGoalVec tasks;
for(auto obj : ai->memory->visitableObjs)
for (auto obj : ai->memory->visitableObjs)
{
switch (obj->ID.num)
{
@@ -41,7 +41,7 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * ai) const
case Obj::PILLAR_OF_FIRE:
{
auto rObj = dynamic_cast<const CRewardableObject*>(obj);
if(!rObj->wasScouted(ai->playerID))
if (!rObj->wasScouted(ai->playerID))
tasks.push_back(sptr(Composition().addNext(ExplorationPoint(obj->visitablePos(), 200)).addNext(CaptureObject(obj))));
break;
}
@@ -50,10 +50,8 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * ai) const
case Obj::SUBTERRANEAN_GATE:
case Obj::WHIRLPOOL:
{
auto tObj = dynamic_cast<const CGTeleport *>(obj);
if(TeleportChannel::IMPASSABLE == ai->memory->knownTeleportChannels[tObj->channel]->passability)
break;
for(auto exit : ai->memory->knownTeleportChannels[tObj->channel]->exits)
auto tObj = dynamic_cast<const CGTeleport*>(obj);
for (auto exit : cb->getTeleportChannelExits(tObj->channel))
{
if (exit != tObj->id)
{
@@ -63,7 +61,6 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * ai) const
}
}
}
}
auto heroes = ai->cb->getHeroesInfo();