diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 63779e818c6..7d50157c0db 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -609,9 +609,15 @@ public class CardFactoryUtil { if (value.contains("LifeGainedThisTurn")) { return doXMath(player.getLifeGainedThisTurn(), m, source); } + if (value.contains("LifeGainedByTeamThisTurn")) { return doXMath(player.getLifeGainedByTeamThisTurn(), m, source); } + + if (value.contains("LifeStartedThisTurnWith")) { + return doXMath(player.getLifeStartedThisTurnWith(), m, source); + } + if (value.contains("PoisonCounters")) { return doXMath(player.getPoisonCounters(), m, source); } diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 2fb3783d30d..dee7395bb1d 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -82,6 +82,7 @@ public class Player extends GameEntity implements Comparable { private int life = 20; private int startingLife = 20; + private int lifeStartedThisTurnWith = startingLife; private final Map assignedDamage = Maps.newHashMap(); private final Map assignedCombatDamage = Maps.newHashMap(); private int spellsCastThisTurn = 0; @@ -1660,6 +1661,13 @@ public class Player extends GameEntity implements Comparable { numCardsInHandStartedThisTurnWith = num; } + public int getLifeStartedThisTurnWith() { + return lifeStartedThisTurnWith; + } + public void setLifeStartedThisTurnWith(int l) { + lifeStartedThisTurnWith = l; + } + public void addNoteForName(String notedFor, String noted) { if (!notes.containsKey(notedFor)) { notes.put(notedFor, new FCollection<>()); @@ -3265,6 +3273,7 @@ public class Player extends GameEntity implements Comparable { lifeGainedThisTurn = 0; lifeGainedTimesThisTurn = 0; lifeGainedByTeamThisTurn = 0; + setLifeStartedThisTurnWith(getLife()); setLibrarySearched(0); setNumManaConversion(0);