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

Merge pull request #2144 from vcmi/fix-stacks-try-to-attack-turret

Browse Source 
BattleAI: stacks should not measure damage against turret
This commit is contained in:
Ivan Savenko
2023-05-12 17:38:09 +03:00
committed by GitHub
parent b0c3e767d9 fe65edd55d
commit 4ca0bef79c
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AI/BattleAI/AttackPossibility.cpp
View File

@@ -50,7 +50,22 @@ int64_t AttackPossibility::calculateDamageReduce(
vstd::amin(damageDealt, defender->getAvailableHealth()); vstd::amin(damageDealt, defender->getAvailableHealth());
// FIXME: provide distance info for Jousting bonus // FIXME: provide distance info for Jousting bonus
auto enemyDamageBeforeAttack = cb.battleEstimateDamage(defender, attacker, 0); auto attackerUnitForMeasurement = attacker;
if(attackerUnitForMeasurement->isTurret())
{
auto ourUnits = cb.battleGetUnitsIf([&](const battle::Unit * u) -> bool
{
return u->unitSide() == attacker->unitSide() && !u->isTurret();
});
if(ourUnits.empty())
attackerUnitForMeasurement = defender;
else
attackerUnitForMeasurement = ourUnits.front();
}
auto enemyDamageBeforeAttack = cb.battleEstimateDamage(defender, attackerUnitForMeasurement, 0);
auto enemiesKilled = damageDealt / defender->getMaxHealth() + (damageDealt % defender->getMaxHealth() >= defender->getFirstHPleft() ? 1 : 0); auto enemiesKilled = damageDealt / defender->getMaxHealth() + (damageDealt % defender->getMaxHealth() >= defender->getFirstHPleft() ? 1 : 0);
auto enemyDamage = averageDmg(enemyDamageBeforeAttack.damage); auto enemyDamage = averageDmg(enemyDamageBeforeAttack.damage);
auto damagePerEnemy = enemyDamage / (double)defender->getCount(); auto damagePerEnemy = enemyDamage / (double)defender->getCount();

7
AI/BattleAI/BattleExchangeVariant.cpp
View File

@@ -386,9 +386,13 @@ int64_t BattleExchangeEvaluator::calculateExchange(
for(auto unit : exchangeUnits) for(auto unit : exchangeUnits)
{ {
if(unit->isTurret())
continue;
bool isOur = cb->battleMatchOwner(ap.attack.attacker, unit, true); bool isOur = cb->battleMatchOwner(ap.attack.attacker, unit, true);
auto & attackerQueue = isOur ? ourStacks : enemyStacks; auto & attackerQueue = isOur ? ourStacks : enemyStacks;
if(!vstd::contains(attackerQueue, unit)) if(!vstd::contains(attackerQueue, unit))
{ {
attackerQueue.push_back(unit); attackerQueue.push_back(unit);
@@ -593,6 +597,9 @@ void BattleExchangeEvaluator::updateReachabilityMap(HypotheticBattle & hb)
for(const battle::Unit * unit : turnQueue) for(const battle::Unit * unit : turnQueue)
{ {
if(unit->isTurret())
continue;
if(turnBattle.battleCanShoot(unit)) if(turnBattle.battleCanShoot(unit))
{ {
for(BattleHex hex = BattleHex::TOP_LEFT; hex.isValid(); hex = hex + 1) for(BattleHex hex = BattleHex::TOP_LEFT; hex.isValid(); hex = hex + 1)