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

- Little touch-up for -X/-0 spells.

Browse Source
This commit is contained in:
Sloth
2012-07-19 19:29:27 +00:00
parent 7e721da1da
commit b0bd1e6d72
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
View File

@@ -650,7 +650,8 @@ public class AbilityFactoryPump {
}
}); // leaves all creatures that will be destroyed
} // -X/-X end
else if ((attack < 0) && !list.isEmpty()) {
else if ((attack < 0) && !list.isEmpty()
&& !Singletons.getModel().getGameState().getPhaseHandler().isPreventCombatDamageThisTurn()) {
// spells that give -X/0
Player activePlayer = Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn();
if (activePlayer.isComputer()) {
@@ -666,7 +667,17 @@ public class AbilityFactoryPump {
list = list.filter(new CardListFilter() {
@Override
public boolean addCard(final Card c) {
return c.isAttacking();
if (!c.isAttacking()) {
return false;
}
if (c.getNetAttack() > 0 && AllZone.getComputerPlayer().getLife() < 5) {
return true;
}
//Don't waste a -7/-0 spell on a 1/1 creature
if (c.getNetAttack() + attack > -2 || c.getNetAttack() > 3) {
return true;
}
return false;
}
});
} else {