From 4c92fade9cb7c650c1bc77c8fc5f0354a8a7d234 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 12 Oct 2020 19:18:15 -0400 Subject: [PATCH 1/6] Light of Promise fixes --- forge-gui/res/cardsfolder/l/light_of_promise.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui/res/cardsfolder/l/light_of_promise.txt b/forge-gui/res/cardsfolder/l/light_of_promise.txt index 4d55340a156..60488e861a8 100644 --- a/forge-gui/res/cardsfolder/l/light_of_promise.txt +++ b/forge-gui/res/cardsfolder/l/light_of_promise.txt @@ -3,10 +3,10 @@ ManaCost:2 W Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature -S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ LightOfPromiseTrig | AddSVar$ LightOfPromisePutCounter & X | Description$ Enchanted creature has "Whenever you gain life, put that many +1/+1 counters on this creature." -SVar:LightOfPromiseTrig:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ LightOfPromisePutCounter | TriggerDescription$ Whenever you gain life, put that many +1/+1 counters on CARDNAME. -SVar:LightOfPromisePutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | References$ X -SVar:X:TriggerCount$LifeAmount -DeckHints:Ability$LifeGain +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ LightOfPromiseTrig | AddSVar$ LightOfPromisePutCounter & LightOfPromiseAmount | Description$ Enchanted creature has "Whenever you gain life, put that many +1/+1 counters on this creature." +SVar:LightOfPromiseTrig:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ LightOfPromisePutCounter | TriggerDescription$ Whenever you gain life, put that many +1/+1 counters on this creature. +SVar:LightOfPromisePutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ LightOfPromiseAmount | References$ LightOfPromiseAmount +SVar:LightOfPromiseAmount:TriggerCount$LifeAmount +DeckNeeds:Ability$LifeGain DeckHas:Ability$Counters Oracle:Enchant creature\nEnchanted creature has "Whenever you gain life, put that many +1/+1 counters on this creature." From f39013141f2b4325862f77541a12a5b2fed3f2a5 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 12 Oct 2020 19:43:48 -0400 Subject: [PATCH 2/6] Orah triggering from weird zones --- forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt b/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt index f12bb686902..4b94ed9ebda 100755 --- a/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt +++ b/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Kor Cleric PT:3/3 K:Lifelink T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric with lesser converted mana cost from your graveyard to the battlefield. -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZone$ Battlefield | ValidCard$ Cleric.YouCtrl+Other | Execute$ TrigReturn | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric card with lesser converted mana cost from your graveyard to the battlefield. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZone$ Battlefield | ValidCard$ Cleric.YouCtrl+Other | Execute$ TrigReturn | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric card with lesser converted mana cost from your graveyard to the battlefield. SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Cleric.cmcLTX+YouOwn | TgtPrompt$ Choose target Cleric card with lesser converted mana cost | References$ X | Origin$ Graveyard | Destination$ Battlefield SVar:X:TriggeredCard$CardManaCost DeckHas:Ability$Graveyard From 87f02d051a74201909cc36df711fbf0e9734ffcf Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 12 Oct 2020 19:59:53 -0400 Subject: [PATCH 3/6] Forsaken Monument granting C when Moxes tapped for mana! --- .../src/main/java/forge/game/trigger/TriggerTapsForMana.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 499e5426022..6b50f104eb6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -101,10 +101,10 @@ 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")))) { + } + if (!produced.contains(MagicColor.toShortString(this.getParam("Produced")))) { return false; } - } } return true; From 1230bcc572977c7a5793d6322e505e7d7bcfc3c2 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 12 Oct 2020 20:06:53 -0400 Subject: [PATCH 4/6] this is apparently an ultimate? --- forge-gui/res/cardsfolder/j/jace_mirror_mage.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt b/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt index 870ed1df4d9..d6d63ce3569 100644 --- a/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt +++ b/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt @@ -6,7 +6,7 @@ K:Kicker:2 T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigCopy | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, create a token that's a copy of CARDNAME, except it's not legendary and its starting loyalty is 1. SVar:TrigCopy:DB$ CopyPermanent | Defined$ Self | NonLegendary$ True | SetLoyalty$ 1 A:AB$ Scry | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ScryNum$ 1 | SpellDescription$ Scry 1. -A:AB$ Draw | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBRemoveCounters | SpellDescription$ Draw a card and reveal it. Remove a number of loyalty counters equal to that card's converted mana cost from CARDNAME. +A:AB$ Draw | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | Ultimate$ True | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBRemoveCounters | SpellDescription$ Draw a card and reveal it. Remove a number of loyalty counters equal to that card's converted mana cost from CARDNAME. SVar:DBRemoveCounters:DB$ RemoveCounter | Defined$ Self | CounterType$ LOYALTY | CounterNum$ X | References$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$CardManaCost From ad4aacba5718363dc678845707a451e444e6a61b Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 12 Oct 2020 20:16:37 -0400 Subject: [PATCH 5/6] might as well use nickname :) --- forge-gui/res/cardsfolder/j/jace_mirror_mage.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt b/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt index d6d63ce3569..6bfc5d248cf 100644 --- a/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt +++ b/forge-gui/res/cardsfolder/j/jace_mirror_mage.txt @@ -3,7 +3,7 @@ ManaCost:1 U U Types:Legendary Planeswalker Jace Loyalty:4 K:Kicker:2 -T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigCopy | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, create a token that's a copy of CARDNAME, except it's not legendary and its starting loyalty is 1. +T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigCopy | TriggerDescription$ When CARDNAME enters the battlefield, if NICKNAME was kicked, create a token that's a copy of CARDNAME, except it's not legendary and its starting loyalty is 1. SVar:TrigCopy:DB$ CopyPermanent | Defined$ Self | NonLegendary$ True | SetLoyalty$ 1 A:AB$ Scry | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ScryNum$ 1 | SpellDescription$ Scry 1. A:AB$ Draw | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | Ultimate$ True | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBRemoveCounters | SpellDescription$ Draw a card and reveal it. Remove a number of loyalty counters equal to that card's converted mana cost from CARDNAME. From 7e1135a0aadd94a228bea83a7607856a2da9e990 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 13 Oct 2020 14:29:06 -0400 Subject: [PATCH 6/6] typo fix --- forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt b/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt index 4b94ed9ebda..efbdbdc6a1b 100755 --- a/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt +++ b/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Kor Cleric PT:3/3 K:Lifelink T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric with lesser converted mana cost from your graveyard to the battlefield. -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZone$ Battlefield | ValidCard$ Cleric.YouCtrl+Other | Execute$ TrigReturn | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric card with lesser converted mana cost from your graveyard to the battlefield. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Cleric.YouCtrl+Other | Execute$ TrigReturn | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric card with lesser converted mana cost from your graveyard to the battlefield. SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Cleric.cmcLTX+YouOwn | TgtPrompt$ Choose target Cleric card with lesser converted mana cost | References$ X | Origin$ Graveyard | Destination$ Battlefield SVar:X:TriggeredCard$CardManaCost DeckHas:Ability$Graveyard