From fb64821e0c33a46a775154b6dd5eb85a3d86cfed Mon Sep 17 00:00:00 2001
From: Eduardo <punkeduard@gmail.com>
Date: Mon, 2 Aug 2021 13:23:46 -0500
Subject: [PATCH] Fixes to primitives

kykar, winds's fury
Portal of Sanctuary
Arasta of the Endless Web
The Binding of the Titans exiles opponent cards to my zone
miscast
Greenbelt Rampager
increasing ambition
Brago, king eternal no return of the king
enshrined memories
izzet charm loot
said // done
gallia of the endless dance
shatter the sky is green
Arasta of the Endless Web
Nylea, keen-eye puts creature into field instead of hand
---
 .../bin/Res/sets/primitives/borderline.txt    | 135 +++++++++---------
 projects/mtg/bin/Res/sets/primitives/mtg.txt  |  64 ++++-----
 2 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index c762fbb2e..28fbcf8d8 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -103,7 +103,7 @@ type=Instant
 [card]
 name=Absolver Thrull
 auto=name(Destroy enchantment) target(enchantment|battlefield) destroy
-auto=@movedto(this|graveyard) from(mybattlefield):all(trigger[to]) transforms((,newability[moveto(myexile) and!( transforms((,newability[name(Haunt a creature) target(creature) counter(0/0.1.ThrullHaunted)])) oneshot )!])) oneshot
+auto=_DIES_all(trigger[to]) transforms((,newability[moveto(myexile) and!( transforms((,newability[name(Haunt a creature) target(creature) counter(0/0.1.ThrullHaunted)])) oneshot )!])) oneshot
 autoexile=@movedto(creature[counter{0/0.1.ThrullHaunted}]|graveyard) from(battlefield) once:name(Destroy enchantment) target(enchantment|battlefield) destroy
 text=Haunt (When this creature dies, exile it haunting target creature.) -- When Absolver Thrull enters the battlefield or the creature it haunts dies, destroy target enchantment.
 mana={3}{W}
@@ -2296,7 +2296,7 @@ toughness=6
 [card]
 name=Arasta of the Endless Web
 abilities=reach
-auto=@movedto(*[sorcery,instant]|opponentStack):token(Spider,Creature Spider,1/2,reach,green)
+auto=@movedto(*[sorcery;instant]|opponentStack):token(Spider,Creature Spider,1/2,reach,green)
 text=Reach -- Whenever an opponent casts an instant or sorcery spell, create a 1/2 green Spider creature token with reach.
 mana={2}{G}{G}
 type=Legendary Enchantment Creature
@@ -5246,7 +5246,7 @@ toughness=4
 name=Belfry Spirit
 abilities=flying
 auto=token(Bat,Creature Bat,1/1,black,flying)*2
-auto=@movedto(this|graveyard) from(mybattlefield):all(trigger[to]) transforms((,newability[moveto(myexile) and!( transforms((,newability[name(Haunt a creature) target(creature) counter(0/0.1.BelfryHaunted)])) oneshot )!])) oneshot
+auto=_DIES_all(trigger[to]) transforms((,newability[moveto(myexile) and!( transforms((,newability[name(Haunt a creature) target(creature) counter(0/0.1.BelfryHaunted)])) oneshot )!])) oneshot
 autoexile=@movedto(creature[counter{0/0.1.BelfryHaunted}]|graveyard) from(battlefield) once:token(Bat,Creature Bat,1/1,black,flying)*2
 text=Flying -- Haunt (When this creature dies, exile it haunting target creature.) -- When Belfry Spirit enters the battlefield or the creature it haunts dies, put two 1/1 black Bat creature tokens with flying onto the battlefield.
 mana={3}{W}{W}
@@ -5448,7 +5448,7 @@ type=Instant
 [/card]
 [card]
 name=Beskir Shieldmate
-auto=@movedto(this|graveyard) from(mybattlefield):token(Warrior,Creature Human Warrior,1/1,white)
+auto=_DIES_token(Warrior,Creature Human Warrior,1/1,white)
 text=When Beskir Shieldmate dies, create a 1/1 white Human Warrior creature token.
 mana={1}{W}
 type=Creature
@@ -6065,7 +6065,7 @@ restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(Search for Blex)
 autostack=if paid(alternative) then transforms((,newability[moveto(mygraveyard)],newability[activate castcard(named!:search for blex:!)])) forever
 auto=lord(other *[pest;bat;insect;snake;spider]|mybattlefield) 1/1
-auto=@movedto(this|graveyard) from(mybattlefield):life:4 controller
+auto=_DIES_life:4 controller
 text=Other Pests, Bats, Insects, Snakes, and Spiders you control get +1/+1. -- When Blex, Vexing Pest dies, you gain 4 life. // Look at the top five cards of your library. You may put any number of them into your hand and the rest into your graveyard. You lose 3 life for each card you put into your hand this way. // {2}{B}{B} Search for Blex
 mana={2}{G}
 type=Legendary Creature
@@ -9269,7 +9269,7 @@ name=Cavalier of Gales
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=draw:3 controller && transforms((,newability[target(<2>*|myhand) moveto(mylibrary)])) oneshot
-auto=@movedTo(this|graveyard) from(myBattlefield):all(trigger[to]) moveTo(mylibrary) and!( transforms((,newability[scry:2 scrycore delayed dontshow donothing scrycoreend scryend],newability[shuffle])) oneshot )!
+auto=_DIES_all(trigger[to]) moveTo(mylibrary) and!( transforms((,newability[scry:2 scrycore delayed dontshow donothing scrycoreend scryend],newability[shuffle])) oneshot )!
 text=Flying -- When Cavalier of Gales enters the battlefield, draw three cards, then put two cards from your hand on top of your library in any order. -- When Cavalier of Gales dies, shuffle it into its owner's library, then scry 2.
 mana={2}{U}{U}{U}
 type=Creature
@@ -11024,7 +11024,7 @@ toughness=4
 name=Clone Shell
 aicode=activate target(*[zpos<=4]|mylibrary) moveTo(myExile)
 auto=name(look) reveal:4 optionone name(put in exile) target(*|reveal) transforms((,newability[moveTo(ownerExile) and!( counter(0/0.1.ClnImp) )!])) forever optiononeend optiontwo name(put on bottom) all(*|reveal) bottomoflibrary optiontwoend revealend
-auto=@movedTo(this|graveyard) from(myBattlefield):name(Take back from exile) name(Take back from exile) moveto(mybattlefield) target(creature[counter{0/0.1.ClnImp}]|myExile)
+auto=_DIES_name(Take back from exile) name(Take back from exile) moveto(mybattlefield) target(creature[counter{0/0.1.ClnImp}]|myExile)
 text=Imprint — When Clone Shell enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order. -- When Clone Shell dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
 mana={5}
 type=Artifact Creature
@@ -14418,7 +14418,7 @@ toughness=2
 [/card]
 [card]
 name=Deathknell Berserker
-auto=@movedto(this|graveyard) from(mybattlefield):this(power>=3) token(Zombie,Creature Zombie Berserker,2/2,black)
+auto=_DIES_this(power>=3) token(Zombie,Creature Zombie Berserker,2/2,black)
 text=When Deathknell Berserker dies, if its power was 3 or greater, create a 2/2 black Zombie Berserker creature token.
 mana={1}{B}
 type=Creature
@@ -17131,7 +17131,7 @@ type=Instant
 name=Dream Strix
 abilities=flying
 auto=@targeted(this):sacrifice
-auto=@movedto(this|graveyard) from(mybattlefield):name(Learn) transforms((,newability[if type(*[lesson]|mysideboard)~morethan~0 then choice name(Put lesson in hand) name(Put lesson in hand) target(*[lesson]|mysideboard) moveto(myhand)],newability[if type(*|myhand)~morethan~0 then choice name(Discard and draw) name(Discard and draw) target(*|myhand) reject and!(draw:1)!],newability[if type(Retriever Phoenix|mygraveyard)~morethan~0 then choice name(Return a Retriever Phoenix) name(Return a Retriever Phoenix) target(Retriever Phoenix|mygraveyard) moveto(myBattlefield)],newability[choice name(Don't learn) donothing])) oneshot
+auto=_DIES_name(Learn) transforms((,newability[if type(*[lesson]|mysideboard)~morethan~0 then choice name(Put lesson in hand) name(Put lesson in hand) target(*[lesson]|mysideboard) moveto(myhand)],newability[if type(*|myhand)~morethan~0 then choice name(Discard and draw) name(Discard and draw) target(*|myhand) reject and!(draw:1)!],newability[if type(Retriever Phoenix|mygraveyard)~morethan~0 then choice name(Return a Retriever Phoenix) name(Return a Retriever Phoenix) target(Retriever Phoenix|mygraveyard) moveto(myBattlefield)],newability[choice name(Don't learn) donothing])) oneshot
 text=Flying -- When Dream Strix becomes the target of a spell, sacrifice it. -- When Dream Strix dies, learn. (You may reveal a Lesson card you own from outside the game and put it into your hand, or discard a card to draw a card.)
 mana={2}{U}
 type=Creature
@@ -18171,7 +18171,7 @@ toughness=1
 [/card]
 [card]
 name=Elderfang Ritualist
-auto=@movedto(this|graveyard) from(mybattlefield):target(other *[elf]|mygraveyard) moveTo(myhand)
+auto=_DIES_target(other *[elf]|mygraveyard) moveTo(myhand)
 text=When Elderfang Ritualist dies, return another target Elf card from your graveyard to your hand.
 mana={2}{B}
 type=Creature
@@ -19989,7 +19989,7 @@ type=Sorcery
 [card]
 name=Exhumer Thrull
 auto=name(Return creature to hand) moveto(myhand) target(creature|mygraveyard)
-auto=@movedto(this|graveyard) from(mybattlefield):all(trigger[to]) transforms((,newability[moveto(myexile) and!( transforms((,newability[name(Haunt a creature) target(creature) counter(0/0.1.ExhumerHaunted)])) oneshot )!])) oneshot
+auto=_DIES_all(trigger[to]) transforms((,newability[moveto(myexile) and!( transforms((,newability[name(Haunt a creature) target(creature) counter(0/0.1.ExhumerHaunted)])) oneshot )!])) oneshot
 autoexile=@movedto(creature[counter{0/0.1.ExhumerHaunted}]|graveyard) from(battlefield) once:name(Return creature to hand) moveto(myhand) target(creature|mygraveyard)
 text=Haunt (When this creature dies, exile it haunting target creature.) -- When Exhumer Thrull enters the battlefield or the creature it haunts dies, return target creature card from your graveyard to your hand.
 mana={5}{B}
@@ -20345,7 +20345,7 @@ type=Instant
 [card]
 name=Eyetwitch
 abilities=flying
-auto=@movedto(this|graveyard) from(mybattlefield):name(Learn) transforms((,newability[if type(*[lesson]|mysideboard)~morethan~0 then choice name(Put lesson in hand) name(Put lesson in hand) target(*[lesson]|mysideboard) moveto(myhand)],newability[if type(*|myhand)~morethan~0 then choice name(Discard and draw) name(Discard and draw) target(*|myhand) reject and!(draw:1)!],newability[if type(Retriever Phoenix|mygraveyard)~morethan~0 then choice name(Return a Retriever Phoenix) name(Return a Retriever Phoenix) target(Retriever Phoenix|mygraveyard) moveto(myBattlefield)],newability[choice name(Don't learn) donothing])) oneshot
+auto=_DIES_name(Learn) transforms((,newability[if type(*[lesson]|mysideboard)~morethan~0 then choice name(Put lesson in hand) name(Put lesson in hand) target(*[lesson]|mysideboard) moveto(myhand)],newability[if type(*|myhand)~morethan~0 then choice name(Discard and draw) name(Discard and draw) target(*|myhand) reject and!(draw:1)!],newability[if type(Retriever Phoenix|mygraveyard)~morethan~0 then choice name(Return a Retriever Phoenix) name(Return a Retriever Phoenix) target(Retriever Phoenix|mygraveyard) moveto(myBattlefield)],newability[choice name(Don't learn) donothing])) oneshot
 text=Flying -- When Eyetwitch dies, learn. (You may reveal a Lesson card you own from outside the game and put it into your hand, or discard a card to draw a card.)
 mana={B}
 type=Creature
@@ -23777,7 +23777,7 @@ name=Gallia of the Endless Dance
 abilities=haste
 auto=lord(other creature[Satyr]|myBattlefield) 1/1
 auto=lord(other creature[Satyr]|myBattlefield) haste
-auto=@each blockers restriction{type(creature[attacking]|myBattlefield)~morethan~2}:reject controller && draw:2 controller
+auto=@each blockers restriction{type(creature[attacking]|myBattlefield)~morethan~2}:discard:1 controller oneshot && draw:2 controller
 text=Haste -- Other Satyrs you control get +1/+1 and have haste. -- Whenever you attack with three or more creatures, you may discard a card at random. If you do, draw two cards.
 mana={R}{G}
 type=Legendary Creature
@@ -26011,7 +26011,7 @@ type=Instant
 name=God-Eternal Bontu
 abilities=menace
 auto=may name(Sacrifice permanents) target(<anyamount>other *|mybattlefield) sacrifice && draw:1 controller
-auto=@movedto(this|graveyard) from(myBattlefield):may name(Move back to hand) target(God-Eternal Bontu[fresh]|graveyard) placefromthetop(3)
+auto=_DIES_may name(Move back to hand) target(God-Eternal Bontu[fresh]|graveyard) placefromthetop(3)
 auto=@movedto(this|exile) from(myBattlefield):may name(Move back to hand) target(God-Eternal Bontu[fresh]|exile) placefromthetop(3)
 text=Menace -- When God-Eternal Bontu enters the battlefield, sacrifice any number of other permanents, then draw that many cards. -- When God-Eternal Bontu dies or is put into exile from the battlefield, you may put it into its owner's library third from the top.
 mana={3}{B}{B}
@@ -26023,7 +26023,7 @@ toughness=6
 [card]
 name=God-Eternal Kefnet
 abilities=flying
-auto=@movedto(this|graveyard) from(myBattlefield):may name(Move back to hand) target(God-Eternal Kefnet[fresh]|graveyard) placefromthetop(3)
+auto=_DIES_may name(Move back to hand) target(God-Eternal Kefnet[fresh]|graveyard) placefromthetop(3)
 auto=@movedto(this|exile) from(myBattlefield):may name(Move back to hand) target(God-Eternal Kefnet[fresh]|exile) placefromthetop(3)
 auto=@drawof(player) turnlimited:may activate castcard(copied noevent) target(*[sorcery;instant;fresh]|myhand) limit:1
 text=Flying -- You may reveal the first card you draw each turn as you draw it. Whenever you reveal an instant or sorcery card this way, copy that card and you may cast the copy. That copy costs {2} less to cast. -- When God-Eternal Kefnet dies or is put into exile from the battlefield, you may put it into its owner's library third from the top.
@@ -26037,7 +26037,7 @@ toughness=5
 name=God-Eternal Oketra
 abilities=double strike
 auto=@movedTo(creature|mystack):create(zombie warrior:creature zombie warrior:4/4:black:vigilance)
-auto=@movedto(this|graveyard) from(myBattlefield):may name(Move back to hand) target(God-Eternal Oketra[fresh]|graveyard) placefromthetop(3)
+auto=_DIES_may name(Move back to hand) target(God-Eternal Oketra[fresh]|graveyard) placefromthetop(3)
 auto=@movedto(this|exile) from(myBattlefield):may name(Move back to hand) target(God-Eternal Oketra[fresh]|exile) placefromthetop(3)
 text=Double strike -- Whenever you cast a creature spell, create a 4/4 black Zombie Warrior creature token with vigilance. -- When God-Eternal Oketra dies or is put into exile from the battlefield, you may put it into its owner's library third from the top.
 mana={3}{W}{W}
@@ -26051,7 +26051,7 @@ name=God-Eternal Rhonas
 abilities=deathtouch
 auto=all(other creature|myBattlefield) dynamicability<!mytgt powerpumppow!> ueot
 auto=all(other creature|myBattlefield) vigilance ueot
-auto=@movedto(this|graveyard) from(myBattlefield):may name(Move back to hand) target(God-Eternal Rhonas[fresh]|graveyard) placefromthetop(3)
+auto=_DIES_may name(Move back to hand) target(God-Eternal Rhonas[fresh]|graveyard) placefromthetop(3)
 auto=@movedto(this|exile) from(myBattlefield):may name(Move back to hand) target(God-Eternal Rhonas[fresh]|exile) placefromthetop(3)
 text=Deathtouch -- When God-Eternal Rhonas enters the battlefield, double the power of each other creature you control until end of turn. Those creatures gain vigilance until end of turn. -- When God-Eternal Rhonas dies or is put into exile from the battlefield, you may put it into its owner's library third from the top.
 mana={3}{G}{G}
@@ -29436,7 +29436,7 @@ toughness=1
 [card]
 name=Hofri Ghostforge
 auto=lord(spirit) transforms((,newability[1/1],newability[trample],newability[haste]))
-auto=@movedto(creature[-token]|graveyard) from(mybattlefield):name(Exile and copy) transforms((,newability[all(creature[-token;fresh:zpos=type:*:mygraveyard]|mygraveyard) moveto(exile) and!( clone and!( transforms((Spirit,newability[@movedto(this|graveyard) from(mybattlefield):name(Return exiled creature) target(creature[!share!name!]|myexile) moveto(mygraveyard)])) forever )! )!])) forever
+auto=@movedto(creature[-token]|graveyard) from(mybattlefield):name(Exile and copy) transforms((,newability[all(creature[-token;fresh:zpos=type:*:mygraveyard]|mygraveyard) moveto(exile) and!( clone and!( transforms((Spirit,newability[_DIES_name(Return exiled creature) target(creature[!share!name!]|myexile) moveto(mygraveyard)])) forever )! )!])) forever
 text=Spirits you control get +1/+1 and have trample and haste. -- Whenever another nontoken creature you control dies, exile it. If you do, create a token that's a copy of that creature, except it's a Spirit in addition to its other types and it has "When this creature leaves the battlefield, return the exiled card to your graveyard."
 mana={3}{R}{W}
 type=Legendary Creature
@@ -30569,7 +30569,7 @@ toughness=7
 name=Ilharg, the Raze-Boar
 abilities=trample
 auto=@combat(attacking) source(this):target(creature|myhand) transforms((,newability[phaseaction[endofturn once] moveTo(hand)],newability[ninjutsu])) forever
-auto=@movedto(this|graveyard) from(myBattlefield):may name(Move back to hand) target(Ilharg^ the Raze-Boar[fresh]|graveyard) placefromthetop(3)
+auto=_DIES_may name(Move back to hand) target(Ilharg^ the Raze-Boar[fresh]|graveyard) placefromthetop(3)
 auto=@movedto(this|exile) from(myBattlefield):may name(Move back to hand) target(Ilharg^ the Raze-Boar[fresh]|exile) placefromthetop(3)
 text=Trample -- Whenever Ilharg, the Raze-Boar attacks, you may put a creature card from your hand onto the battlefield tapped and attacking. Return that creature to your hand at the beginning of the next end step. -- When Ilharg, the Raze-Boar dies or is put into exile from the battlefield, you may put it into its owner's library third from the top.
 mana={3}{R}{R}
@@ -31571,7 +31571,7 @@ name=Inga Rune-Eyes
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=scry:3 scrycore delayed dontshow donothing scrycoreend scryend
 auto=@movedto(creature|graveyard) from(battlefield):counter(0/0,1,IngaEffect)
-auto=@movedto(this|graveyard) from(mybattlefield):this(counter{0/0.1.IngaEffect}>=3) draw:3 controller
+auto=_DIES_this(counter{0/0.1.IngaEffect}>=3) draw:3 controller
 auto=@each endofturn:this(counter{0/0.1.IngaEffect}>=1) removeallcounters(0/0,1,IngaEffect)
 text=When Inga Rune-Eyes enters the battlefield, scry 3. -- When Inga Rune-Eyes dies, draw three cards if three or more creatures died this turn.
 mana={3}{U}
@@ -32501,7 +32501,7 @@ toughness=3
 name=Izzet Charm
 auto=choice target(*[-creature]|stack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) forever
 auto=choice target(creature) damage:2
-auto=choice draw:2 controller then reject:2 target(*|myhand)
+auto=choice draw:2 controller && transforms((,newability[target(<2>*|myhand) reject])) oneshot
 text=Choose one — • Counter target noncreature spell unless its controller pays {2}. • Izzet Charm deals 2 damage to target creature. • Draw two cards, then discard two cards.
 mana={U}{R}
 type=Instant
@@ -34596,8 +34596,9 @@ name=Klothys, God of Destiny
 abilities=indestructible
 auto=this(variable{gruul}<7) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
 auto=this(variable{gruul}>6) transforms((Legendary Enchantment Creature))
-auto=@each my combatbegins:moveTo(exile) target(*|myGraveyard):life:2 controller && damage:2 target(opponent)
-auto=@each my combatbegins:moveTo(exile) target(*[Land]|myGraveyard):Add{R} else Add{G}
+#auto=@each my combatbegins:moveTo(exile) target(*|myGraveyard):life:2 controller && damage:2 target(opponent)
+auto=@each my combatbegins:choice moveTo(exile) target(*[Land]|myGraveyard) and!(Add{R})!
+auto=@each my combatbegins:choice moveTo(exile) target(*[Land]|myGraveyard) and!(Add{G})!
 text=Indestructible -- As long as your devotion to red and green is less than seven, Klothys isn't a creature. -- At the beginning of your precombat main phase, exile target card from a graveyard. If it was a land card, add {R} or {G}. Otherwise, you gain 2 life and Klothys deals 2 damage to each opponent.
 mana={1}{R}{G}
 type=Legendary Enchantment Creature
@@ -35405,7 +35406,7 @@ toughness=3
 name=Kykar, Wind's Fury
 abilities=flying
 auto=@movedTo(*[-creature]|mystack):create(Spirit:creature Spirit:1/1:white:flying)
-auto=[S(Spirit|myBattlefield)}:add{R}
+auto={S(Spirit|myBattlefield)}:add{R}
 text=Flying -- Whenever you cast a noncreature spell, create a 1/1 white Spirit creature token with flying. -- Sacrifice a Spirit: Add {R}.
 mana={1}{U}{R}{W}
 type=Legendary Creature
@@ -38170,7 +38171,7 @@ toughness=*
 [card]
 name=Make Your Mark
 target=creature
-auto=transforms((,newability[1/0],newability[@movedto(this|graveyard) from(mybattlefield):name(Create spirit) token(Spirit^Creature Spirit^3/2^red^white)])) ueot
+auto=transforms((,newability[1/0],newability[_DIES_name(Create spirit) token(Spirit^Creature Spirit^3/2^red^white)])) ueot
 text=Target creature gets +1/+0 until end of turn. When that creature dies this turn, create a 3/2 red and white Spirit creature token.
 mana={RW}
 type=Instant
@@ -40056,7 +40057,7 @@ toughness=4
 [/card]
 [card]
 name=Miscast
-target=*[instant,sorcery]|stack
+target=instant,sorcery|stack
 auto=transforms((,newability[pay [[{3}]] name(pay 3 mana) donothing?fizzle])) oneshot
 text=Counter target instant or sorcery spell unless its controller pays 3 .
 mana={U}
@@ -41134,7 +41135,7 @@ type=Instant
 [card]
 name=Mystic Sanctuary
 auto=aslongas(other land[island]|myBattlefield) tap(noevent) <3 oneshot
-auto=aslongas(other land[island]|myBattlefield) >2 may moveTo(myLibrary) target(instant,sorcery|mygraveyard) once 
+auto=aslongas(other land[island]|myBattlefield) >2 may  moveTo(myLibrary) target(instant,sorcery|mygraveyard) once 
 text={T}: Add {U}. -- Mystic Sanctuary enters the battlefield tapped unless you control three or more other Islands. -- When Mystic Sanctuary enters the battlefield untapped, you may put target instant or sorcery card from your graveyard on top of your library.
 type=Land
 subtype=Island
@@ -42818,11 +42819,11 @@ type=Sorcery
 [card]
 name=Nylea, Keen-Eyed
 abilities=indestructible
-aicode=activate transforms((,newability[if type(creature[zpos=1]|mylibrary)~morethan~0 then target(creature[zpos=1]|mylibrary) moveto(ownerbattlefield) else target(*[zpos=1]|mylibrary) moveto(mygraveyard)])) ueot
+aicode=activate transforms((,newability[if type(creature[zpos=1]|mylibrary)~morethan~0 then target(creature[zpos=1]|mylibrary) moveto(myhand) else target(*[zpos=1]|mylibrary) moveto(mygraveyard)])) ueot
 auto=this(variable{type:manag}<5) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
 auto=this(variable{type:manag}>4) transforms((Legendary Enchantment Creature))
 auto=lord(creature|mycastingzone) altercost( colorless,-1)
-auto={2}{G}:reveal:1 optionone target(creature|reveal) moveto(mybattlefield) optiononeend optiontwo name(Put in grave) target(<1>*|reveal) moveto(mygraveyard) optiontwoend revealend
+auto={2}{G}:reveal:1 optionone target(creature|reveal) moveto(myhand) optiononeend optiontwo name(Put in grave) target(<1>*|reveal) moveto(mygraveyard) optiontwoend revealend
 text=Indestructible -- As long as your devotion to green is less than five, Nylea isn’t a creature. -- Creature spells you cast cost {1} less to cast. -- {2}{G}: Reveal the top card of your library. If it’s a creature card, put it into your hand. Otherwise, you may put it into your graveyard.
 mana={3}{G}
 type=Legendary Enchantment Creature
@@ -44998,7 +44999,7 @@ type=Sorcery
 [card]
 name=Pashalik Mons
 auto=@movedto(other creature[goblin]|graveyard) from(mybattlefield):damage:1 target(creature,player)
-auto=@movedto(this|graveyard) from(mybattlefield):damage:1 target(player,creature,planeswalker)
+auto=_DIES_damage:1 target(player,creature,planeswalker)
 auto={3}{R}{S(creature[goblin]|myBattlefield)}:token(Goblin,Creature Goblin,1/1,red)*2
 text=Whenever Pashalik Mons or another Goblin you control dies, Pashalik Mons deals 1 damage to any target. -- {3}{R}, Sacrifice a Goblin: Create two 1/1 red Goblin creature tokens.
 mana={2}{R}
@@ -46354,7 +46355,7 @@ type=Artifact
 [/card]
 [card]
 name=Portal of Sanctuary
-target=creature|battlefield
+target=creature|myBattlefield
 auto={1}{T}:transforms((,newability[moveto(ownerhand) all(mychild)],newability[moveto(ownerhand)])) myturnonly
 text={1}, {T}: Return target creature you control and each Aura attached to it to their owners' hands. Activate this ability only during your turn.
 mana={2}{U}
@@ -49950,7 +49951,7 @@ abilities=flying
 auto=if type(creature|mygraveyard)~morethan~0 then choice name(Don't exile any creature) name(Don't exile any creature) donothing
 auto=if type(creature[-angel;-warrior]|mygraveyard)~morethan~0 then choice name(Exile non-angel and non-warrior) name(Exile non-angel and non-warrior) target(creature[-angel;-warrior]|mygraveyard) moveTo(Exile) and!( transforms((,newability[all(*[creature;share!types!]|mybattlefield) counter(1/1)])) oneshot )!
 auto=if type(creature[angel;warrior]|mygraveyard)~morethan~0 then choice name(Exile angel or warrior) name(Exile angel or warrior) target(creature[angel;warrior]|mygraveyard) moveTo(Exile) and!( transforms((,newability[all(*[creature;share!types!]|mybattlefield) counter(1/1)],newability[all(Resplendent Marshal|mybattlefield) counter(1/1.-1)])) oneshot )!
-auto=@movedto(this|graveyard) from(mybattlefield):may name(Exile another creature) target(other creature|mygraveyard) moveTo(Exile) and!( transforms((,newability[all(*[creature;share!types!]|mybattlefield) counter(1/1)])) oneshot )!
+auto=_DIES_may name(Exile another creature) target(other creature|mygraveyard) moveTo(Exile) and!( transforms((,newability[all(*[creature;share!types!]|mybattlefield) counter(1/1)])) oneshot )!
 text=Flying -- When Resplendent Marshal enters the battlefield or dies, you may exile another creature card from your graveyard. When you do, put a +1/+1 counter on each creature you control other than Resplendent Marshal that shares a creature type with the exiled card.
 mana={1}{W}{W}
 type=Creature
@@ -50026,7 +50027,7 @@ type=Sorcery
 [card]
 name=Retributive Wand
 auto={3}{T}:damage 1 target(player,creature,planeswalker)
-auto=@movedto(this|graveyard) from(mybattlefield):damage 5 target(player,creature,planeswalker)
+auto=_DIES_damage 5 target(player,creature,planeswalker)
 text={3}, {T}: Retributive Wand deals 1 damage to any target. -- When Retributive Wand is put into a graveyard from the battlefield, it deals 5 damage to any target.
 mana={3}
 type=Artifact
@@ -52031,28 +52032,28 @@ toughness=2
 [/card]
 [card]
 name=Rushed Rebirth
-auto=if type(creature|mybattlefield)~morethan~0 then choice name(Choose your creature) name(Choose your creature) target(creature|mybattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):name(Search creature) target(creature[manacost<=manacostminus1minusend]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )!])) ueot
-auto=if type(creature[manacost=0]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 0) name(Choose opponent creature with manacost 0) target(creature[manacost=0]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):donothing])) ueot
-auto=if type(creature[manacost=1]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 1) name(Choose opponent creature with manacost 1) target(creature[manacost=1]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=0]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=2]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 2) name(Choose opponent creature with manacost 2) target(creature[manacost=2]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=1]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=3]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 3) name(Choose opponent creature with manacost 3) target(creature[manacost=3]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=2]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=4]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 4) name(Choose opponent creature with manacost 4) target(creature[manacost=4]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=3]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=5]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 5) name(Choose opponent creature with manacost 5) target(creature[manacost=5]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=4]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=6]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 6) name(Choose opponent creature with manacost 6) target(creature[manacost=6]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=5]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=7]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 7) name(Choose opponent creature with manacost 7) target(creature[manacost=7]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=6]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=8]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 8) name(Choose opponent creature with manacost 8) target(creature[manacost=8]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=7]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=9]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 9) name(Choose opponent creature with manacost 9) target(creature[manacost=9]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=8]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=10]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 10) name(Choose opponent creature with manacost 10) target(creature[manacost=10]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=9]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=11]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 11) name(Choose opponent creature with manacost 11) target(creature[manacost=11]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=10]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=12]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 12) name(Choose opponent creature with manacost 12) target(creature[manacost=12]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=11]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=13]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 13) name(Choose opponent creature with manacost 13) target(creature[manacost=13]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=12]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=14]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 14) name(Choose opponent creature with manacost 14) target(creature[manacost=14]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=13]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=15]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 15) name(Choose opponent creature with manacost 15) target(creature[manacost=15]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=14]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=16]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 16) name(Choose opponent creature with manacost 16) target(creature[manacost=16]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=15]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=17]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 17) name(Choose opponent creature with manacost 17) target(creature[manacost=17]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=16]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=18]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 18) name(Choose opponent creature with manacost 18) target(creature[manacost=18]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=17]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost=19]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 19) name(Choose opponent creature with manacost 19) target(creature[manacost=19]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=18]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
-auto=if type(creature[manacost>=20]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 20) name(Choose opponent creature with manacost 20) target(creature[manacost>=20]|opponentbattlefield) transforms((,newability[@movedto(this|graveyard) from(mybattlefield):ability$!name(Search creature) name(Search creature) target(creature[manacost<=19]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature|mybattlefield)~morethan~0 then choice name(Choose your creature) name(Choose your creature) target(creature|mybattlefield) transforms((,newability[_DIES_name(Search creature) target(creature[manacost<=manacostminus1minusend]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )!])) ueot
+auto=if type(creature[manacost=0]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 0) name(Choose opponent creature with manacost 0) target(creature[manacost=0]|opponentbattlefield) transforms((,newability[_DIES_donothing])) ueot
+auto=if type(creature[manacost=1]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 1) name(Choose opponent creature with manacost 1) target(creature[manacost=1]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=0]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=2]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 2) name(Choose opponent creature with manacost 2) target(creature[manacost=2]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=1]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=3]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 3) name(Choose opponent creature with manacost 3) target(creature[manacost=3]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=2]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=4]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 4) name(Choose opponent creature with manacost 4) target(creature[manacost=4]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=3]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=5]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 5) name(Choose opponent creature with manacost 5) target(creature[manacost=5]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=4]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=6]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 6) name(Choose opponent creature with manacost 6) target(creature[manacost=6]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=5]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=7]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 7) name(Choose opponent creature with manacost 7) target(creature[manacost=7]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=6]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=8]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 8) name(Choose opponent creature with manacost 8) target(creature[manacost=8]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=7]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=9]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 9) name(Choose opponent creature with manacost 9) target(creature[manacost=9]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=8]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=10]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 10) name(Choose opponent creature with manacost 10) target(creature[manacost=10]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=9]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=11]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 11) name(Choose opponent creature with manacost 11) target(creature[manacost=11]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=10]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=12]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 12) name(Choose opponent creature with manacost 12) target(creature[manacost=12]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=11]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=13]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 13) name(Choose opponent creature with manacost 13) target(creature[manacost=13]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=12]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=14]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 14) name(Choose opponent creature with manacost 14) target(creature[manacost=14]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=13]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=15]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 15) name(Choose opponent creature with manacost 15) target(creature[manacost=15]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=14]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=16]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 16) name(Choose opponent creature with manacost 16) target(creature[manacost=16]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=15]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=17]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 17) name(Choose opponent creature with manacost 17) target(creature[manacost=17]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=16]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=18]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 18) name(Choose opponent creature with manacost 18) target(creature[manacost=18]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=17]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost=19]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 19) name(Choose opponent creature with manacost 19) target(creature[manacost=19]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=18]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
+auto=if type(creature[manacost>=20]|opponentbattlefield)~morethan~0 then choice name(Choose opponent creature with manacost 20) name(Choose opponent creature with manacost 20) target(creature[manacost>=20]|opponentbattlefield) transforms((,newability[_DIES_ability$!name(Search creature) name(Search creature) target(creature[manacost<=19]|mylibrary) moveto(mybattlefield) and!( tap(noevent) )! !$ opponent])) ueot
 text=Choose target creature. When that creature dies this turn, search your library for a creature card with lesser mana value, put it onto the battlefield tapped, then shuffle.
 mana={B}{G}
 type=Instant
@@ -52371,7 +52372,7 @@ name=Said // Done
 ability=flash
 other={3}{U} name(Done)
 restriction=can play sorcery
-auto=ifnot paid(alternative) then target(*[instant;sorcery]|mygraveyard) moveto(myHand)
+auto=ifnot paid(alternative) then target(other *[instant;sorcery]|mygraveyard) moveto(myHand)
 auto=if paid(alternative) then target(<upto:2>creature|battlefield) freeze
 text=Return target instant or sorcery card from your graveyard to your hand. -- Tap up to two target creatures. They don’t untap during their controllers’ next untap step.
 mana={2}{U}
@@ -55133,10 +55134,10 @@ type=Sorcery
 [/card]
 [card]
 name=Shatter the Sky
-auto=foreach(creature[power>=4]|mybattlefield) draw:1 opponent && destroy all(creature)
-auto=foreach(creature[power>=4]|mybattlefield) draw:1 controller && destroy all(creature)
+auto=aslongas(creature[power>=4]|opponentBattlefield) draw:1 opponent && aslongas(creature[power>=4]|mybattlefield) draw:1 controller
+auto=destroy all(creature)
 text=Each player who controls a creature with power 4 or greater draws a card. Then destroy all creatures.
-mana={2}{G}{G}
+mana={2}{W}{W}
 type=Sorcery
 [/card]
 [card]
@@ -60418,7 +60419,7 @@ subtype=Equipment
 [card]
 name=Stitcher's Supplier
 auto=deplete:3
-autograveyard=@movedTo(this|graveyard) from(mybattlefield):deplete:3
+autograveyard=_DIES_deplete:3
 text=When Stitcher's Supplier enters the battlefield or dies, put the top three cards of your library into your graveyard.
 mana={B}
 type=Creature
@@ -63572,7 +63573,7 @@ auto=counter(0/0,1,Lore)
 auto=@each my firstmain:counter(0/0,1,Lore)
 auto=deplete:3 opponent
 auto=deplete:3 controller
-auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.2.Lore}=) ability$!name(Choose one) choice name(Don't exile any card) donothing _ choice name(Exile 1 card) moveto(myexile) target(<1>*|graveyard) && life:1 controller _ choice name(Exile 2 cards) moveto(myexile) target(<2>*|graveyard) && life:2 controller!$ controller
+auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.2.Lore}=) ability$!name(Choose one) choice name(Don't exile any card) donothing _ choice name(Exile 1 card) moveto(exile) target(<1>*|graveyard) && life:1 controller _ choice name(Exile 2 cards) moveto(exile) target(<2>*|graveyard) && life:2 controller!$ controller
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) moveto(myhand) target(*[land;creature]|mygraveyard)
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) sacrifice(this)
 text=(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.) -- I — Each player puts the top three cards of their library into their graveyard. -- II — Exile up to two target cards from graveyards. For each creature card exiled this way, you gain 1 life. -- III — Return target creature or land card from your graveyard to your hand.
@@ -66101,7 +66102,7 @@ type=Instant
 [/card]
 [card]
 name=Trial of Ambition
-auto=ability$!name(Sacrifice a creature) name(Sacrifice a creature) notatarget(creature|mybattlefield) sacrifice!$ opponent
+auto=ability$!name(Sacrifice a creature) notatarget(creature|mybattlefield) sacrifice!$ opponent
 auto=@movedto(cartouche|mybattlefield):moveto(myhand)
 text=When Trial of Ambition enters the battlefield, target opponent sacrifices a creature. -- When a Cartouche enters the battlefield under your control, return Trial of Ambition to its owner's hand.
 mana={1}{B}
@@ -66171,9 +66172,9 @@ type=Artifact
 [card]
 name=Triplicate Titan
 abilities=flying,vigilance,trample
-auto=@movedto(this|graveyard) from(mybattlefield):token(Golem,Creature Artifact Golem,3/3,flying)
-auto=@movedto(this|graveyard) from(mybattlefield):token(Golem,Creature Artifact Golem,3/3,vigilance)
-auto=@movedto(this|graveyard) from(mybattlefield):token(Golem,Creature Artifact Golem,3/3,trample)
+auto=_DIES_token(Golem,Creature Artifact Golem,3/3,flying)
+auto=_DIES_token(Golem,Creature Artifact Golem,3/3,vigilance)
+auto=_DIES_token(Golem,Creature Artifact Golem,3/3,trample)
 text=Flying, vigilance, trample -- When Triplicate Titan dies, create a 3/3 colorless Golem artifact creature token with flying, a 3/3 colorless Golem artifact creature token with vigilance, and a 3/3 colorless Golem artifact creature token with trample.
 mana={9}
 type=Artifact Creature
@@ -72040,8 +72041,8 @@ toughness=0
 [card]
 name=Yosei, the Morning Star
 abilities=flying
-auto=@movedto(this|graveyard) from(mybattlefield):all(*|opponentbattlefield) frozen
-auto=@movedto(this|graveyard) from(mybattlefield):name(Tap up to 5 permanents) name(Tap up to 5 permanents) target(<upto:5>*|opponentbattlefield) tap(noevent)
+auto=_DIES_all(*|opponentbattlefield) frozen
+auto=_DIES_name(Tap up to 5 permanents) name(Tap up to 5 permanents) target(<upto:5>*|opponentbattlefield) tap(noevent)
 text=Flying -- When Yosei, the Morning Star dies, target player skips his or her next untap step. Tap up to five target permanents that player controls.
 mana={4}{W}{W}
 type=Legendary Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 7d3a94825..25c88d480 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -4763,7 +4763,7 @@ toughness=2
 [card]
 name=Arashin Sovereign
 abilities=flying
-auto=@movedto(this|graveyard) from(mybattlefield):may name(put on top or bottom) transforms((,newability[choice name(Top of Library) moveto(ownerlibrary) ],newability[choice bottomoflibrary])) forever
+auto=_DIES_may name(put on top or bottom) transforms((,newability[choice name(Top of Library) moveto(ownerlibrary) ],newability[choice bottomoflibrary])) forever
 text=Flying -- When Arashin Sovereign dies, you may put it on the top or bottom of its owner's library.
 mana={5}{G}{W}
 type=Creature
@@ -6317,7 +6317,7 @@ type=Sorcery
 name=Ashen Rider
 abilities=flying
 auto=moveTo(exile) target(*|battlefield)
-autograveyard=@movedTo(this|graveyard) from(mybattlefield):moveTo(exile) target(*|battlefield)
+autograveyard=_DIES_moveTo(exile) target(*|battlefield)
 text=Flying -- When Ashen Rider enters the battlefield or dies, exile target permanent.
 mana={4}{W}{W}{B}{B}
 type=Creature
@@ -7027,7 +7027,7 @@ type=Enchantment
 [card]
 name=Aura Thief
 abilities=flying
-auto=@movedTo(this|graveyard) from(myBattlefield):moveTo(myBattlefield) all(enchantment[-aura])
+auto=_DIES_moveTo(myBattlefield) all(enchantment[-aura])
 text=Flying -- When Aura Thief dies, you gain control of all enchantments. (You don't get to move Auras.)
 mana={3}{U}
 type=Creature
@@ -14227,7 +14227,7 @@ toughness=4
 [card]
 name=Brago, King Eternal
 abilities=flying
-auto=@combatdamaged(player) from(this):target(<anyamount>*[-land]|mybattlefield) (blink)
+auto=@combatdamaged(player) from(this):target(<anyamount>*[-land]|mybattlefield) transforms((,newability[moveto(exile)],newability[phaseactionmulti[endofturn] moveto(ownerbattlefield)]))
 text=Flying -- Whenever Brago, King Eternal deals combat damage to a player, exile any number of target nonland permanents you control, then return those cards to the battlefield under their owner's control.
 mana={2}{W}{U}
 type=Legendary Creature
@@ -18135,7 +18135,7 @@ toughness=2
 [/card]
 [card]
 name=Centaur Safeguard
-auto=@movedto(this|graveyard):may life:3
+auto=_DIES_may life:3
 text=({(g/w)} can be paid with either {G} or {W}.) -- When Centaur Safeguard dies, you may gain 3 life.
 mana={2}{GW}
 type=Creature
@@ -19121,7 +19121,7 @@ toughness=2
 [card]
 name=Chasm Skulker
 auto=@drawof(player):counter(1/1,1)
-auto=@movedTo(this|Graveyard) from(myBattlefield):thisforeach(counter{1/1.1}):token(Squid,Creature Squid,1/1,islandwalk,blue)
+auto=_DIES_thisforeach(counter{1/1.1}):token(Squid,Creature Squid,1/1,islandwalk,blue)
 text=Whenever you draw a card, put a +1/+1 counter on Chasm Skulker. -- When Chasm Skulker dies, put X 1/1 blue Squid creature tokens with islandwalk onto the battlefield, where X is the number of +1/+1 counters on Chasm Skulker.
 mana={2}{U}
 type=Creature
@@ -19622,7 +19622,7 @@ auto={1}{T}{S}:Add{U}
 auto={1}{T}{S}:Add{B}
 auto={1}{T}{S}:Add{R}
 auto={1}{T}{S}:Add{G}
-auto=@movedTo(this|graveyard) from(myBattlefield):draw:1 controller
+auto=_DIES_draw:1 controller
 text={1}, {T}, Sacrifice Chromatic Star: Add one mana of any color to your mana pool. -- When Chromatic Star is put into a graveyard from the battlefield, draw a card.
 mana={1}
 type=Artifact
@@ -19735,7 +19735,7 @@ toughness=5
 name=Chronozoa
 abilities=flying
 auto=vanishing:3
-auto=@movedTo(this|graveyard) from(myBattlefield):this(counter{0/0.1.Time}=0) token(111066)*2
+auto=_DIES_this(counter{0/0.1.Time}=0) token(111066)*2
 text=Flying -- Vanishing 3 (This permanent enters the battlefield with three time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.) -- When Chronozoa dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.
 mana={3}{U}
 type=Creature
@@ -25921,7 +25921,7 @@ type=Instant
 [card]
 name=Darkslick Drake
 abilities=flying
-auto=@movedTo(this|graveyard) from(mybattlefield):draw:1
+auto=_DIES_draw:1
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) -- When Darkslick Drake dies, draw a card.
 mana={2}{U}{U}
 type=Creature
@@ -26766,7 +26766,7 @@ type=Artifact
 [card]
 name=Deadly Grub
 auto=vanishing:3
-auto=@movedTo(this|graveyard) from(myBattlefield):this(counter{0/0.1.Time}<1) all(trigger) token(Insect,Creature Insect,6/1,shroud green)
+auto=_DIES_this(counter{0/0.1.Time}<1) all(trigger) token(Insect,Creature Insect,6/1,shroud green)
 text=Vanishing 3 (This permanent enters the battlefield with three time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.) -- When Deadly Grub dies, if it had no time counters on it, put a 6/1 green Insect creature token with shroud onto the battlefield. (It can't be the target of spells or abilities.)
 mana={2}{B}
 type=Creature
@@ -30977,7 +30977,7 @@ toughness=2
 [card]
 name=Dragon Egg
 abilities=defender
-auto=@movedTo(this|graveyard) from(mybattlefield):token(-370660)
+auto=_DIES_token(-370660)
 text=Defender. -- When Dragon Egg dies, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn".
 mana={2}{R}
 type=Creature
@@ -36249,7 +36249,7 @@ type=Instant
 [card]
 name=Enshrined Memories
 aicode=activate target(<castx>*[zpos<=castx]|mylibrary) name(revealed card) moveto(myhand) name(revealed card) and!(if cantargetcard(*[-creature]|*) then bottomoflibrary))!
-auto=reveal:x optionone name(Get creatures) target(<50>artifact|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<50>*|reveal) bottomoflibrary optiontwoend revealend
+auto=reveal:x optionone name(Get creatures) target(<50>creature|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<50>*|reveal) bottomoflibrary optiontwoend revealend
 text=Reveal the top X cards of your library. Put all creature cards revealed this way into your hand and the rest on the bottom of your library in any order.
 mana={X}{G}
 type=Sorcery
@@ -40009,7 +40009,7 @@ toughness=1
 [/card]
 [card]
 name=Festering Newt
-auto=@movedto(this|graveyard) from(mybattlefield):if type(Bogbrew Witch|mybattlefield)~morethan~0 then target(creature|opponentbattlefield) -4/-4 ueot else target(creature|opponentbattlefield) -1/-1 ueot
+auto=_DIES_if type(Bogbrew Witch|mybattlefield)~morethan~0 then target(creature|opponentbattlefield) -4/-4 ueot else target(creature|opponentbattlefield) -1/-1 ueot
 text=When Festering Newt dies, target creature an opponent controls gets -1/-1 until end of turn. That creature gets -4/-4 instead if you control a creature named Bogbrew Witch.
 mana={B}
 type=Creature
@@ -41693,7 +41693,7 @@ toughness=1
 name=Flesh Carver
 abilities=Intimidate
 auto={1}{b}{s(other creature|mybattlefield)}:counter(1/1,2)
-auto=@movedTo(this|graveyard) from(myBattlefield):token(Carvers Masterpeice,Horror creature,p/p,black)
+auto=_DIES_token(Carvers Masterpeice,Horror creature,p/p,black)
 text=Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.) -- {1}{B}, Sacrifice another creature: Put two +1/+1 counters on Flesh Carver. -- When Flesh Carver dies, put an X/X black Horror creature token onto the battlefield, where X is Flesh Carver's power.
 mana={2}{B}
 type=Creature
@@ -50065,7 +50065,7 @@ subtype=Aura
 [/card]
 [card]
 name=Greenbelt Rampager
-auto=if compare(penergy)~morethan~2 then alterenergy:-2 controller else choice moveto(ownerhand) and!(alterenergy:1 controller)!
+auto=if compare(penergy)~morethan~1 then alterenergy:-2 controller else choice moveto(ownerhand) and!(alterenergy:1 controller)!
 text=When Greenbelt Rampager enters the battlefield, pay {E}{E} (two energy counters). If you can't, return Greenbelt Rampager to its owner's hand and you get {E}.
 mana={G}
 type=Creature
@@ -52625,7 +52625,7 @@ toughness=3
 [/card]
 [card]
 name=Hatching Plans
-auto=@movedto(this|graveyard) from(mybattlefield):draw:3
+auto=_DIES_draw:3
 text=When Hatching Plans is put into a graveyard from the battlefield, draw three cards.
 mana={1}{U}
 type=Enchantment
@@ -54512,7 +54512,7 @@ toughness=1
 [/card]
 [card]
 name=Highland Game
-autograveyard=@movedto(this|graveyard) from(mybattlefield):life:2 controller
+autograveyard=_DIES_life:2 controller
 text=When Highland Game dies, you gain 2 life. 
 mana={1}{G}
 type=Creature
@@ -55275,7 +55275,7 @@ facedown={3}
 autofacedown={3}{G}{G}:morph
 autofaceup=counter(1/1,5)
 auto=counter(1/1,X)
-auto=@movedTo(this|Graveyard) from(myBattlefield):thisforeach(counter{1/1.1}) token(Snake,Creature Snake,1/1,green)
+auto=_DIES_thisforeach(counter{1/1.1}) token(Snake,Creature Snake,1/1,green)
 text=Hooded Hydra enters the battlefield with X +1/+1 counters on it. -- When Hooded Hydra dies, put a 1/1 green Snake creature token onto the battlefield for each +1/+1 counter on it. -- Morph {3}G}{G}: As Hooded Hydra is turned face up, put five +1/+1 counters on it. 
 mana={X}{G}{G}
 type=Creature
@@ -57705,8 +57705,8 @@ toughness=3
 name=Increasing Ambition
 abilities=hiddenface
 aicode=activate transforms((,newability[ifnot gravecast then target(*|myLibrary) moveTo(myhand)],newability[if gravecast then target(<2>*|myLibrary) moveTo(myhand)])) ueot
-auto=ifnot gravecast then name(search card) reveal:plibrarycount optionone name(choose card) target(*|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(mylibrary) and!(moveto(mylibrary) and!(life:-2 controller)!)! afterrevealedend revealend
-auto=if gravecast then name(search card) reveal:plibrarycount optionone name(choose card) target(<2>*|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(mylibrary) and!(moveto(mylibrary) and!(life:-2 controller)!)! afterrevealedend revealend
+auto=ifnot gravecast then name(search card) reveal:plibrarycount optionone name(choose card) target(*|reveal) moveto(myhand) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))! afterrevealedend revealend
+auto=if gravecast then name(search card) reveal:plibrarycount optionone name(choose card) target(<2>*|reveal) moveto(myhand) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))! afterrevealedend revealend
 flashback={7}{B}
 text=Search your library for a card and put that card into your hand. If Increasing Ambition was cast from a graveyard, instead search your library for two cards and put those cards into your hand. Then shuffle your library. -- Flashback {7}{B} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={4}{B}
@@ -60131,7 +60131,7 @@ subtype=Aura
 [card]
 name=Jeskai Sage
 auto=@movedto(*[-creature]|mystack):1/1 ueot
-auto=@movedto(this|graveyard) from(mybattlefield):draw:1 controller
+auto=_DIES_draw:1 controller
 text=Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.) -- When Jeskai Sage dies, draw a card.
 mana={1}{U}
 type=Creature
@@ -67940,7 +67940,7 @@ toughness=1
 [card]
 name=Lockjaw Snapper
 abilities=wither
-auto=@movedTo(this|graveyard) from(myBattlefield):counter(-1/-1) all(creature[counter{-1/-1}])
+auto=_DIES_counter(-1/-1) all(creature[counter{-1/-1}])
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.) -- When Lockjaw Snapper dies, put a -1/-1 counter on each creature with a -1/-1 counter on it.
 mana={4}
 type=Artifact Creature
@@ -68337,7 +68337,7 @@ type=Instant
 [card]
 name=Lost Auramancers
 auto=vanishing:3
-auto=@movedTo(this|graveyard) from(myBattlefield):this(counter{0/0.1.Time}=0) ability$!may moveto(mybattlefield) notatarget(enchantment|mylibrary)!$ controller
+auto=_DIES_this(counter{0/0.1.Time}=0) ability$!may moveto(mybattlefield) notatarget(enchantment|mylibrary)!$ controller
 text=Vanishing 3 (This permanent enters the battlefield with three time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.) -- When Lost Auramancers dies, if it had no time counters on it, you may search your library for an enchantment card and put it onto the battlefield. If you do, shuffle your library.
 mana={2}{W}{W}
 type=Creature
@@ -69614,7 +69614,7 @@ type=Artifact
 [card]
 name=Magma Phoenix
 abilities=flying
-auto=@movedTo(this|graveyard) from(myBattlefield):damage:3 all(creature,player)
+auto=_DIES_damage:3 all(creature,player)
 autograveyard={3}{R}{R}:moveTo(myhand)
 text=Flying -- When Magma Phoenix dies, it deals 3 damage to each creature and each player. -- {3}{R}{R}: Return Magma Phoenix from your graveyard to your hand.
 mana={3}{R}{R}
@@ -77349,7 +77349,7 @@ toughness=1+*
 [/card]
 [card]
 name=Mycoid Shepherd
-auto=@movedTo(this|graveyard) from(myBattlefield):may life:5 controller
+auto=_DIES_may life:5 controller
 auto=@movedTo(graveyard) from(other creature[power>=5]|myBattlefield):may life:5 controller
 text=Whenever Mycoid Shepherd or another creature you control with power 5 or greater dies, you may gain 5 life.
 mana={1}{G}{G}{W}
@@ -83913,7 +83913,7 @@ toughness=4
 [card]
 name=Palace Familiar
 abilities=flying
-auto=@movedto(this|graveyard) from(mybattlefield):draw:1
+auto=_DIES_draw:1
 text=Flying -- When Palace Familiar dies, draw a card.
 mana={1}{U}
 type=Creature
@@ -84771,7 +84771,7 @@ toughness=3
 [/card]
 [card]
 name=Pawn of Ulamog
-auto=@movedTo(this|graveyard) from(myBattlefield):may token(Eldrazi Spawn,Creature Eldrazi Spawn,0/1) and!( transforms((,newability[{S}:Add{1}])) forever )!
+auto=_DIES_may token(Eldrazi Spawn,Creature Eldrazi Spawn,0/1) and!( transforms((,newability[{S}:Add{1}])) forever )!
 auto=@movedTo(other creature[-token]|graveyard) from(myBattlefield):may token(Eldrazi Spawn,Creature Eldrazi Spawn,0/1) and!( transforms((,newability[{S}:Add{1}])) forever )!
 text=Whenever Pawn of Ulamog or another nontoken creature you control dies, you may put a 0/1 colorless Eldrazi Spawn creature token onto the battlefield. It has "Sacrifice this creature: Add 1 to your mana pool."
 mana={1}{B}{B}
@@ -86488,7 +86488,7 @@ toughness=1
 [/card]
 [card]
 name=Phytotitan
-autograveyard=@movedTo(this|graveyard) from(myBattlefield):phaseaction[my upkeep once]:moveTo(myBattlefield) and!(tap(noevent))!
+autograveyard=_DIES_phaseaction[my upkeep once]:moveTo(myBattlefield) and!(tap(noevent))!
 text=When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
 mana={4}{G}{G}
 type=Creature
@@ -98402,7 +98402,7 @@ toughness=2
 [/card]
 [card]
 name=Saltskitter
-auto=@movedTo(other creature|battlefield):(blink)ueot
+auto=@movedTo(other creature|battlefield):transforms((,newability[moveto(exile)],newability[phaseactionmulti[endofturn] moveto(ownerbattlefield)]))
 text=Whenever another creature enters the battlefield, exile Saltskitter. Return Saltskitter to the battlefield under its owner's control at the beginning of the next end step.
 mana={3}{W}
 type=Creature
@@ -100831,7 +100831,7 @@ toughness=2
 [card]
 name=Scuttling Doom Engine
 auto=cantbeblockedby(creature[power<=2])
-autograveyard=@movedTo(this|graveyard) from(mybattlefield):damage:6 target(opponent)
+autograveyard=_DIES_damage:6 target(opponent)
 text=Scuttling Doom Engine can't be blocked by creatures with power 2 or less. -- When Scuttling Doom Engine dies, it deals 6 damage to target opponent. 
 mana={6}
 type=Artifact Creature
@@ -136214,7 +136214,7 @@ toughness=6
 [/card]
 [card]
 name=Xathrid Necromancer
-autograveyard=@movedTo(this|graveyard) from(mybattlefield):token(Zombie,Creature Zombie,2/2,black) and!( tap(noevent) )! controller
+autograveyard=_DIES_token(Zombie,Creature Zombie,2/2,black) and!( tap(noevent) )! controller
 auto=@movedTo(other human|graveyard) from(mybattlefield):token(Zombie,Creature Zombie,2/2,black) and!( tap(noevent) )! controller
 text=Whenever Xathrid Necromancer or another Human creature you control dies, put a 2/2 black Zombie creature token onto the battlefield tapped.
 mana={2}{B}
@@ -136703,7 +136703,7 @@ toughness=1
 [/card]
 [card]
 name=Youthful Scholar
-auto=@movedto(this|graveyard) from(mybattlefield):draw:2 controller
+auto=_DIES_draw:2 controller
 text=When Youthful Scholar dies, draw two cards.
 mana={3}{U}
 type=Creature