mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
- Added RegeneratedThisTurn to xCount.
This commit is contained in:
@@ -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>
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user