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

- Fix AI not ordering combatants for damage in non-legacy mode.

Browse Source
This commit is contained in:
Agetian
2025-10-08 08:47:19 +03:00
parent 5fae32e048
commit ff784183dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -492,7 +492,7 @@ public class Combat {
/** If there are multiple blockers, the Attacker declares the Assignment Order */ /** If there are multiple blockers, the Attacker declares the Assignment Order */
public void orderBlockersForDamageAssignment(Card attacker, CardCollection blockers) { // this method performs controller's role public void orderBlockersForDamageAssignment(Card attacker, CardCollection blockers) { // this method performs controller's role
if (blockers.size() <= 1 || !this.legacyOrderCombatants) { if (blockers.size() <= 1 || (!this.legacyOrderCombatants && !playerWhoAttacks.isAI())) {
blockersOrderedForDamageAssignment.get().put(attacker, new CardCollection(blockers)); blockersOrderedForDamageAssignment.get().put(attacker, new CardCollection(blockers));
return; return;
} }
@@ -529,7 +529,7 @@ public class Combat {
final CardCollection oldBlockers = blockersOrderedForDamageAssignment.get().get(attacker); final CardCollection oldBlockers = blockersOrderedForDamageAssignment.get().get(attacker);
if (oldBlockers == null || oldBlockers.isEmpty()) { if (oldBlockers == null || oldBlockers.isEmpty()) {
blockersOrderedForDamageAssignment.get().put(attacker, new CardCollection(blocker)); blockersOrderedForDamageAssignment.get().put(attacker, new CardCollection(blocker));
} else if (this.legacyOrderCombatants) { } else if (this.legacyOrderCombatants || playerWhoAttacks.isAI()) {
CardCollection orderedBlockers = playerWhoAttacks.getController().orderBlocker(attacker, blocker, oldBlockers); CardCollection orderedBlockers = playerWhoAttacks.getController().orderBlocker(attacker, blocker, oldBlockers);
blockersOrderedForDamageAssignment.get().put(attacker, orderedBlockers); blockersOrderedForDamageAssignment.get().put(attacker, orderedBlockers);
} else { } else {
@@ -550,7 +550,7 @@ public class Combat {
// They need a reverse map here: Blocker => List<Attacker> // They need a reverse map here: Blocker => List<Attacker>
Player blockerCtrl = blocker.getController(); Player blockerCtrl = blocker.getController();
CardCollection orderedAttacker = attackers.size() <= 1 || !this.legacyOrderCombatants ? attackers : blockerCtrl.getController().orderAttackers(blocker, attackers); CardCollection orderedAttacker = attackers.size() <= 1 || (!this.legacyOrderCombatants && !blockerCtrl.getController().isAI()) ? attackers : blockerCtrl.getController().orderAttackers(blocker, attackers);
// Damage Ordering needs to take cards like Melee into account, is that happening? // Damage Ordering needs to take cards like Melee into account, is that happening?
attackersOrderedForDamageAssignment.get().put(blocker, orderedAttacker); attackersOrderedForDamageAssignment.get().put(blocker, orderedAttacker);