From 393af026201a431b1e12592a7ee0b1ef69d8d2de Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 13 Sep 2022 12:53:12 -0400 Subject: [PATCH 1/2] fixes from PR 1488 --- .../res/cardsfolder/upcoming/stenn_paranoid_partisan.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/sunbathing_rootwalla.txt | 3 ++- forge-gui/res/cardsfolder/upcoming/take_up_the_shield.txt | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/stenn_paranoid_partisan.txt b/forge-gui/res/cardsfolder/upcoming/stenn_paranoid_partisan.txt index e3bf37df0a1..3919f178e1e 100644 --- a/forge-gui/res/cardsfolder/upcoming/stenn_paranoid_partisan.txt +++ b/forge-gui/res/cardsfolder/upcoming/stenn_paranoid_partisan.txt @@ -5,8 +5,8 @@ PT:2/2 K:ETBReplacement:Other:ChooseCT SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Card | ValidTypes$ Artifact,Planeswalker,Enchantment,Instant,Sorcery | SpellDescription$ As CARDNAME enters the battlefield, choose a card type other than creature or land. S:Mode$ ReduceCost | ValidCard$ Card.ChosenType | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Spells you cast of the chosen type cost {1} less to cast. -A:AB$ ChangeZone | Cost$ 1 W U | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile NICKNAME, Return it to the battlefield under its owner's control at the beginning of the next end step. -SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | RememberObjects$ Remembered | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield. | SubAbility$ DBCleanup +A:AB$ ChangeZone | Cost$ 1 W U | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile NICKNAME. Return it to the battlefield under its owner's control at the beginning of the next end step. +SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | RememberObjects$ Remembered | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return it to the battlefield under its owner's control at the beginning of the next end step. | SubAbility$ DBCleanup SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True AI:RemoveDeck:All diff --git a/forge-gui/res/cardsfolder/upcoming/sunbathing_rootwalla.txt b/forge-gui/res/cardsfolder/upcoming/sunbathing_rootwalla.txt index 2e73f3284bd..ea6d044def2 100644 --- a/forge-gui/res/cardsfolder/upcoming/sunbathing_rootwalla.txt +++ b/forge-gui/res/cardsfolder/upcoming/sunbathing_rootwalla.txt @@ -4,4 +4,5 @@ Types:Creature Lizard PT:2/2 A:AB$ Pump | Cost$ 3 G | Defined$ Self | NumAtt$ X | NumDef$ X | ActivationLimit$ 1 | PrecostDesc$ Domain — | SpellDescription$ Until end of turn, CARDNAME gets +1/+1 for each basic land type among lands you control. Activate only once each turn. SVar:X:Count$Domain -Oracle:Domain — {3}{G}: Until end of turn, Sunbathing Rootwalla gets +1/+1 for each basic land type among lands you control. Activate only once each turn. \ No newline at end of file +AI:RemoveDeck:Random +Oracle:Domain — {3}{G}: Until end of turn, Sunbathing Rootwalla gets +1/+1 for each basic land type among lands you control. Activate only once each turn. diff --git a/forge-gui/res/cardsfolder/upcoming/take_up_the_shield.txt b/forge-gui/res/cardsfolder/upcoming/take_up_the_shield.txt index b89ba2d7b37..db400c6365a 100644 --- a/forge-gui/res/cardsfolder/upcoming/take_up_the_shield.txt +++ b/forge-gui/res/cardsfolder/upcoming/take_up_the_shield.txt @@ -2,6 +2,6 @@ Name:Take Up the Shield ManaCost:1 W Types:Instant A:SP$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on target creature. It gains lifelink and indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.) -SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Lifelink & Hexproof -DeckHas:Ability$Counters & Keyword$Lifelink|Hexproof +SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Lifelink & Indestructible +DeckHas:Ability$Counters & Keyword$Lifelink|Indestructible Oracle:Put a +1/+1 counter on target creature. It gains lifelink and indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.) From 4b25fb23588e39da34b6e8ad2db98e1f580b874f Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 13 Sep 2022 13:01:02 -0400 Subject: [PATCH 2/2] urborg_repossession.txt don't target for kicker if not kicked --- forge-gui/res/cardsfolder/upcoming/urborg_repossession.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/urborg_repossession.txt b/forge-gui/res/cardsfolder/upcoming/urborg_repossession.txt index a0e9f5504c1..e3f8233a8de 100644 --- a/forge-gui/res/cardsfolder/upcoming/urborg_repossession.txt +++ b/forge-gui/res/cardsfolder/upcoming/urborg_repossession.txt @@ -2,9 +2,10 @@ Name:Urborg Repossession ManaCost:B Types:Sorcery K:Kicker:1 G -A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeNum$ 1 | TgtPrompt$ Choose target creature card in your graveyard | ChangeType$ | SubAbility$ DBGainLife | ValidTgts$ Creature.YouOwn | SpellDescription$ Return target creature card from your graveyard to your hand. You gain 2 life. If this spell was kicked, return another target permanent card from your graveyard to your hand. +A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | SubAbility$ DBGainLife | ValidTgts$ Creature.YouOwn | SpellDescription$ Return target creature card from your graveyard to your hand. You gain 2 life. If this spell was kicked, return another target permanent card from your graveyard to your hand. SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | SubAbility$ DBReturnKicked -SVar:DBReturnKicked:DB$ ChangeZone | Condition$ Kicked | TargetUnique$ True | Origin$ Graveyard | Destination$ Hand | ChangeNum$ 1 | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouOwn +SVar:DBReturnKicked:DB$ ChangeZone | Condition$ Kicked | TargetUnique$ True | Origin$ Graveyard | Destination$ Hand | TargetMin$ Y | TargetMax$ Y | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouOwn +SVar:Y:Count$Kicked.1.0 DeckHas:Ability$LifeGain|Graveyard DeckHints:Color$Green Oracle:Kicker {1}{G} (You may pay an additional {1}{G} as you cast this spell.) Return target creature card from your graveyard to your hand. You gain 2 life. If this spell was kicked, return another target permanent card from your graveyard to your hand.