diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 2cf4339cdbd..dec3eddc945 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -1347,7 +1347,7 @@ public class GameAction { // AllZone.getComputer() = new ComputerAI_Input(new // ComputerAI_General()); Constant.Quest.FANTASY_QUEST[0] = false; - + AllZone.getComputerPlayer().setStartingLife(20); AllZone.getHumanPlayer().setStartingLife(20); diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 4dd45971801..e838e02e354 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -53,13 +53,13 @@ public abstract class Player extends GameEntity { /** The life. */ private int life; - + /** The life this player started the game with. */ private int startingLife; /** The assigned damage. */ private int assignedDamage; - + /** The life lost this turn. */ private int lifeLostThisTurn = 0; @@ -261,7 +261,7 @@ public abstract class Player extends GameEntity { this.updateObservers(); return change; } - + /** * Sets the starting life for a game. Should only be called from newGame()'s. * @@ -282,7 +282,7 @@ public abstract class Player extends GameEntity { public final int getLife() { return this.life; } - + /** *

* Getter for the field startingLife. diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 83d4697a7af..2bd20b765a2 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2832,12 +2832,12 @@ public class CardFactoryUtil { } return CardFactoryUtil.doXMath(n, m, c); } - + // Count$YourStartingLife if (sq[0].contains("YourStartingLife")) { return CardFactoryUtil.doXMath(cardController.getStartingLife(), m, c); } - + // Count$OppStartingLife if (sq[0].contains("OppStartingLife")) { return CardFactoryUtil.doXMath(oppController.getStartingLife(), m, c); @@ -2940,7 +2940,7 @@ public class CardFactoryUtil { return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); } } - + // Count$FatefulHour..numNotFH> if (sq[0].contains("FatefulHour")) { if (cardController.getLife() <= 5) { diff --git a/src/main/java/forge/card/staticability/StaticAbility.java b/src/main/java/forge/card/staticability/StaticAbility.java index 70d13315d80..c576ebfc1d6 100644 --- a/src/main/java/forge/card/staticability/StaticAbility.java +++ b/src/main/java/forge/card/staticability/StaticAbility.java @@ -384,7 +384,7 @@ public class StaticAbility { if ((effectZone != null) && (!this.hostCard.isInZone(effectZone) || this.hostCard.isPhasedOut())) { return false; } - + if (this.mapParams.containsKey("FatefulHour") && controller.getLife() > 5) { return false; } diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index ce6485f6055..0bad6f54166 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/src/main/java/forge/card/trigger/Trigger.java @@ -343,13 +343,13 @@ public abstract class Trigger extends TriggerReplacementBase { * @return a boolean. */ public final boolean requirementsCheck() { - if(this.getMapParams().containsKey("FatefulHour")) { - if(this.getMapParams().get("FatefulHour").equals("True") + if (this.getMapParams().containsKey("FatefulHour")) { + if (this.getMapParams().get("FatefulHour").equals("True") && !(this.getHostCard().getController().getLife() <= 5)) { return false; } } - + if (this.getMapParams().containsKey("Metalcraft")) { if (this.getMapParams().get("Metalcraft").equals("True") && !this.getHostCard().getController().hasMetalcraft()) {