external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-11 16:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix AI not ordering combatants for damage in non-legacy mode - take two (inside distributeAIDamage)

Browse Source
This commit is contained in:
Agetian
2025-10-08 10:32:04 +03:00
committed by Chris H
parent 5a19c9ed7e
commit 7deb7b1ecc
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -2020,6 +2020,7 @@ public class ComputerUtilCombat {
Map<Card, Integer> damageMap = Maps.newHashMap(); Map<Card, Integer> damageMap = Maps.newHashMap();
Combat combat = attacker.getGame().getCombat(); Combat combat = attacker.getGame().getCombat();
// Order the combatants in preferred order
boolean isAttacking = defender != null; boolean isAttacking = defender != null;
// Check for Banding, Defensive Formation // Check for Banding, Defensive Formation
@@ -2046,8 +2047,11 @@ public class ComputerUtilCombat {
// TODO sort remaining tramplers for DamageDone triggers // TODO sort remaining tramplers for DamageDone triggers
} }
if (block.size() == 1) { final CardCollection orderedBlockers = new CardCollection(block);
final Card blocker = block.getFirst(); ComputerUtilCard.sortByEvaluateCreature(orderedBlockers);
if (orderedBlockers.size() == 1) {
final Card blocker = orderedBlockers.getFirst();
int dmgToBlocker = dmgCanDeal; int dmgToBlocker = dmgCanDeal;
if (hasTrample && isAttacking && !aiDistributesBandingDmg) { // otherwise no entity to deliver damage via trample if (hasTrample && isAttacking && !aiDistributesBandingDmg) { // otherwise no entity to deliver damage via trample
@@ -2070,7 +2074,7 @@ public class ComputerUtilCombat {
// Does the attacker deal lethal damage to all blockers // Does the attacker deal lethal damage to all blockers
//Blocking Order now determined after declare blockers //Blocking Order now determined after declare blockers
Card lastBlocker = null; Card lastBlocker = null;
for (final Card b : block) { for (final Card b : orderedBlockers) {
lastBlocker = b; lastBlocker = b;
final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, attacker, true); final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, attacker, true);
if (dmgToKill <= dmgCanDeal) { if (dmgToKill <= dmgCanDeal) {
@@ -2097,7 +2101,7 @@ public class ComputerUtilCombat {
} else { } else {
// In the event of Banding or Defensive Formation, assign max damage to the blocker who // In the event of Banding or Defensive Formation, assign max damage to the blocker who
// can tank all the damage or to the worst blocker to lose as little as possible // can tank all the damage or to the worst blocker to lose as little as possible
for (final Card b : block) { for (final Card b : orderedBlockers) {
final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, attacker, true); final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, attacker, true);
if (dmgToKill > dmgCanDeal) { if (dmgToKill > dmgCanDeal) {
damageMap.put(b, dmgCanDeal); damageMap.put(b, dmgCanDeal);
@@ -2105,7 +2109,7 @@ public class ComputerUtilCombat {
} }
} }
if (damageMap.isEmpty()) { if (damageMap.isEmpty()) {
damageMap.put(ComputerUtilCard.getWorstCreatureAI(block), dmgCanDeal); damageMap.put(ComputerUtilCard.getWorstCreatureAI(orderedBlockers), dmgCanDeal);
} }
} }
return damageMap; return damageMap;