From 20a82797f0f19e060f410726802bf32b7cce6a0d Mon Sep 17 00:00:00 2001 From: Hellfish Date: Mon, 9 Jan 2012 08:54:49 +0000 Subject: [PATCH] *Added Fateful Hour to Count$ (Count$FatefulHour..) and as a condition to Static Abilities (FatefulHour$ True). --- .../java/forge/card/cardfactory/CardFactoryUtil.java | 9 +++++++++ .../java/forge/card/staticability/StaticAbility.java | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 1a0b041188b..38617b15a2f 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2930,6 +2930,15 @@ public class CardFactoryUtil { return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); } } + + // Count$FatefulHour..numNotFH> + if (sq[0].contains("FatefulHour")) { + if (cardController.getLife() <= 5) { + return CardFactoryUtil.doXMath(Integer.parseInt(sq[1]), m, c); + } else { + return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); + } + } if (sq[0].contains("Threshold")) { if (cardController.hasThreshold()) { diff --git a/src/main/java/forge/card/staticability/StaticAbility.java b/src/main/java/forge/card/staticability/StaticAbility.java index 033ed6f7ac0..70d13315d80 100644 --- a/src/main/java/forge/card/staticability/StaticAbility.java +++ b/src/main/java/forge/card/staticability/StaticAbility.java @@ -384,6 +384,10 @@ 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; + } if (this.mapParams.containsKey("Threshold") && !controller.hasThreshold()) { return false;