From c5b598b277c5b7dd801a092b92823fc72418a150 Mon Sep 17 00:00:00 2001 From: kdmcser Date: Sun, 8 Sep 2024 01:05:03 +0800 Subject: [PATCH 1/4] fix Ballista Bank Mod auto combat crash --- AI/BattleAI/BattleExchangeVariant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AI/BattleAI/BattleExchangeVariant.cpp b/AI/BattleAI/BattleExchangeVariant.cpp index 70c881d23..6f3bcf0ab 100644 --- a/AI/BattleAI/BattleExchangeVariant.cpp +++ b/AI/BattleAI/BattleExchangeVariant.cpp @@ -290,7 +290,7 @@ ReachabilityInfo getReachabilityWithEnemyBypass( continue; auto dmg = damageCache.getOriginalDamage(activeStack, unit, state); - auto turnsToKill = unit->getAvailableHealth() / dmg; + auto turnsToKill = unit->getAvailableHealth() / vstd::amax(dmg, 1); vstd::amin(turnsToKill, 100); From 58cdbccf21814b4ffbee56ebe906bc5ab3f476a8 Mon Sep 17 00:00:00 2001 From: kdmcser Date: Tue, 10 Sep 2024 15:29:11 +0800 Subject: [PATCH 2/4] Update AI/BattleAI/BattleExchangeVariant.cpp Co-authored-by: Ivan Savenko --- AI/BattleAI/BattleExchangeVariant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AI/BattleAI/BattleExchangeVariant.cpp b/AI/BattleAI/BattleExchangeVariant.cpp index 6f3bcf0ab..666279f1c 100644 --- a/AI/BattleAI/BattleExchangeVariant.cpp +++ b/AI/BattleAI/BattleExchangeVariant.cpp @@ -290,7 +290,7 @@ ReachabilityInfo getReachabilityWithEnemyBypass( continue; auto dmg = damageCache.getOriginalDamage(activeStack, unit, state); - auto turnsToKill = unit->getAvailableHealth() / vstd::amax(dmg, 1); + auto turnsToKill = unit->getAvailableHealth() / std::max(dmg, 1); vstd::amin(turnsToKill, 100); From bb759dc2b8422e5e985afbacfaff90ad11e943f9 Mon Sep 17 00:00:00 2001 From: kdmcser Date: Wed, 11 Sep 2024 01:43:30 +0800 Subject: [PATCH 3/4] fix compile error --- AI/BattleAI/BattleExchangeVariant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AI/BattleAI/BattleExchangeVariant.cpp b/AI/BattleAI/BattleExchangeVariant.cpp index 666279f1c..5a091fe5f 100644 --- a/AI/BattleAI/BattleExchangeVariant.cpp +++ b/AI/BattleAI/BattleExchangeVariant.cpp @@ -290,7 +290,7 @@ ReachabilityInfo getReachabilityWithEnemyBypass( continue; auto dmg = damageCache.getOriginalDamage(activeStack, unit, state); - auto turnsToKill = unit->getAvailableHealth() / std::max(dmg, 1); + auto turnsToKill = unit->getAvailableHealth() / std::max(dmg, 1LL); vstd::amin(turnsToKill, 100); From 312403962b1d3632f1cbb618bcc29cc1d56b0921 Mon Sep 17 00:00:00 2001 From: kdmcser Date: Wed, 11 Sep 2024 11:39:03 +0800 Subject: [PATCH 4/4] Update BattleExchangeVariant.cpp fix.compile error --- AI/BattleAI/BattleExchangeVariant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AI/BattleAI/BattleExchangeVariant.cpp b/AI/BattleAI/BattleExchangeVariant.cpp index 5a091fe5f..c731e1b3e 100644 --- a/AI/BattleAI/BattleExchangeVariant.cpp +++ b/AI/BattleAI/BattleExchangeVariant.cpp @@ -290,7 +290,7 @@ ReachabilityInfo getReachabilityWithEnemyBypass( continue; auto dmg = damageCache.getOriginalDamage(activeStack, unit, state); - auto turnsToKill = unit->getAvailableHealth() / std::max(dmg, 1LL); + auto turnsToKill = unit->getAvailableHealth() / std::max(dmg, (int64_t)1); vstd::amin(turnsToKill, 100);