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

AiBlockController: check commanders in sortPotentialAttackers

Browse Source
This commit is contained in:
tool4EvEr
2022-09-20 11:04:28 +02:00
parent 1c68a89bc6
commit ace730334f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-ai/src/main/java/forge/ai/AiBlockController.java
View File

@@ -133,9 +133,10 @@ public class AiBlockController {
final CardCollection sortedAttackers = new CardCollection();
CardCollection firstAttacker = new CardCollection();
final FCollectionView<GameEntity> defenders = combat.getDefenders();
final List<Card> attackingCmd = ComputerUtilCombat.getLifeThreateningCommanders(ai, combat);
// If I don't have any planeswalkers then sorting doesn't really matter
if (defenders.size() == 1) {
if (defenders.size() == 1 || !attackingCmd.isEmpty()) {
final CardCollection attackers = combat.getAttackersOf(defenders.get(0));
// Begin with the attackers that pose the biggest threat
ComputerUtilCard.sortByEvaluateCreature(attackers);
@@ -146,7 +147,14 @@ public class AiBlockController {
public int compare(final Card o1, final Card o2) {
if (o1.hasSVar("MustBeBlocked") && !o2.hasSVar("MustBeBlocked")) {
return -1;
} else if (!o1.hasSVar("MustBeBlocked") && o2.hasSVar("MustBeBlocked")) {
}
if (!o1.hasSVar("MustBeBlocked") && o2.hasSVar("MustBeBlocked")) {
return 1;
}
if (attackingCmd.contains(o1) && !attackingCmd.contains(o2)) {
return -1;
}
if (!attackingCmd.contains(o1) && attackingCmd.contains(o2)) {
return 1;
}
return 0;
@@ -166,14 +174,13 @@ public class AiBlockController {
sortedAttackers.addAll(attackers);
} else if (defender instanceof Player && defender.equals(ai)) {
firstAttacker = combat.getAttackersOf(defender);
CardLists.sortByPowerDesc(firstAttacker);
}
}
if (ComputerUtilCombat.lifeInDanger(ai, combat)) {
// add creatures attacking the Player to the front of the list
for (final Card c : firstAttacker) {
sortedAttackers.add(0, c);
}
sortedAttackers.addAll(0, firstAttacker);
} else {
// add creatures attacking the Player to the back of the list
sortedAttackers.addAll(firstAttacker);

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

@@ -387,7 +387,7 @@ public class ComputerUtilCombat {
public static List<Card> getLifeThreateningCommanders(final Player ai, final Combat combat) {
List<Card> res = Lists.newArrayList();
for (Card c : combat.getAttackers()) {
if (c.isCommander()) {
if (c.isCommander() && combat.isAttacking(c, ai)) {
int currentCommanderDamage = ai.getCommanderDamage(c);
if (damageIfUnblocked(c, ai, combat, false) + currentCommanderDamage >= 21) {
res.add(c);