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

Fix a Card property and remove some unused card-related code.

Browse Source
This commit is contained in:
elcnesh
2014-07-30 06:49:44 +00:00
parent 600ea97726
commit ceb3de4bca
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -6418,7 +6418,7 @@ public class Card extends GameEntity implements Comparable<Card> {
return false; return false;
} }
} else if (property.startsWith("dealtDamageToOppThisTurn")) { } else if (property.startsWith("dealtDamageToOppThisTurn")) {
if (!this.getDamageHistory().getThisTurnDamaged().contains(sourceController.getOpponent())) { if (!this.hasDealtDamageToOpponentThisTurn()) {
return false; return false;
} }
} else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) { } else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) {
@@ -7291,6 +7291,19 @@ public class Card extends GameEntity implements Comparable<Card> {
this.dealtDamageToPlayerThisTurn.clear(); this.dealtDamageToPlayerThisTurn.clear();
} }
/**
* @return {@code true} if and only if this dealt damage to an opponent this
* turn.
*/
public final boolean hasDealtDamageToOpponentThisTurn() {
for (final Player p : this.getDamageHistory().getThisTurnDamaged()) {
if (this.getController().isOpponentOf(p)) {
return true;
}
}
return false;
}
// this is the minimal damage a trampling creature has to assign to a blocker // this is the minimal damage a trampling creature has to assign to a blocker
/** /**
* <p> * <p>

5
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -994,8 +994,7 @@ public class CardFactoryUtil {
if (sq[0].equals("YouDrewThisTurn")) return doXMath(c.getController().getNumDrawnThisTurn(), m, c); if (sq[0].equals("YouDrewThisTurn")) return doXMath(c.getController().getNumDrawnThisTurn(), m, c);
if (sq[0].equals("OppDrewThisTurn")) return doXMath(c.getController().getOpponent().getNumDrawnThisTurn(), m, c);
if (sq[0].equals("FirstSpellTotalManaSpent")) return doXMath(c.getFirstSpellAbility().getTotalManaSpent(), m, c); if (sq[0].equals("FirstSpellTotalManaSpent")) return doXMath(c.getFirstSpellAbility().getTotalManaSpent(), m, c);
if (sq[0].equals("StormCount")) return doXMath(game.getStack().getCardsCastThisTurn().size() - 1, m, c); if (sq[0].equals("StormCount")) return doXMath(game.getStack().getCardsCastThisTurn().size() - 1, m, c);
if (sq[0].equals("DamageDoneThisTurn")) return doXMath(c.getDamageDoneThisTurn(), m, c); if (sq[0].equals("DamageDoneThisTurn")) return doXMath(c.getDamageDoneThisTurn(), m, c);
@@ -1006,8 +1005,6 @@ public class CardFactoryUtil {
if (sq[0].startsWith("Triggered")) return doXMath(xCount((Card) c.getTriggeringObject("Card"), sq[0].substring(9)), m, c); if (sq[0].startsWith("Triggered")) return doXMath(xCount((Card) c.getTriggeringObject("Card"), sq[0].substring(9)), m, c);
if (sq[0].contains("YourStartingLife")) return doXMath(cc.getStartingLife(), m, c); if (sq[0].contains("YourStartingLife")) return doXMath(cc.getStartingLife(), m, c);
//if (sq[0].contains("OppStartingLife")) return doXMath(oppController.getStartingLife(), m, c); // found no cards using it
if (sq[0].contains("YourLifeTotal")) return doXMath(cc.getLife(), m, c); if (sq[0].contains("YourLifeTotal")) return doXMath(cc.getLife(), m, c);
if (sq[0].contains("OppGreatestLifeTotal")) return doXMath(cc.getOpponentsGreatestLifeTotal(), m, c); if (sq[0].contains("OppGreatestLifeTotal")) return doXMath(cc.getOpponentsGreatestLifeTotal(), m, c);