From fde57adc20f3e4a781c2878403fb2470b1c81ffb Mon Sep 17 00:00:00 2001 From: Hanmac Date: Thu, 20 Apr 2017 12:38:32 +0000 Subject: [PATCH] upcoming cards: trial should only trigger on the battlefield --- forge-gui/res/cardsfolder/upcoming/trial_of_ambition.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/trial_of_knowledge.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/trial_of_solidarity.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/trial_of_strength.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/trial_of_zeal.txt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/trial_of_ambition.txt b/forge-gui/res/cardsfolder/upcoming/trial_of_ambition.txt index df2e32d0a37..2a6fa0f9b1f 100644 --- a/forge-gui/res/cardsfolder/upcoming/trial_of_ambition.txt +++ b/forge-gui/res/cardsfolder/upcoming/trial_of_ambition.txt @@ -3,8 +3,8 @@ ManaCost:1 B Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When CARDNAME enters the battlefield, target opponent sacrifices a creature. SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | ValidTgts$ Opponent | SacValid$ Creature | SacMessage$ Creature -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/trial_of_ambition.jpg -Oracle:WWhen Trial of Ambition enters the battlefield, target opponent sacrifices a creature.\nWhen a Cartouche enters the battlefield under your control, return Trial of Ambition to its owner's hand. \ No newline at end of file +Oracle:WWhen Trial of Ambition enters the battlefield, target opponent sacrifices a creature.\nWhen a Cartouche enters the battlefield under your control, return Trial of Ambition to its owner's hand. diff --git a/forge-gui/res/cardsfolder/upcoming/trial_of_knowledge.txt b/forge-gui/res/cardsfolder/upcoming/trial_of_knowledge.txt index cd111b7ecc3..0b5e9978955 100644 --- a/forge-gui/res/cardsfolder/upcoming/trial_of_knowledge.txt +++ b/forge-gui/res/cardsfolder/upcoming/trial_of_knowledge.txt @@ -4,8 +4,8 @@ Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card, then discard a card. SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 3 | SubAbility$ DBDiscard SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/trial_of_knowledge.jpg -Oracle:When Trial of Knowledge enters the battlefield, draw three cards, then discard a card.\nWhen a Cartouche enters the battlefield under your control, return Trial of Knowledge to its owner's hand. \ No newline at end of file +Oracle:When Trial of Knowledge enters the battlefield, draw three cards, then discard a card.\nWhen a Cartouche enters the battlefield under your control, return Trial of Knowledge to its owner's hand. diff --git a/forge-gui/res/cardsfolder/upcoming/trial_of_solidarity.txt b/forge-gui/res/cardsfolder/upcoming/trial_of_solidarity.txt index 237ba53eac3..5d22bd90f2e 100644 --- a/forge-gui/res/cardsfolder/upcoming/trial_of_solidarity.txt +++ b/forge-gui/res/cardsfolder/upcoming/trial_of_solidarity.txt @@ -3,8 +3,8 @@ ManaCost:2 W Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters the battlefield, creatures you control get +2/+1 and gain vigilance until end of turn. SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +1 | AddKeyword$ Vigilance -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/trial_of_solidarity.jpg -Oracle:When Trial of Solidarity enters the battlefield, creatures you control get +2/+1 and gain vigilance until end of turn.\nWhen a Cartouche enters the battlefield under your control, return Trial of Solidarity to its owner's hand. \ No newline at end of file +Oracle:When Trial of Solidarity enters the battlefield, creatures you control get +2/+1 and gain vigilance until end of turn.\nWhen a Cartouche enters the battlefield under your control, return Trial of Solidarity to its owner's hand. diff --git a/forge-gui/res/cardsfolder/upcoming/trial_of_strength.txt b/forge-gui/res/cardsfolder/upcoming/trial_of_strength.txt index 14e89f6466f..66f915b1b70 100644 --- a/forge-gui/res/cardsfolder/upcoming/trial_of_strength.txt +++ b/forge-gui/res/cardsfolder/upcoming/trial_of_strength.txt @@ -3,8 +3,8 @@ ManaCost:2 G Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 4/2 green Beast creature token. SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 2 | TokenImage$ g 4 2 beast -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/trial_of_strength.jpg -Oracle:When Trial of Strength enters the battlefield, create a 4/2 green Beast creature token.\nWhen a Cartouche enters the battlefield under your control, return Trial of Strength to its owner's hand. \ No newline at end of file +Oracle:When Trial of Strength enters the battlefield, create a 4/2 green Beast creature token.\nWhen a Cartouche enters the battlefield under your control, return Trial of Strength to its owner's hand. diff --git a/forge-gui/res/cardsfolder/upcoming/trial_of_zeal.txt b/forge-gui/res/cardsfolder/upcoming/trial_of_zeal.txt index 733ff6e8c3c..60e51f48b76 100644 --- a/forge-gui/res/cardsfolder/upcoming/trial_of_zeal.txt +++ b/forge-gui/res/cardsfolder/upcoming/trial_of_zeal.txt @@ -3,9 +3,9 @@ ManaCost:2 R Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 3 damage to target creature or player. SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Cartouche.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Cartouche enters the battlefield under your control, return CARDNAME to its owner's hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/trial_of_zeal.jpg Oracle:When Trial of Zeal enters the battlefield, it deals 3 damage to target creature or player. -When a Cartouche enters the battlefield under your control, return Trial of Zeal to its owner's hand. \ No newline at end of file +When a Cartouche enters the battlefield under your control, return Trial of Zeal to its owner's hand.