From 2f2a903dc6638cb7d3a1365d994024ff2faab222 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 19 Sep 2020 17:28:20 -0400 Subject: [PATCH 1/3] script (squee1968) --- .../cardsfolder/upcoming/ZNR/forsaken_monument.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/ZNR/forsaken_monument.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/forsaken_monument.txt b/forge-gui/res/cardsfolder/upcoming/ZNR/forsaken_monument.txt new file mode 100644 index 00000000000..c1e2c929667 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/ZNR/forsaken_monument.txt @@ -0,0 +1,12 @@ +Name:Forsaken Monument +ManaCost:5 +Types:Legendary Artifact +S:Mode$ Continuous | Affected$ Creature.Colorless+YouCtrl | AddPower$ 2 | AddToughness$ 2 | Description$ Colorless creatures you control get +2/+2. +T:Mode$ TapsForMana | ValidCard$ Permanent.YouCtrl | Produced$ C | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a permanent for {C}, add an additional {C}. +SVar:TrigMana:DB$ Mana | Produced$ C +T:Mode$ SpellCast | ValidCard$ Card.Colorless | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever you cast a colorless spell, you gain 1 life. +SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 +SVar:PlayMain1:TRUE +DeckHints:Color$Colorless +DeckHas:Ability$LifeGain +Oracle:Colorless creatures you control get +2/+2.\nWhenever you tap a permanent for {C}, add an additional {C}.\nWhenever you cast a colorless spell, you gain 1 life. From 007a8e8fbae43edcca89b13c193793baf21d1819 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 19 Sep 2020 17:29:21 -0400 Subject: [PATCH 2/3] TriggerTapsForMana.java support - seems to work! --- .../src/main/java/forge/game/trigger/TriggerTapsForMana.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java index 6cbf96cc1aa..644bf826017 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -100,6 +100,9 @@ public class TriggerTapsForMana extends Trigger { return false; } } + if (!produced.contains(MagicColor.toShortString(this.getParam("Produced")))) { + return false; + } } return true; From af0643d0d2946bb5f37c49ec55b8dc965c47e223 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 20 Sep 2020 16:25:31 -0400 Subject: [PATCH 3/3] indent consistency --- .../main/java/forge/game/trigger/TriggerTapsForMana.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java index 644bf826017..9835186cc6a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -99,9 +99,9 @@ public class TriggerTapsForMana extends Trigger { if (!this.getHostCard().hasChosenColor() || !produced.contains(MagicColor.toShortString(this.getHostCard().getChosenColor()))) { return false; } - } - if (!produced.contains(MagicColor.toShortString(this.getParam("Produced")))) { - return false; + if (!produced.contains(MagicColor.toShortString(this.getParam("Produced")))) { + return false; + } } }