games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Tweak Battle AI damage prioritization score logic

Browse Source
This commit is contained in:
Victor Luchits
2020-05-23 13:38:24 +03:00
parent f68b449e5e
commit 2727958a63
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AI/BattleAI/AttackPossibility.cpp
View File

@@ -67,14 +67,8 @@ AttackPossibility AttackPossibility::evaluate(const BattleAttackInfo & attackInf
auto defender = attackInfo.defender; auto defender = attackInfo.defender;
const std::string cachingStringBlocksRetaliation = "type_BLOCKS_RETALIATION"; const std::string cachingStringBlocksRetaliation = "type_BLOCKS_RETALIATION";
static const auto selectorBlocksRetaliation = Selector::type(Bonus::BLOCKS_RETALIATION); static const auto selectorBlocksRetaliation = Selector::type(Bonus::BLOCKS_RETALIATION);
const auto attackerSide = getCbc()->playerToSide(getCbc()->battleGetOwner(attacker));
const bool counterAttacksBlocked = attacker->hasBonus(selectorBlocksRetaliation, cachingStringBlocksRetaliation); const bool counterAttacksBlocked = attacker->hasBonus(selectorBlocksRetaliation, cachingStringBlocksRetaliation);
const bool mindControlled = [&](const battle::Unit *attacker) -> bool
{
auto actualSide = getCbc()->playerToSide(getCbc()->battleGetOwner(attacker));
if (actualSide && actualSide.get() != attacker->unitSide())
return true;
return false;
} (attacker);
AttackPossibility bestAp(hex, BattleHex::INVALID, attackInfo); AttackPossibility bestAp(hex, BattleHex::INVALID, attackInfo);
@@ -153,10 +147,14 @@ AttackPossibility AttackPossibility::evaluate(const BattleAttackInfo & attackInf
defenderState->afterAttack(attackInfo.shooting, true); defenderState->afterAttack(attackInfo.shooting, true);
} }
bool isEnemy = state->battleMatchOwner(attacker, u) && !mindControlled; bool isEnemy = state->battleMatchOwner(attacker, u);
// this includes enemy units as well as attacker units under enemy's mind control
if(isEnemy) if(isEnemy)
ap.damageDealt += damageDealt; ap.damageDealt += damageDealt;
else // friendly fire
// damaging attacker's units (even those under enemy's mind control) is considered friendly fire
if(attackerSide == u->unitSide())
ap.collateralDamage += damageDealt; ap.collateralDamage += damageDealt;
if(u->unitId() == defender->unitId() || if(u->unitId() == defender->unitId() ||