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

Fix some possible issues with attack constraints and how the AI handles them.

Browse Source
This commit is contained in:
elcnesh
2015-01-27 14:22:03 +00:00
parent 01b6032e93
commit 4a74fe87fc
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/combat/AttackConstraints.java
View File

@@ -145,11 +145,11 @@ public class AttackConstraints {
final Set<AttackRestrictionType> types = restrictions.get(attacker).getTypes(); final Set<AttackRestrictionType> types = restrictions.get(attacker).getTypes();
if (types.contains(AttackRestrictionType.NEED_BLACK_OR_GREEN)) { if (types.contains(AttackRestrictionType.NEED_BLACK_OR_GREEN)) {
// It's insufficient if this attacker is B/G itself, so filter itself out! // It's insufficient if this attacker is B/G itself, so filter itself out!
if (CardLists.filter(myPossibleAttackers, CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)), Predicates.not(Predicates.equalTo(attacker))).size() == 0) { if (CardLists.filter(myPossibleAttackers, CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)), Predicates.not(Predicates.equalTo(attacker))).isEmpty()) {
attackersToRemove.add(attacker); attackersToRemove.add(attacker);
} }
} else if (types.contains(AttackRestrictionType.NEED_GREATER_POWER)) { } else if (types.contains(AttackRestrictionType.NEED_GREATER_POWER)) {
if (CardLists.filter(myPossibleAttackers, CardPredicates.hasGreaterPowerThan(attacker.getNetPower())).size() == 0) { if (CardLists.filter(myPossibleAttackers, CardPredicates.hasGreaterPowerThan(attacker.getNetPower())).isEmpty()) {
attackersToRemove.add(attacker); attackersToRemove.add(attacker);
} }
} }
@@ -291,10 +291,13 @@ public class AttackConstraints {
toDefender.add(req.defender); toDefender.add(req.defender);
reqs.removeAll(findAll(reqs, req.attacker)); reqs.removeAll(findAll(reqs, req.attacker));
reserved.remove(req.attacker); reserved.remove(req.attacker);
localMaximum--;
// need two other attackers: set that number to the number of attackers we still need (but never < 0) // need two other attackers: set that number to the number of attackers we still need (but never < 0)
if (restrictions.get(req.attacker).getTypes().contains(AttackRestrictionType.NEED_TWO_OTHERS)) { if (restrictions.get(req.attacker).getTypes().contains(AttackRestrictionType.NEED_TWO_OTHERS)) {
final int previousNeeded = attackersNeeded;
attackersNeeded = Ints.max(3 - (myAttackers.size() + reserved.size()), 0); attackersNeeded = Ints.max(3 - (myAttackers.size() + reserved.size()), 0);
localMaximum -= Ints.max(attackersNeeded - previousNeeded, 0);
} }
} }

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

@@ -109,7 +109,9 @@ public class Combat {
} }
public final void clearAttackers() { public final void clearAttackers() {
attackedByBands.clear(); for (final Card attacker : getAttackers()) {
removeFromCombat(attacker);
}
} }
public final Player getAttackingPlayer() { public final Player getAttackingPlayer() {