From ed5152f2a25250dedd01a629c8e2ce8d554a3d07 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 12 Dec 2021 19:57:53 -0500 Subject: [PATCH] support "cmcGT$ Turns" in StaticAbilityCantBeCast --- .../game/staticability/StaticAbilityCantBeCast.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java index a466761a774..7a1b2d37e4d 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java @@ -125,10 +125,15 @@ public class StaticAbilityCantBeCast { return false; } - if (stAb.hasParam("cmcGT") && (activator != null) - && (card.getCMC() <= CardLists.getType(activator.getCardsIn(ZoneType.Battlefield), - stAb.getParam("cmcGT")).size())) { - return false; + if (stAb.hasParam("cmcGT") && (activator != null)) { + if (stAb.getParam("cmcGT").equals("Turns")) { + if (card.getCMC() <= activator.getTurn()) { + return false; + } + } else if (card.getCMC() <= CardLists.getType(activator.getCardsIn(ZoneType.Battlefield), + stAb.getParam("cmcGT")).size()) { + return false; + } } if (stAb.hasParam("NumLimitEachTurn") && activator != null) {