games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Merge pull request #3814 from vcmi/fixes

Browse Source 
NKAI: fix patrolling heroes never retreat and town danger evaluation
This commit is contained in:
Andrii Danylchenko 2024-04-23 18:52:47 +03:00 committed by GitHub
commit b4abb3a56c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AI/Nullkiller/AIGateway.cpp
View File

@ -545,6 +545,11 @@ std::optional<BattleAction> AIGateway::makeSurrenderRetreatDecision(const Battle
LOG_TRACE(logAi);
NET_EVENT_HANDLER;
if(battleState.ourHero && battleState.ourHero->patrol.patrolling)
{
return std::nullopt;
}
double ourStrength = battleState.getOurStrength();
double fightRatio = ourStrength / (double)battleState.getEnemyStrength();

9
AI/Nullkiller/Analyzers/HeroManager.cpp
View File

@ -130,7 +130,14 @@ void HeroManager::update()
for(auto hero : myHeroes)
{
heroRoles[hero] = (globalMainCount--) > 0 ? HeroRole::MAIN : HeroRole::SCOUT;
if(hero->patrol.patrolling)
{
heroRoles[hero] = HeroRole::MAIN;
}
else
{
heroRoles[hero] = (globalMainCount--) > 0 ? HeroRole::MAIN : HeroRole::SCOUT;
}
}
for(auto hero : myHeroes)

15
AI/Nullkiller/Engine/FuzzyHelper.cpp
View File

@ -53,15 +53,26 @@ ui64 FuzzyHelper::evaluateDanger(const int3 & tile, const CGHeroInstance * visit
// in some scenarios hero happens to be "under" the object (eg town). Then we consider ONLY the hero.
if(vstd::contains_if(visitableObjects, objWithID<Obj::HERO>))
{
vstd::erase_if(visitableObjects, [](const CGObjectInstance * obj)
vstd::erase_if(visitableObjects, [](const CGObjectInstance * obj) -> bool
{
return !objWithID<Obj::HERO>(obj);
return !objWithID<Obj::HERO>(obj);
});
}
if(const CGObjectInstance * dangerousObject = vstd::backOrNull(visitableObjects))
{
objectDanger = evaluateDanger(dangerousObject); //unguarded objects can also be dangerous or unhandled
if(objWithID<Obj::HERO>(dangerousObject))
{
auto hero = dynamic_cast<const CGHeroInstance *>(dangerousObject);
if(hero->visitedTown && !hero->visitedTown->garrisonHero)
{
objectDanger += evaluateDanger(hero->visitedTown.get());
}
}
if(objectDanger)
{
//TODO: don't downcast objects AI shouldn't know about!