1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00

cloned Nullkiller into Nullkiller2

This commit is contained in:
Mircea TheHonestCTO
2025-08-13 14:41:15 +02:00
parent a6df82c616
commit ffad6c6a43
249 changed files with 23306 additions and 377 deletions

View File

@@ -10,7 +10,7 @@
#include "StdInc.h"
#include "ExecuteHeroChain.h"
#include "../AIGateway.h"
#include "../Engine/Nullkiller.h"
#include "../Engine/Nullkiller2.h"
namespace NKAI
{
@@ -84,9 +84,9 @@ void ExecuteHeroChain::accept(AIGateway * ai)
{
logAi->debug("Executing hero chain towards %s. Path %s", targetName, chainPath.toString());
ai->nullkiller->setActive(chainPath.targetHero, tile);
ai->nullkiller->setTargetObject(objid);
ai->nullkiller->objectClusterizer->reset();
ai->nullkiller2->setActive(chainPath.targetHero, tile);
ai->nullkiller2->setTargetObject(objid);
ai->nullkiller2->objectClusterizer->reset();
auto targetObject = ai->myCb->getObj(static_cast<ObjectInstanceID>(objid), false);
@@ -96,7 +96,7 @@ void ExecuteHeroChain::accept(AIGateway * ai)
if(relations == PlayerRelations::ENEMIES)
{
ai->nullkiller->armyFormation->rearrangeArmyForSiege(
ai->nullkiller2->armyFormation->rearrangeArmyForSiege(
dynamic_cast<const CGTownInstance *>(targetObject),
chainPath.targetHero);
}
@@ -126,7 +126,7 @@ void ExecuteHeroChain::accept(AIGateway * ai)
if(vstd::contains(blockedIndexes, i))
{
blockedIndexes.insert(node->parentIndex);
ai->nullkiller->lockHero(hero, HeroLockedReason::HERO_CHAIN);
ai->nullkiller2->lockHero(hero, HeroLockedReason::HERO_CHAIN);
continue;
}
@@ -137,7 +137,7 @@ void ExecuteHeroChain::accept(AIGateway * ai)
{
if(hero->movementPointsRemaining() > 0)
{
ai->nullkiller->setActive(hero, node->coord);
ai->nullkiller2->setActive(hero, node->coord);
if(node->specialAction)
{
@@ -155,7 +155,7 @@ void ExecuteHeroChain::accept(AIGateway * ai)
return;
}
}
else if(i > 0 && ai->nullkiller->isObjectGraphAllowed())
else if(i > 0 && ai->nullkiller2->isObjectGraphAllowed())
{
auto chainMask = i < chainPath.nodes.size() - 1 ? chainPath.nodes[i + 1].chainMask : node->chainMask;
@@ -166,7 +166,7 @@ void ExecuteHeroChain::accept(AIGateway * ai)
if(nextNode.specialAction || nextNode.chainMask != chainMask)
break;
auto targetNode = ai->nullkiller->getPathsInfo(hero)->getPathInfo(nextNode.coord);
auto targetNode = ai->nullkiller2->getPathsInfo(hero)->getPathInfo(nextNode.coord);
if(!targetNode->reachable()
|| targetNode->getCost() > nextNode.cost)
@@ -182,7 +182,7 @@ void ExecuteHeroChain::accept(AIGateway * ai)
if(node->turns == 0 && node->coord != hero->visitablePos())
{
auto targetNode = ai->nullkiller->getPathsInfo(hero)->getPathInfo(node->coord);
auto targetNode = ai->nullkiller2->getPathsInfo(hero)->getPathInfo(node->coord);
if(targetNode->accessible == EPathAccessibility::NOT_SET
|| targetNode->accessible == EPathAccessibility::BLOCKED
@@ -239,13 +239,13 @@ void ExecuteHeroChain::accept(AIGateway * ai)
if(hero->movementPointsRemaining() > 0)
{
CGPath path;
bool isOk = ai->nullkiller->getPathsInfo(hero)->getPath(path, node->coord);
bool isOk = ai->nullkiller2->getPathsInfo(hero)->getPath(path, node->coord);
if(isOk && path.nodes.back().turns > 0)
{
logAi->warn("Hero %s has %d mp which is not enough to continue his way towards %s.", hero->getNameTranslated(), hero->movementPointsRemaining(), node->coord.toString());
ai->nullkiller->lockHero(hero, HeroLockedReason::HERO_CHAIN);
ai->nullkiller2->lockHero(hero, HeroLockedReason::HERO_CHAIN);
return;
}
}
@@ -270,7 +270,7 @@ void ExecuteHeroChain::accept(AIGateway * ai)
}
// no exception means we were not able to reach the tile
ai->nullkiller->lockHero(hero, HeroLockedReason::HERO_CHAIN);
ai->nullkiller2->lockHero(hero, HeroLockedReason::HERO_CHAIN);
blockedIndexes.insert(node->parentIndex);
}
catch(const goalFulfilledException &)