games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Remove hardcoded checks for town portal from AI code

Browse Source
This commit is contained in:
Ivan Savenko
2025-07-11 18:03:18 +03:00
parent f51c7c5c28
commit b1aff17e82
10 changed files with 82 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
AI/VCAI/Pathfinding/AINodeStorage.cpp
View File

@@ -15,6 +15,8 @@
#include "../../../lib/pathfinder/CPathfinder.h"
#include "../../../lib/pathfinder/PathfinderOptions.h"
#include "../../../lib/pathfinder/PathfinderUtil.h"
#include "../../../lib/spells/ISpellMechanics.h"
#include "../../../lib/spells/adventure/TownPortalEffect.h"
#include "../../../lib/IGameSettings.h"
#include "../../../lib/CPlayerState.h"
@@ -225,12 +227,21 @@ void AINodeStorage::calculateTownPortalTeleportations(
const PathNodeInfo & source,
std::vector<CGPathNode *> & neighbours)
{
SpellID spellID = SpellID::TOWN_PORTAL;
const CSpell * townPortal = spellID.toSpell();
auto srcNode = getAINode(source.node);
if(hero->canCastThisSpell(townPortal) && hero->mana >= hero->getSpellCost(townPortal))
for (const auto & spell : LIBRARY->spellh->objects)
{
if (!spell || !spell->isAdventure())
continue;
auto townPortalEffect = spell->getAdventureMechanics().getEffectAs<TownPortalEffect>(hero);
if (!townPortalEffect)
continue;
if(!hero->canCastThisSpell(spell.get()) || hero->mana < hero->getSpellCost(spell.get()))
continue;
auto towns = cb->getTownsInfo(false);
vstd::erase_if(towns, [&](const CGTownInstance * t) -> bool
@@ -238,22 +249,15 @@ void AINodeStorage::calculateTownPortalTeleportations(
return cb->getPlayerRelations(hero->tempOwner, t->tempOwner) == PlayerRelations::ENEMIES;
});
if(!towns.size())
if(towns.empty())
return;
if(hero->movementPointsRemaining() < townPortalEffect->getMovementPointsRequired())
{
return;
}
// TODO: Copy/Paste from TownPortalMechanics
auto skillLevel = hero->getSpellSchoolLevel(townPortal);
int baseCost = hero->cb->getSettings().getInteger(EGameSettings::HEROES_MOVEMENT_COST_BASE);
auto movementCost = baseCost * (skillLevel >= 3 ? 2 : 3);
if(hero->movementPointsRemaining() < movementCost)
{
return;
}
if(skillLevel < MasteryLevel::ADVANCED)
if(!townPortalEffect->townSelectionAllowed())
{
const CGTownInstance * nearestTown = *vstd::minElementByFun(towns, [&](const CGTownInstance * t) -> int
{
@@ -279,7 +283,7 @@ void AINodeStorage::calculateTownPortalTeleportations(
AIPathNode * node = nodeOptional.value();
node->theNodeBefore = source.node;
node->specialAction.reset(new AIPathfinding::TownPortalAction(targetTown));
node->specialAction.reset(new AIPathfinding::TownPortalAction(targetTown, spell->id));
node->moveRemains = source.node->moveRemains;
neighbours.push_back(node);

2
AI/VCAI/Pathfinding/Actions/TownPortalAction.cpp
View File

@@ -19,5 +19,5 @@ Goals::TSubgoal TownPortalAction::whatToDo(const HeroPtr & hero) const
{
const CGTownInstance * targetTown = target; // const pointer is not allowed in settown
return Goals::sptr(Goals::AdventureSpellCast(hero, SpellID::TOWN_PORTAL).settown(targetTown).settile(targetTown->visitablePos()));
return Goals::sptr(Goals::AdventureSpellCast(hero, spellToUse).settown(targetTown).settile(targetTown->visitablePos()));
}

4
AI/VCAI/Pathfinding/Actions/TownPortalAction.h
View File

@@ -20,10 +20,12 @@ namespace AIPathfinding
{
private:
const CGTownInstance * target;
SpellID spellToUse;
public:
TownPortalAction(const CGTownInstance * target)
TownPortalAction(const CGTownInstance * target, SpellID spellToUse)
:target(target)
,spellToUse(spellToUse)
{
}