External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

AI: improved game stability on blocking (related to #13290)

Browse source
This commit is contained in:
Oleg Agafonov 2025-02-04 10:21:13 +04:00
parent 8aa432067a
commit 7035736a6c
3 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/util/CombatInfo.java
View file

@ -15,11 +15,7 @@ public class CombatInfo {
private Map<Permanent, List<Permanent>> combat = new HashMap<>();
public void addPair(Permanent attacker, Permanent blocker) {
List<Permanent> blockers = combat.get(attacker);
if (blockers == null) {
blockers = new ArrayList<>();
combat.put(attacker, blockers);
}
List<Permanent> blockers = combat.computeIfAbsent(attacker, k -> new ArrayList<>());
blockers.add(blocker);
}

30
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/util/CombatUtil.java
View file

@ -179,15 +179,15 @@ public final class CombatUtil {
nonBlockingDiffScore.put(s.getBlocker(), s.getDiffNonblockingScore());
});
// split blockers usage priority
// split blockers by usage priority
List<Permanent> survivedAndKillBlocker = new ArrayList<>();
List<Permanent> survivedBlockers2 = new ArrayList<>();
List<Permanent> survivedBlockers = new ArrayList<>();
List<Permanent> diedBlockers = new ArrayList<>();
blockerStats.forEach(stats -> {
if (stats.isAttackerDied() && !stats.isBlockerDied()) {
survivedAndKillBlocker.add(stats.getBlocker());
} else if (!stats.isBlockerDied()) {
survivedBlockers2.add(stats.getBlocker());
survivedBlockers.add(stats.getBlocker());
} else {
diedBlockers.add(stats.getBlocker());
}
@ -196,10 +196,10 @@ public final class CombatUtil {
int blockedCount = 0;
// find good blocker
Permanent blocker = getWorstCreature(survivedAndKillBlocker, survivedBlockers2);
Permanent blocker = getWorstCreature(survivedAndKillBlocker, survivedBlockers);
if (blocker != null) {
combatInfo.addPair(attacker, blocker);
removeWorstCreature(blocker, blockers, survivedAndKillBlocker, survivedBlockers2);
removeWorstCreature(blocker, blockers, survivedAndKillBlocker, survivedBlockers);
blockedCount++;
}
@ -208,13 +208,15 @@ public final class CombatUtil {
// TODO: there are many triggers on damage, attack, etc - it can't be processed without real game simulations
if (blocker == null) {
blocker = getWorstCreature(diedBlockers);
int diffBlockingScore = blockingDiffScore.getOrDefault(blocker, 0);
int diffNonBlockingScore = nonBlockingDiffScore.getOrDefault(blocker, 0);
if (diffBlockingScore >= 0 || diffBlockingScore > diffNonBlockingScore) {
// it's good use case - can block and kill
combatInfo.addPair(attacker, blocker);
removeWorstCreature(blocker, blockers, diedBlockers);
blockedCount++;
if (blocker != null) {
int diffBlockingScore = blockingDiffScore.getOrDefault(blocker, 0);
int diffNonBlockingScore = nonBlockingDiffScore.getOrDefault(blocker, 0);
if (diffBlockingScore >= 0 || diffBlockingScore > diffNonBlockingScore) {
// it's good - can sacrifice and get better game state, also protect from game loose
combatInfo.addPair(attacker, blocker);
removeWorstCreature(blocker, blockers, diedBlockers);
blockedCount++;
}
}
}
@ -230,10 +232,10 @@ public final class CombatUtil {
// effects support: can't be blocked except by xxx or more creatures
if (blockedCount > 0 && attacker.getMinBlockedBy() > blockedCount) {
// it already has 1 blocker (killer in best use case), so no needs in second killer
blocker = getWorstCreature(survivedBlockers2, survivedAndKillBlocker, diedBlockers);
blocker = getWorstCreature(survivedBlockers, survivedAndKillBlocker, diedBlockers);
if (blocker != null) {
combatInfo.addPair(attacker, blocker);
removeWorstCreature(blocker, blockers, survivedBlockers2, survivedAndKillBlocker, diedBlockers);
removeWorstCreature(blocker, blockers, survivedBlockers, survivedAndKillBlocker, diedBlockers);
blockedCount++;
continue; // try to find next required blocker
} else {

2
Mage/src/main/java/mage/game/combat/CombatGroup.java
View file

@ -822,7 +822,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
// too few blockers
if (attacker.getMinBlockedBy() > 1 && !blockers.isEmpty() && blockers.size() < attacker.getMinBlockedBy()) {
for (UUID blockerId : new ArrayList<>(blockers)) {
game.getCombat().removeBlocker(blockerId, game); // !
game.getCombat().removeBlocker(blockerId, game);
}
blockers.clear();
blockerOrder.clear();