games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge pull request #7413 from vsos11434/AI-find-you

Browse Source 
Fix Nullkiller AI failing to explore isolated map layers via teleports
This commit is contained in:
Ivan Savenko
2026-06-07 00:01:50 +03:00
committed by GitHub
parent a09db48a4c db6aa02ea2
commit 0419a02567
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AI/Nullkiller2/Behaviors/ExplorationBehavior.cpp
+19 -13
View File
@@ -8,16 +8,16 @@
*
*/
#include "StdInc.h"
#include "ExplorationBehavior.h"
#include "../AIGateway.h"
#include "../AIUtility.h"
#include "../Goals/Invalid.h"
#include "../Goals/CaptureObject.h"
#include "../Goals/Composition.h"
#include "../Goals/ExecuteHeroChain.h"
#include "../Markers/ExplorationPoint.h"
#include "../Goals/CaptureObject.h"
#include "../Goals/ExploreNeighbourTile.h"
#include "../Goals/Invalid.h"
#include "../Helpers/ExplorationHelper.h"
#include "../Markers/ExplorationPoint.h"
#include "ExplorationBehavior.h"
namespace NK2AI
{
@@ -33,19 +33,19 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * aiNk) const
{
Goals::TGoalVec tasks;
for (const ObjectInstanceID objId : aiNk->memory->visitableObjs)
for(const ObjectInstanceID objId : aiNk->memory->visitableObjs)
{
const CGObjectInstance * obj = aiNk->cc->getObjInstance(objId);
if(!obj)
continue;
switch (obj->ID.num)
switch(obj->ID.num)
{
case Obj::REDWOOD_OBSERVATORY:
case Obj::PILLAR_OF_FIRE:
{
auto rObj = dynamic_cast<const CRewardableObject*>(obj);
if (!rObj->wasScouted(aiNk->playerID))
auto rObj = dynamic_cast<const CRewardableObject *>(obj);
if(!rObj->wasScouted(aiNk->playerID))
tasks.push_back(sptr(Composition().addNext(ExplorationPoint(obj->visitablePos(), 200)).addNext(CaptureObject(obj))));
break;
}
@@ -54,16 +54,22 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * aiNk) const
case Obj::SUBTERRANEAN_GATE:
case Obj::WHIRLPOOL:
{
const auto tObj = dynamic_cast<const CGTeleport*>(obj);
for (auto exit : aiNk->cc->getTeleportChannelExits(tObj->channel))
const auto tObj = dynamic_cast<const CGTeleport *>(obj);
for(auto exit : aiNk->cc->getTeleportChannelExits(tObj->channel))
{
if (exit != tObj->id)
if(exit != tObj->id)
{
// TODO: Mircea: Looks like a bug. Should use isVisibleFor with aiNk->playerID
if (!aiNk->cc->isVisible(aiNk->cc->getObjInstance(exit)))
const CGObjectInstance * exitObj = aiNk->cc->getObjInstance(exit);
// Please check for visible tile and not the visible object due to possible partial visibility
// checking the object itself might incorrectly abort the exploration of the fog behind it
if(exitObj && !aiNk->cc->isVisible(exitObj->visitablePos()))
{
tasks.push_back(sptr(Composition().addNext(ExplorationPoint(obj->visitablePos(), 50)).addNext(CaptureObject(obj))));
}
}
}
break;
}
}
}
AI/Nullkiller2/Engine/PriorityEvaluator.cpp
+8 -1
View File
@@ -822,7 +822,14 @@ public:
if(evaluationContext.evaluator.aiNk->cc->getTile(task->tile)->roadType != RoadId::NO_ROAD)
evaluationContext.explorePriority = 1;
if(evaluationContext.explorePriority == 0)
evaluationContext.explorePriority = 3;
{
if(tilesDiscovered >= 20)
evaluationContext.explorePriority = 1;
else if(tilesDiscovered >= 10)
evaluationContext.explorePriority = 2;
else
evaluationContext.explorePriority = 3;
}
}
};