Merge branch 'zenith' into 'master'

Fix Zeniths + Flashback Closes #2055 See merge request core-developers/forge!6055
2025-11-11 16:26:22 +00:00 · 2022-01-19 04:21:55 +00:00
parent ff74e5c48c df87ad8cf7
commit 6b41b66eff
35 changed files with 35 additions and 35 deletions
--- a/forge-gui/res/cardsfolder/a/approach_of_the_second_sun.txt
+++ b/forge-gui/res/cardsfolder/a/approach_of_the_second_sun.txt
@@ -6,7 +6,7 @@ SVar:ApproachingSuns:DB$ Effect | Name$ ApproachingSuns | Duration$ Permanent
 A:SP$ Branch | Cost$ 6 W | BranchConditionSVar$ X | BranchConditionSVarCompare$ EQ3 | TrueSubAbility$ WinGame | FalseSubAbility$ GainLife | SpellDescription$ If this spell was cast from your hand and you've cast another spell named Approach of the Second Sun this game, you win the game. Otherwise, put CARDNAME into its owner's library seventh from the top and you gain 7 life.
 SVar:WinGame:DB$ WinsGame | Defined$ You
 SVar:GainLife:DB$ GainLife | LifeAmount$ 7 | Defined$ You | SubAbility$ Reapproach
-SVar:Reapproach:DB$ ChangeZone | Origin$ Stack | Destination$ Library | LibraryPosition$ 6 | Defined$ Self
+SVar:Reapproach:DB$ ChangeZone | Origin$ Stack | Destination$ Library | LibraryPosition$ 6 | Defined$ Parent
 SVar:Y:Count$ValidCommand Effect.YouCtrl+namedApproachingSuns/LimitMax.2
 SVar:Z:Count$ValidStack Card.wasCastFromHand+Self/LimitMax.1
 SVar:X:SVar$Y/Plus.Z
--- a/forge-gui/res/cardsfolder/b/beacon_of_creation.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_creation.txt
@@ -2,7 +2,7 @@ Name:Beacon of Creation
 ManaCost:3 G
 Types:Sorcery
 A:SP$ Token | Cost$ 3 G | TokenAmount$ X | TokenScript$ g_1_1_insect | TokenOwner$ You | SubAbility$ DBShuffle | SpellDescription$ Create a 1/1 green Insect creature token for each Forest you control. Shuffle CARDNAME into its owner's library. | LegacyImage$ g 1 1 insect 5dn
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:X:Count$TypeYouCtrl.Forest
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beacon_of_creation.jpg
 Oracle:Create a 1/1 green Insect creature token for each Forest you control. Shuffle Beacon of Creation into its owner's library.
--- a/forge-gui/res/cardsfolder/b/beacon_of_destruction.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_destruction.txt
@@ -2,6 +2,6 @@ Name:Beacon of Destruction
 ManaCost:3 R R
 Types:Instant
 A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 5 | SubAbility$ DBShuffle | SpellDescription$ CARDNAME deals 5 damage to any target. Shuffle CARDNAME into its owner's library.
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:Picture:http://resources.wizards.com/magic/cards/5dn/en-us/card51612.jpg
 Oracle:Beacon of Destruction deals 5 damage to any target. Shuffle Beacon of Destruction into its owner's library.
--- a/forge-gui/res/cardsfolder/b/beacon_of_immortality.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_immortality.txt
@@ -2,6 +2,6 @@ Name:Beacon of Immortality
 ManaCost:5 W
 Types:Instant
 A:SP$ SetLife | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | SubAbility$ DBShuffle | SpellDescription$ Double target player's life total. Shuffle CARDNAME into its owner's library.
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:X:TargetedPlayer$LifeTotal/Twice
 Oracle:Double target player's life total. Shuffle Beacon of Immortality into its owner's library.
--- a/forge-gui/res/cardsfolder/b/beacon_of_tomorrows.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_tomorrows.txt
@@ -2,6 +2,6 @@ Name:Beacon of Tomorrows
 ManaCost:6 U U
 Types:Sorcery
 A:SP$ AddTurn | Cost$ 6 U U | ValidTgts$ Player | NumTurns$ 1 | SubAbility$ DBShuffle | SpellDescription$ Target player takes an extra turn after this one. Shuffle CARDNAME into its owner's library.
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beacon_of_tomorrows.jpg
 Oracle:Target player takes an extra turn after this one. Shuffle Beacon of Tomorrows into its owner's library.
--- a/forge-gui/res/cardsfolder/b/beacon_of_unrest.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_unrest.txt
@@ -2,6 +2,6 @@ Name:Beacon of Unrest
 ManaCost:3 B B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 B B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Select a target creature or artifact in a graveyard | ValidTgts$ Creature,Artifact | SubAbility$ DBShuffle | SpellDescription$ Put target artifact or creature card from a graveyard onto the battlefield under your control. Shuffle CARDNAME into its owner's library.
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:Picture:http://resources.wizards.com/magic/cards/5dn/en-us/card51611.jpg
 Oracle:Put target artifact or creature card from a graveyard onto the battlefield under your control. Shuffle Beacon of Unrest into its owner's library.
--- a/forge-gui/res/cardsfolder/b/black_suns_zenith.txt
+++ b/forge-gui/res/cardsfolder/b/black_suns_zenith.txt
@@ -3,7 +3,7 @@ ManaCost:X B B
 Types:Sorcery
 A:SP$ PutCounterAll | Cost$ X B B | ValidCards$ Creature | CounterType$ M1M1 | CounterNum$ X | SubAbility$ DBShuffle | IsCurse$ True | SpellDescription$ Put X -1/-1 counters on each creature. Shuffle CARDNAME into its owner's library.
 SVar:X:Count$xPaid
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_suns_zenith.jpg
 Oracle:Put X -1/-1 counters on each creature. Shuffle Black Sun's Zenith into its owner's library.
--- a/forge-gui/res/cardsfolder/b/blue_suns_zenith.txt
+++ b/forge-gui/res/cardsfolder/b/blue_suns_zenith.txt
@@ -3,6 +3,6 @@ ManaCost:X U U U
 Types:Instant
 A:SP$ Draw | Cost$ X U U U | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Choose a player | SubAbility$ DBShuffle | SpellDescription$ Target player draws X cards. Shuffle CARDNAME into its owner's library.
 SVar:X:Count$xPaid
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blue_suns_zenith.jpg
 Oracle:Target player draws X cards. Shuffle Blue Sun's Zenith into its owner's library.
--- a/forge-gui/res/cardsfolder/c/cerebral_eruption.txt
+++ b/forge-gui/res/cardsfolder/c/cerebral_eruption.txt
@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Sorcery
 A:SP$ Dig | Cost$ 2 R R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ 1 | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBDamage | SpellDescription$ Target opponent reveals the top card of their library. Cerebral Eruption deals damage equal to the revealed card's mana value to that player and each creature they control. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
 SVar:DBDamage:DB$ DamageAll | ValidCards$ Creature.TargetedPlayerCtrl | ValidPlayers$ Targeted | ValidDescription$ that player and each creature they control. | NumDmg$ X | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | ConditionDescription$ If a land card is revealed this way, | SubAbility$ DBCleanup
+SVar:DBReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | ConditionDescription$ If a land card is revealed this way, | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cerebral_eruption.jpg
--- a/forge-gui/res/cardsfolder/e/ever_after.txt
+++ b/forge-gui/res/cardsfolder/e/ever_after.txt
@@ -3,7 +3,7 @@ ManaCost:4 B B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 4 B B | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | TargetMin$ 0 | TargetMax$ 2 | AnimateSubAbility$ Animate | SubAbility$ DBPut | SpellDescription$ Return up to two target creature cards from your graveyard onto the battlefield.
 SVar:Animate:DB$ Animate | Defined$ Remembered | Types$ Zombie | Colors$ Black | Duration$ Permanent | SpellDescription$ Each of those creatures is a black Zombie in addition to its other colors and types.
-SVar:DBPut:DB$ ChangeZone | Origin$ Stack | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put Ever After on the bottom of its owner's library.
+SVar:DBPut:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put Ever After on the bottom of its owner's library.
 DeckHints:Ability$Graveyard & Ability$Discard & Type$Zombie
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ever_after.jpg
 Oracle:Return up to two target creature cards from your graveyard to the battlefield. Each of those creatures is a black Zombie in addition to its other colors and types. Put Ever After on the bottom of its owner's library.
--- a/forge-gui/res/cardsfolder/g/green_suns_zenith.txt
+++ b/forge-gui/res/cardsfolder/g/green_suns_zenith.txt
@@ -3,6 +3,6 @@ ManaCost:X G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ X G | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Green+cmcLEX | ChangeNum$ 1 | SubAbility$ DBShuffle | StackDescription$ Search your library for a green creature card with mana value X or less, put it onto the battlefield, then shuffle. | SpellDescription$ Search your library for a green creature card with mana value X or less, put it onto the battlefield, then shuffle. Shuffle CARDNAME into its owner's library.
 SVar:X:Count$xPaid
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/green_suns_zenith.jpg
 Oracle:Search your library for a green creature card with mana value X or less, put it onto the battlefield, then shuffle. Shuffle Green Sun's Zenith into its owner's library.
--- a/forge-gui/res/cardsfolder/h/hanabi_blast.txt
+++ b/forge-gui/res/cardsfolder/h/hanabi_blast.txt
@@ -2,7 +2,7 @@ Name:Hanabi Blast
 ManaCost:1 R R
 Types:Instant
 A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SubAbility$ DBBounce | SpellDescription$ CARDNAME deals 2 damage to any target. Return CARDNAME to its owner's hand, then discard a card at random.
-SVar:DBBounce:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | SubAbility$ DBDiscard
+SVar:DBBounce:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | Defined$ Parent | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ Random | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hanabi_blast.jpg
 Oracle:Hanabi Blast deals 2 damage to any target. Return Hanabi Blast to its owner's hand, then discard a card at random.
--- a/forge-gui/res/cardsfolder/h/haunting_imitation.txt
+++ b/forge-gui/res/cardsfolder/h/haunting_imitation.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ Dig | Defined$ Player | DigNum$ 1 | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBRepeatEach | StackDescription$ SpellDescription | SpellDescription$ Each player reveals the top card of their library. For each creature card revealed this way, create a token that's a copy of that card, except it's 1/1, it's a Spirit in addition to its other types, and it has flying. If no creature cards were revealed this way, return Haunting Imitation to its owner's hand.
 SVar:DBRepeatEach:DB$ RepeatEach | RepeatCards$ Creature.IsRemembered | Zone$ Library | UseImprinted$ True | RepeatSubAbility$ DBToken | SubAbility$ DBReturn
 SVar:DBToken:DB$ CopyPermanent | Defined$ Imprinted | SetPower$ 1 | SetToughness$ 1 | AddTypes$ Spirit | AddKeywords$ Flying
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Token & Type$Spirit
 Oracle:Each player reveals the top card of their library. For each creature card revealed this way, create a token that's a copy of that card, except it's 1/1, it's a Spirit in addition to its other types, and it has flying. If no creature cards were revealed this way, return Haunting Imitation to its owner's hand.
--- a/forge-gui/res/cardsfolder/j/jadzi_oracle_of_arcavios_journey_to_the_oracle.txt
+++ b/forge-gui/res/cardsfolder/j/jadzi_oracle_of_arcavios_journey_to_the_oracle.txt
@@ -20,7 +20,7 @@ Name:Journey to the Oracle
 ManaCost:2 G G
 Types:Sorcery
 A:SP$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ X | SubAbility$ DBBounce | StackDescription$ {p:You} puts any number of land cards from your hand onto the battlefield. | SpellDescription$ You may put any number of land cards from your hand onto the battlefield.
-SVar:DBBounce:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | UnlessCost$ Discard<1/Card> | UnlessSwitched$ True | UnlessPayer$ You | ConditionPresent$ Land.YouCtrl | ConditionCompare$ GE8 | StackDescription$ Then if {p:You} controls eight or more lands, they may discard a card. If {p:You} does, return CARDNAME to its owner's hand. | SpellDescription$ Then if you control eight or more lands, you may discard a card. If you do, return CARDNAME to its owner's hand.
+SVar:DBBounce:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand | UnlessCost$ Discard<1/Card> | UnlessSwitched$ True | UnlessPayer$ You | ConditionPresent$ Land.YouCtrl | ConditionCompare$ GE8 | StackDescription$ Then if {p:You} controls eight or more lands, they may discard a card. If {p:You} does, return CARDNAME to its owner's hand. | SpellDescription$ Then if you control eight or more lands, you may discard a card. If you do, return CARDNAME to its owner's hand.
 SVar:X:Count$ValidHand Land.YouCtrl
 DeckHas:Ability$Discard
 SVar:NeedsToPlayVar:X GE2
--- a/forge-gui/res/cardsfolder/m/molten_birth.txt
+++ b/forge-gui/res/cardsfolder/m/molten_birth.txt
@@ -3,6 +3,6 @@ ManaCost:1 R R
 Types:Sorcery
 A:SP$ Token | Cost$ 1 R R | TokenAmount$ 2 | LegacyImage$ r 1 1 elemental m14 | TokenScript$ r_1_1_elemental | SubAbility$ MoltenFlip | SpellDescription$ Create two 1/1 red Elemental creature tokens, then flip a coin. If you win the flip, return CARDNAME to its owner's hand.
 SVar:MoltenFlip:DB$ FlipACoin | WinSubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Origin$ Stack | Destination$ Hand
+SVar:DBReturn:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | Defined$ Parent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/molten_birth.jpg
 Oracle:Create two 1/1 red Elemental creature tokens, then flip a coin. If you win the flip, return Molten Birth to its owner's hand.
--- a/forge-gui/res/cardsfolder/p/petals_of_insight.txt
+++ b/forge-gui/res/cardsfolder/p/petals_of_insight.txt
@@ -4,7 +4,7 @@ Types:Sorcery Arcane
 A:SP$ Dig | Cost$ 4 U | DigNum$ 3 | NoMove$ True | DestinationZone$ Library | LibraryPosition$ 0 | SubAbility$ DBPetalChoose | SpellDescription$ Look at the top three cards of your library. You may put those cards on the bottom of your library in any order. If you do, return CARDNAME to its owner's hand. Otherwise, draw three cards.
 SVar:DBPetalChoose:DB$ GenericChoice | Choices$ ReturnPetals,DrawCards | Defined$ You
 SVar:ReturnPetals:DB$ Dig | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Library | LibraryPosition$ -1 | SubAbility$ DBChangeZone | SpellDescription$ You may put those cards on the bottom of your library in any order. If you do, return CARDNAME to its owner's hand.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | Defined$ Self
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | Defined$ Parent
 SVar:DrawCards:DB$ Draw | NumCards$ 3 | SpellDescription$ Otherwise, draw three cards.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/petals_of_insight.jpg
--- a/forge-gui/res/cardsfolder/p/psychic_miasma.txt
+++ b/forge-gui/res/cardsfolder/p/psychic_miasma.txt
@@ -2,6 +2,6 @@ Name:Psychic Miasma
 ManaCost:1 B
 Types:Sorcery
 A:SP$ Discard | Cost$ 1 B | ValidTgts$ Player | TgtPrompt$ Select target player | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBChangeZone | SpellDescription$ Target player discards a card. If a land card is discarded this way, return CARDNAME to its owner's hand.
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | Hidden$ True | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Target player discards a card. If a land card is discarded this way, return Psychic Miasma to its owner's hand.
--- a/forge-gui/res/cardsfolder/p/pulse_of_the_dross.txt
+++ b/forge-gui/res/cardsfolder/p/pulse_of_the_dross.txt
@@ -2,7 +2,7 @@ Name:Pulse of the Dross
 ManaCost:1 B B
 Types:Sorcery
 A:SP$ Discard | Cost$ 1 B B | ValidTgts$ Player | TgtPrompt$ Select target player | Mode$ RevealYouChoose | RevealNumber$ 3 | NumCards$ 1 | SubAbility$ ReturnDross | SpellDescription$ Target player reveals three cards from their hand and you choose one of them. That player discards that card. Then if that player has more cards in hand than you, return CARDNAME to its owner's hand.
-SVar:ReturnDross:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | Defined$ Self | Origin$ Stack | Destination$ Hand
+SVar:ReturnDross:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | Defined$ Parent | Origin$ Stack | Destination$ Hand
 SVar:X:Count$InTargetedHand
 SVar:Y:Count$InYourHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_of_the_dross.jpg
--- a/forge-gui/res/cardsfolder/p/pulse_of_the_fields.txt
+++ b/forge-gui/res/cardsfolder/p/pulse_of_the_fields.txt
@@ -2,7 +2,7 @@ Name:Pulse of the Fields
 ManaCost:1 W W
 Types:Instant
 A:SP$ GainLife | Cost$ 1 W W | Defined$ You | LifeAmount$ 4 | SubAbility$ TrigReturn | SpellDescription$ You gain 4 life. Then if an opponent has more life than you, return CARDNAME to its owner's hand.
-SVar:TrigReturn:DB$ ChangeZone | ConditionLifeTotal$ You | ConditionLifeAmount$ LTX | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDescription$ If an opponent has more life than you,
+SVar:TrigReturn:DB$ ChangeZone | ConditionLifeTotal$ You | ConditionLifeAmount$ LTX | Defined$ Parent | Origin$ Stack | Destination$ Hand | ConditionDescription$ If an opponent has more life than you,
 SVar:X:PlayerCountOpponents$HighestLifeTotal
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_of_the_fields.jpg
 Oracle:You gain 4 life. Then if an opponent has more life than you, return Pulse of the Fields to its owner's hand.
--- a/forge-gui/res/cardsfolder/p/pulse_of_the_forge.txt
+++ b/forge-gui/res/cardsfolder/p/pulse_of_the_forge.txt
@@ -2,7 +2,7 @@ Name:Pulse of the Forge
 ManaCost:1 R R
 Types:Instant
 A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 4 | SubAbility$ ReheatTheForge | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker. Then if that player or that planeswalker's controller has more life than you, return CARDNAME to its owner's hand.
-SVar:ReheatTheForge:DB$ ChangeZone | ConditionLifeTotal$ TargetedOrController | ConditionLifeAmount$ GTX | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDescription$ If that player or that planeswalker's controller has more life than you,
+SVar:ReheatTheForge:DB$ ChangeZone | ConditionLifeTotal$ TargetedOrController | ConditionLifeAmount$ GTX | Defined$ Parent | Origin$ Stack | Destination$ Hand | ConditionDescription$ If that player or that planeswalker's controller has more life than you,
 SVar:X:Count$YourLifeTotal
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_of_the_forge.jpg
 Oracle:Pulse of the Forge deals 4 damage to target player or planeswalker. Then if that player or that planeswalker's controller has more life than you, return Pulse of the Forge to its owner's hand.
--- a/forge-gui/res/cardsfolder/p/pulse_of_the_grid.txt
+++ b/forge-gui/res/cardsfolder/p/pulse_of_the_grid.txt
@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Instant
 A:SP$ Draw | Cost$ 1 U U | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards, then discard a card. Then if an opponent has more cards in hand than you, return CARDNAME to its owner's hand.
 SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ TrigReturn
-SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY
+SVar:TrigReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY
 SVar:Y:Count$CardsInYourHand
 SVar:X:PlayerCountOpponents$HighestCardsInHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_of_the_grid.jpg
--- a/forge-gui/res/cardsfolder/p/pulse_of_the_tangle.txt
+++ b/forge-gui/res/cardsfolder/p/pulse_of_the_tangle.txt
@@ -2,7 +2,7 @@ Name:Pulse of the Tangle
 ManaCost:1 G G
 Types:Sorcery
 A:SP$ Token | Cost$ 1 G G | TokenAmount$ 1 | TokenScript$ g_3_3_beast | TokenOwner$ You | LegacyImage$ g 3 3 beast dst | SubAbility$ DBBounce | SpellDescription$ Create a 3/3 green Beast creature token. Then if an opponent controls more creatures than you, return CARDNAME to its owner's hand.
-SVar:DBBounce:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | ConditionPresent$ Creature.OppCtrl | ConditionCompare$ GTX
+SVar:DBBounce:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | ConditionPresent$ Creature.OppCtrl | ConditionCompare$ GTX | Defined$ Parent
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_of_the_tangle.jpg
 Oracle:Create a 3/3 green Beast creature token. Then if an opponent controls more creatures than you, return Pulse of the Tangle to its owner's hand.
--- a/forge-gui/res/cardsfolder/r/recross_the_paths.txt
+++ b/forge-gui/res/cardsfolder/r/recross_the_paths.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Sorcery
 A:SP$ DigUntil | Cost$ 2 G | Valid$ Land | ValidDescription$ land | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RememberFound$ True | SubAbility$ RecrossClash | SpellDescription$ Reveal cards from the top of your library until you reveal a land card. Put that card onto the battlefield and the rest on the bottom of your library in any order. Clash with an opponent. If you win, return CARDNAME to its owner's hand. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
 SVar:RecrossClash:DB$ Clash | WinSubAbility$ RecrossReturn
-SVar:RecrossReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand
+SVar:RecrossReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/recross_the_paths.jpg
 Oracle:Reveal cards from the top of your library until you reveal a land card. Put that card onto the battlefield and the rest on the bottom of your library in any order. Clash with an opponent. If you win, return Recross the Paths to its owner's hand. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
--- a/forge-gui/res/cardsfolder/r/red_suns_zenith.txt
+++ b/forge-gui/res/cardsfolder/r/red_suns_zenith.txt
@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | RememberDamaged$ True | ReplaceDyingDefined$ Remembered.Creature | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals X damage to any target. If a creature dealt damage this way would die this turn, exile it instead. Shuffle CARDNAME into its owner's library.
 SVar:X:Count$xPaid
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBShuffle
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | StackDescription$ Shuffle CARDNAME into {p:You}'s library.
+SVar:DBShuffle:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Library | Shuffle$ True | StackDescription$ Shuffle CARDNAME into {p:You}'s library.
 Oracle:Red Sun's Zenith deals X damage to any target. If a creature dealt damage this way would die this turn, exile it instead. Shuffle Red Sun's Zenith into its owner's library.
--- a/forge-gui/res/cardsfolder/r/redeem_the_lost.txt
+++ b/forge-gui/res/cardsfolder/r/redeem_the_lost.txt
@@ -3,6 +3,6 @@ ManaCost:1 W
 Types:Instant
 A:SP$ Protection | Cost$ 1 W | ValidTgts$ Creature.YouCtrl | Gains$ Choice | Choices$ AnyColor | TgtPrompt$ Select target creature | SubAbility$ DBClash | SpellDescription$ Target creature you control gains protection from the color of your choice until end of turn. Clash with an opponent. If you win, return CARDNAME to its owner's hand.
 SVar:DBClash:DB$ Clash | WinSubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand
+SVar:DBReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/redeem_the_lost.jpg
 Oracle:Target creature you control gains protection from the color of your choice until end of turn. Clash with an opponent. If you win, return Redeem the Lost to its owner's hand. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
--- a/forge-gui/res/cardsfolder/r/release_the_ants.txt
+++ b/forge-gui/res/cardsfolder/r/release_the_ants.txt
@@ -3,6 +3,6 @@ ManaCost:1 R
 Types:Instant
 A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select any target | NumDmg$ 1 | SubAbility$ DBClash | SpellDescription$ Release the Ants deals 1 damage to any target. Clash with an opponent. If you win, return CARDNAME to its owner's hand.
 SVar:DBClash:DB$ Clash | WinSubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand
+SVar:DBReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/release_the_ants.jpg
 Oracle:Release the Ants deals 1 damage to any target. Clash with an opponent. If you win, return Release the Ants to its owner's hand. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
--- a/forge-gui/res/cardsfolder/r/research_the_deep.txt
+++ b/forge-gui/res/cardsfolder/r/research_the_deep.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Sorcery
 A:SP$ Draw | Cost$ 1 U | Defined$ You | NumCards$ 1 | SubAbility$ DBClash | SpellDescription$ Draw a card. Clash with an opponent. If you win, return CARDNAME to it's owners hand.
 SVar:DBClash:DB$ Clash | WinSubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand
+SVar:DBReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/research_the_deep.jpg
 Oracle:Draw a card. Clash with an opponent. If you win, return Research the Deep to its owner's hand. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
--- a/forge-gui/res/cardsfolder/r/revive_the_fallen.txt
+++ b/forge-gui/res/cardsfolder/r/revive_the_fallen.txt
@@ -3,6 +3,6 @@ ManaCost:1 B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 1 B | ValidTgts$ Creature | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBClash | SpellDescription$ Return target creature card from a graveyard to its owner's hand. Clash with an opponent. If you win, return CARDNAME to its owner's hand.
 SVar:DBClash:DB$ Clash | WinSubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand
+SVar:DBReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/revive_the_fallen.jpg
 Oracle:Return target creature card from a graveyard to its owner's hand. Clash with an opponent. If you win, return Revive the Fallen to its owner's hand. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
--- a/forge-gui/res/cardsfolder/s/sanguine_sacrament.txt
+++ b/forge-gui/res/cardsfolder/s/sanguine_sacrament.txt
@@ -2,7 +2,7 @@ Name:Sanguine Sacrament
 ManaCost:X W W
 Types:Instant
 A:SP$ GainLife | Cost$ X W W | LifeAmount$ XX | Defined$ You | SubAbility$ DBPutOnBottom | SpellDescription$ You gain twice X life. Put CARDNAME on the bottom of its owner's library.
-SVar:DBPutOnBottom:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Library | LibraryPosition$ -1
+SVar:DBPutOnBottom:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Library | LibraryPosition$ -1
 SVar:X:Count$xPaid
 SVar:XX:SVar$X/Twice
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sanguine_sacrament.jpg
--- a/forge-gui/res/cardsfolder/s/seasons_past.txt
+++ b/forge-gui/res/cardsfolder/s/seasons_past.txt
@@ -2,7 +2,7 @@ Name:Seasons Past
 ManaCost:4 G G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 4 G G | ChangeType$ Card.YouOwn | Hidden$ True | Origin$ Graveyard | Destination$ Hand | DifferentCMC$ True | ChangeNum$ X | SubAbility$ DBChangeZone | StackDescription$ SpellDescription | SpellDescription$ Return any number of cards with different mana values from your graveyard to your hand. Put CARDNAME on the bottom of its owner's library.
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Library | LibraryPosition$ -1
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Library | LibraryPosition$ -1
 SVar:X:Count$ValidGraveyard Card.YouOwn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seasons_past.jpg
 AI:RemoveDeck:Random
--- a/forge-gui/res/cardsfolder/s/spell_crumple.txt
+++ b/forge-gui/res/cardsfolder/s/spell_crumple.txt
@@ -2,6 +2,6 @@ Name:Spell Crumple
 ManaCost:1 U U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ BottomOfLibrary | SubAbility$ DBChange | SpellDescription$ Counter target spell. If that spell is countered this way, put it on the bottom of its owner's library instead of into that player's graveyard. Put CARDNAME on the bottom of its owner's library.
-SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Library | LibraryPosition$ -1
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Library | LibraryPosition$ -1 | Defined$ Parent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_crumple.jpg
 Oracle:Counter target spell. If that spell is countered this way, put it on the bottom of its owner's library instead of into that player's graveyard. Put Spell Crumple on the bottom of its owner's library.
--- a/forge-gui/res/cardsfolder/t/titans_revenge.txt
+++ b/forge-gui/res/cardsfolder/t/titans_revenge.txt
@@ -3,7 +3,7 @@ ManaCost:X R R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ X R R | NumDmg$ X | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | SubAbility$ DBClash | SpellDescription$ CARDNAME deals X damage to any target. Clash with an opponent. If you win, return CARDNAME to it's owner's hand.
 SVar:DBClash:DB$ Clash | WinSubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand
+SVar:DBReturn:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/titans_revenge.jpg
 Oracle:Titan's Revenge deals X damage to any target. Clash with an opponent. If you win, return Titan's Revenge to its owner's hand. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
--- a/forge-gui/res/cardsfolder/u/unexpected_results.txt
+++ b/forge-gui/res/cardsfolder/u/unexpected_results.txt
@@ -5,7 +5,7 @@ A:SP$ Shuffle | Cost$ 2 G U | Defined$ You | SubAbility$ RevealCard | SpellDescr
 SVar:RevealCard:DB$ Dig | Defined$ You | DigNum$ 1 | Reveal$ True | RememberRevealed$ True | NoMove$ True | SubAbility$ CastCard
 SVar:CastCard:DB$ Play | Defined$ Remembered | WithoutManaCost$ True | ValidSA$ Spell | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | SubAbility$ MoveLand
 SVar:MoveLand:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | ConditionDefined$ Remembered | Optional$ True | Imprint$ True | ConditionPresent$ Card.Land | ConditionCompare$ EQ1 | SubAbility$ MoveSelf
-SVar:MoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDefined$ Imprinted | ConditionPresent$ Card.Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:MoveSelf:DB$ ChangeZone | Defined$ Parent | Origin$ Stack | Destination$ Hand | ConditionDefined$ Imprinted | ConditionPresent$ Card.Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unexpected_results.jpg
 Oracle:Shuffle your library, then reveal the top card. If it's a nonland card, you may cast it without paying its mana cost. If it's a land card, you may put it onto the battlefield and return Unexpected Results to its owner's hand.
--- a/forge-gui/res/cardsfolder/v/view_from_above.txt
+++ b/forge-gui/res/cardsfolder/v/view_from_above.txt
@@ -2,7 +2,7 @@ Name:View from Above
 ManaCost:1 U
 Types:Instant
 A:SP$ Pump | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SubAbility$ DBBounce | SpellDescription$ Target creature gains flying until end of turn. If you control a white permanent, return CARDNAME to its owner's hand.
-SVar:DBBounce:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | ConditionPresent$ Permanent.White+YouCtrl | ConditionCompare$ GE1
+SVar:DBBounce:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | ConditionPresent$ Permanent.White+YouCtrl | ConditionCompare$ GE1 | Defined$ Parent
 DeckHints:Color$White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/view_from_above.jpg
 Oracle:Target creature gains flying until end of turn. If you control a white permanent, return View from Above to its owner's hand.
--- a/forge-gui/res/cardsfolder/w/white_suns_zenith.txt
+++ b/forge-gui/res/cardsfolder/w/white_suns_zenith.txt
@@ -3,6 +3,6 @@ ManaCost:X W W W
 Types:Instant
 A:SP$ Token | Cost$ X W W W | TokenAmount$ X | TokenScript$ w_2_2_cat | TokenOwner$ You | LegacyImage$ w 2 2 cat mbs | SubAbility$ DBShuffle | SpellDescription$ Create X 2/2 white Cat creature tokens. Shuffle CARDNAME into its owner's library.
 SVar:X:Count$xPaid
-SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | Defined$ Parent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/white_suns_zenith.jpg
 Oracle:Create X 2/2 white Cat creature tokens. Shuffle White Sun's Zenith into its owner's library.