- Added RegeneratedThisTurn to xCount.

This commit is contained in:
Sloth
2011-11-08 11:20:18 +00:00
parent 7809aa02cc
commit 6c42ce0a4d
4 changed files with 19 additions and 0 deletions

View File

@@ -268,6 +268,7 @@ public class Card extends GameEntity implements Comparable<Card> {
// regeneration // regeneration
private int nShield; private int nShield;
private int regeneratedThisTurn;
private int turnInZone; private int turnInZone;
@@ -2853,6 +2854,18 @@ public class Card extends GameEntity implements Comparable<Card> {
public final void subtractShield() { public final void subtractShield() {
nShield--; nShield--;
} }
public final void addRegeneratedThisTurn() {
regeneratedThisTurn += 1;
}
public final int getRegeneratedThisTurn() {
return regeneratedThisTurn;
}
public final void setRegeneratedThisTurn(final int n) {
regeneratedThisTurn = n;
}
/** /**
* <p> * <p>

View File

@@ -1215,6 +1215,7 @@ public class GameAction {
c.subtractShield(); c.subtractShield();
c.setDamage(0); c.setDamage(0);
c.tap(); c.tap();
c.addRegeneratedThisTurn();
AllZone.getCombat().removeFromCombat(c); AllZone.getCombat().removeFromCombat(c);
return false; return false;
} }

View File

@@ -380,6 +380,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
c.resetDealtDamageToThisTurn(); c.resetDealtDamageToThisTurn();
c.setDealtDmgToHumanThisTurn(false); c.setDealtDmgToHumanThisTurn(false);
c.setDealtDmgToComputerThisTurn(false); c.setDealtDmgToComputerThisTurn(false);
c.setRegeneratedThisTurn(0);
} }
AllZone.getHumanPlayer().resetPreventNextDamage(); AllZone.getHumanPlayer().resetPreventNextDamage();
AllZone.getComputerPlayer().resetPreventNextDamage(); AllZone.getComputerPlayer().resetPreventNextDamage();

View File

@@ -2922,6 +2922,10 @@ public class CardFactoryUtil {
if (sq[0].equals("DamageDoneThisTurn")) { if (sq[0].equals("DamageDoneThisTurn")) {
return CardFactoryUtil.doXMath(c.getDamageDoneThisTurn(), m, c); return CardFactoryUtil.doXMath(c.getDamageDoneThisTurn(), m, c);
} }
if (sq[0].contains("RegeneratedThisTurn")) {
return CardFactoryUtil.doXMath(c.getRegeneratedThisTurn(), m, c);
}
CardList someCards = new CardList(); CardList someCards = new CardList();