From 6eb6d5d758b325bd358ec56db01c00c7da47c370 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 23 Nov 2020 13:10:41 -0500 Subject: [PATCH] support "notDrawnThisTurn" --- forge-game/src/main/java/forge/game/card/CardProperty.java | 4 ++++ forge-gui/src/main/java/forge/card/CardScriptParser.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index d8f7dd0c352..13f747c7fd9 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -1106,6 +1106,10 @@ public class CardProperty { if (!card.getDrawnThisTurn()) { return false; } + } else if (property.startsWith("notDrawnThisTurn")) { + if (card.getDrawnThisTurn()) { + return false; + } } else if (property.startsWith("enteredBattlefieldThisTurn")) { if (!(card.getTurnInZone() == game.getPhaseHandler().getTurn())) { return false; diff --git a/forge-gui/src/main/java/forge/card/CardScriptParser.java b/forge-gui/src/main/java/forge/card/CardScriptParser.java index 5ae578236c8..27f28978c9d 100644 --- a/forge-gui/src/main/java/forge/card/CardScriptParser.java +++ b/forge-gui/src/main/java/forge/card/CardScriptParser.java @@ -414,7 +414,7 @@ public final class CardScriptParser { "IsTargetingSource", "sharesPermanentTypeWith", "canProduceSameManaTypeWith", "SecondSpellCastThisTurn", "ThisTurnCast", "withFlashback", "tapped", "untapped", "faceDown", - "faceUp", "hasLevelUp", "DrawnThisTurn", + "faceUp", "hasLevelUp", "DrawnThisTurn", "notDrawnThisTurn", "enteredBattlefieldThisTurn", "notEnteredBattlefieldThisTurn", "firstTurnControlled", "notFirstTurnControlled", "startedTheTurnUntapped", "attackedOrBlockedSinceYourLastUpkeep",