Bug fixes, oracle text updates

Adriana, Captain of the Guard
Anax, Hardened in the Forge
Arbiter of the Ideal had to change the name of the counter
Armament Of Nyx
Ashcoat of the Shadow Swarm
Ashes of the Abhorrent
Captain N'ghathrod
Cement Shoes
Champion of Wits
Charging Cinderhorn
Circle of Solace
Curious Obsession
Deadshot not really supported
Door of Destinies
Eye of Yawgmoth
Fateful Showdown
Fire // Ice
Heirloom Blade
Hunted Bonebrute
Illithid Harvester // Plant Tadpoles nothing works
In Bolas's Clutches and other "Enchant permanet" cards needed a rework
Infernal Harvest
Iymrith, Desert Doom
Jokulhaups didn't destroyed fire-belly ch
Jolene, Plundering Pugilist
Kagemaro, First to Suffer
Keeper of Fables
Kethek, Crucible Goliath
Lost Jitte
Lukka, Bound to Ruin
Metamorphic Alteration
Mimic Vat
Mind Whip
Necromancer's Stockpile
Peace Talks
Preyseizer Dragon
Primal Wellspring
Reaper of Night // Harvest Fear
Skanos Dragonheart
Soldevi Sentry
Support is a may
Vault Plunderer
Vraska, Betrayal's Sting
Winnow

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -1629,7 +1629,7 @@ type=Instant
 [/card]
 [card]
 name=Aftershock
-target=artifact,creature,land
+target=*[artifact;creature;land]
 auto=destroy
 auto=damage:3 controller
 text=Destroy target artifact, creature, or land. Aftershock deals 3 damage to you.
@@ -2335,7 +2335,7 @@ type=Legendary Artifact
 [card]
 name=Akroma's Vengeance
 abilities=cycling
-auto=destroy all(artifact,creature,enchantment)
+auto=destroy all(*[artifact;creature;enchantment])
 autohand=__CYCLING__({3})
 text=Destroy all artifacts, creatures, and enchantments. -- Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={4}{W}{W}
@@ -2384,7 +2384,7 @@ type=Artifact
 [card]
 name=Alabaster Dragon
 auto=flying
-auto=@movedTo(graveyard) from(this|battlefield):moveto(ownerlibrary) all(trigger[from]) && shuffle
+auto=_DIES_moveto(ownerlibrary) all(trigger[from]) && shuffle
 text=Flying -- When Alabaster Dragon dies, shuffle Alabaster Dragon into its owner's library.
 mana={4}{W}{W}
 type=Creature
@@ -3675,8 +3675,8 @@ toughness=4
 [card]
 name=Angel of Fury
 abilities=flying
-auto=@movedTo(mygraveyard) from(this|battlefield):may moveto(mylibrary) all(trigger[from]) && shuffle
-text=Flying -- When Angel of Fury is put into your graveyard from the battlefield, you may shuffle it into your library.
+auto=_DIES_may moveto(mylibrary) all(trigger[from]) && shuffle
+text=Flying -- When Angel of Fury dies, you may shuffle it into its owner's library.
 mana={4}{W}{W}
 type=Creature
 subtype=Angel
@@ -4496,7 +4496,7 @@ toughness=1
 [card]
 name=Aphetto Vulture
 abilities=flying
-auto=@movedTo(graveyard) from(this|battlefield):may moveto(mylibrary) target(zombie|mygraveyard)
+auto=_DIES_may moveto(mylibrary) target(zombie|mygraveyard)
 text=Flying -- When Aphetto Vulture dies, you may put target Zombie card from your graveyard on top of your library.
 mana={4}{B}{B}
 type=Creature
@@ -4796,8 +4796,8 @@ toughness=5
 [card]
 name=Arbiter of the Ideal
 abilities=flying
-auto=lord(*[counter{0%0.1.manifestation}]|mybattlefield) transforms((enchantment)) forever
-auto=@untapped(this):reveal:1 optionone target(artifact,creature,land|reveal) moveto(mybattlefield) and!(counter(0/0,1,manifestation))! optiononeend optiontwo name(Put on Top) target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend
+auto=lord(*[counter{0%0.1.manifstation}]|mybattlefield) transforms((enchantment)) forever
+auto=@untapped(this):reveal:1 optionone target(*[artifact;creature;land]|reveal) moveto(mybattlefield) and!(counter(0/0,1,manifstation))! optiononeend optiontwo name(Put on Top) target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend
 text=Flying -- Inspired -- Whenever Arbiter of the Ideal becomes untapped, reveal the top card of your library. If it's an artifact, creature, or land card, you may put it onto the battlefield with a manifestation counter on it. That permanent is an enchantment in addition to its other types.
 mana={4}{U}{U}
 type=Creature
@@ -5799,8 +5799,8 @@ toughness=2
 [card]
 name=Armament of Nyx
 target=Creature
-auto=teach(-enchantment) preventalldamage from(this)
-auto=teach(enchantment) double strike
+auto=teach(creature[enchantment]) double strike
+auto=teach(creature[-enchantment]) preventalldamage from(this)
 text=Enchant creature -- Enchanted creature has double strike as long as it's an enchantment. Otherwise, prevent all damage that would be dealt by enchanted creature. (A creature with double strike deals both first-strike and regular combat damage.)
 mana={2}{W}
 type=Enchantment
@@ -6373,7 +6373,7 @@ toughness=1
 [/card]
 [card]
 name=Ashen-Skin Zubera
-auto=@movedto(mygraveyard) from(this|mybattlefield):choice target(opponent) ability$!name(discard) target(<type:zubera[fresh]:opponentgraveyard>*|myhand) reject !$ targetedplayer
+auto=_DIES_choice target(opponent) ability$!name(discard) target(<type:zubera[fresh]:opponentgraveyard>*|myhand) reject !$ targetedplayer
 text=When Ashen-Skin Zubera dies, target opponent discards a card for each Zubera put into a graveyard from the battlefield this turn.
 mana={1}{B}
 type=Creature
@@ -7373,7 +7373,7 @@ toughness=2
 name=Avacyn's Collar
 auto=teach(creature) 1/0
 auto=teach(creature) vigilance
-auto=teach(human) transforms((,newability[@movedto(mygraveyard) from(this|mybattlefield):token(Spirit Token)]))
+auto=teach(human) transforms((,newability[_DIES_token(Spirit Token)]))
 auto={2}:equip
 text=Equipped creature gets +1/+0 and has vigilance. -- Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield. -- Equip {2}
 mana={1}
@@ -7689,7 +7689,9 @@ name=Aven Riftwatcher
 abilities=flying
 auto=life:2
 auto=@movedTo(this|nonbattlezone) from(myBattlefield):life:2
-auto=vanishing:3
+auto=counter(0/0,3,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 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 Aven Riftwatcher enters the battlefield or leaves the battlefield, you gain 2 life.
 mana={2}{W}
 type=Creature
@@ -7850,7 +7852,7 @@ toughness=5
 [card]
 name=Avenging Angel
 auto=flying
-auto=@movedTo(graveyard) from(this|battlefield):may all(trigger[from]) moveto(ownerlibrary)
+auto=_DIES_may all(trigger[from]) moveto(ownerlibrary)
 text=Flying -- When Avenging Angel dies, you may put Avenging Angel on top of its owner's library.
 mana={3}{W}{W}
 type=Creature
@@ -11095,7 +11097,7 @@ type=Sorcery
 [card]
 name=Blade of the Bloodchief
 auto={1}:equip
-auto=teach(creature) @movedto(creature|graveyard) from(creature|battlefield):counter(1/1) && if cantargetcard(vampire) then counter(1/1)
+auto=teach(creature) @movedto(creature|graveyard) from(battlefield):counter(1/1) && if cantargetcard(vampire) then counter(1/1)
 text=Whenever a creature dies, put a +1/+1 counter on equipped creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead. -- Equip {1}
 mana={1}
 type=Artifact
@@ -13010,7 +13012,7 @@ toughness=5
 name=Body Snatcher
 auto=choice restriction{type(creature|myhand)~morethan~0} reject notatarget(creature|myhand)
 auto=choice moveTo(exile)
-auto=@movedTo(mygraveyard) from(this|battlefield):moveTo(myBattlefield) target(creature|mygraveyard)
+auto=_DIES_moveTo(myBattlefield) target(creature|mygraveyard)
 autograveyard=moveTo(exile)
 text=When Body Snatcher enters the battlefield, you may discard a creature card. If you don't, exile Body Snatcher. -- When Body Snatcher dies, exile Body Snatcher and return target creature card from your graveyard to the battlefield.
 mana={2}{B}{B}
@@ -15293,8 +15295,8 @@ toughness=3
 [/card]
 [card]
 name=Brood of Cockroaches
-auto=@movedTo(mygraveyard) from(this|battlefield):phaseaction[endofturn once] life:-1 controller
-auto=@movedTo(mygraveyard) from(this|battlefield):phaseaction[endofturn once] moveto(ownerHand)
+auto=@movedTo(this|mygraveyard) from(battlefield):phaseaction[endofturn once] life:-1 controller
+auto=@movedTo(this|mygraveyard) from(battlefield):phaseaction[endofturn once] moveto(ownerHand)
 text=When Brood of Cockroaches is put into your graveyard from the battlefield, at the beginning of the next end step, you lose 1 life and return Brood of Cockroaches to your hand.
 mana={1}{B}
 type=Creature
@@ -15844,7 +15846,7 @@ toughness=2
 [/card]
 [card]
 name=Burning Sands
-auto=lord(creature) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(land|mybattlefield) sacrifice]))
+auto=lord(creature) transforms((,newability[_DIES_target(land|mybattlefield) sacrifice]))
 text=Whenever a creature dies, that creature's controller sacrifices a land.
 mana={3}{R}{R}
 type=Enchantment
@@ -16362,7 +16364,9 @@ toughness=4
 [card]
 name=Calciderm
 abilities=shroud
-auto=vanishing:4
+auto=counter(0/0,4,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 text=Shroud -- Vanishing 4 (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.)
 mana={2}{W}{W}
 type=Creature
@@ -19774,7 +19778,9 @@ toughness=5
 [card]
 name=Chronozoa
 abilities=flying
-auto=vanishing:3
+auto=counter(0/0,3,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 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}
@@ -19987,7 +19993,7 @@ type=Enchantment
 [/card]
 [card]
 name=Circle of Protection: Shadow
-auto={1}:name(prevent damage) notatarget(creature[shadow]|battlefield,stack,hand,graveyard) preventalldamage to(controller) from(mytgt) ueot
+auto={1}:name(prevent damage) notatarget(creature[shadow]) preventalldamage to(controller) from(mytgt) ueot
 text={1}: The next time a creature of your choice with shadow would deal damage to you this turn, prevent that damage.
 mana={1}{W}
 type=Enchantment
@@ -20001,7 +20007,7 @@ type=Enchantment
 [/card]
 [card]
 name=Circle of Solace
-auto=chooseatype transforms((,newability[{1}{W}:notatarget(creature[chosentype]|battlefield,stack,hand,graveyard) preventalldamage to(controller) from(mytgt) ueot])) chooseend
+auto=chooseatype transforms((,newability[{1}{W}:notatarget(creature[chosentype]) preventalldamage to(controller) from(mytgt) ueot])) chooseend
 text=As Circle of Solace enters the battlefield, choose a creature type. -- {1}{W}: The next time a creature of the chosen type would deal damage to you this turn, prevent that damage.
 mana={3}{W}
 type=Enchantment
@@ -21853,7 +21859,7 @@ type=Instant
 [/card]
 [card]
 name=Confiscate
-target=artifact,creature,enchantment,land,planeswalker
+target=*[artifact;battle;creature;enchantment;land;planeswalker]
 alias=1194
 text=Enchant permanent (Target a permanent as you cast this. This card enters the battlefield attached to that permanent.) -- You control enchanted permanent.
 mana={4}{U}{U}
@@ -23532,7 +23538,7 @@ toughness=2
 [card]
 name=Creature Bond
 target=creature
-auto=@movedto(graveyard) from(mytgt|Battlefield):damage:t targetController
+auto=@movedto(mytgt|graveyard):damage:t targetController
 text=Enchant creature -- When enchanted creature is put into a graveyard, Creature Bond deals damage equal to that creature's toughness to the creature's controller.
 mana={1}{U}
 type=Enchantment
@@ -26814,7 +26820,9 @@ type=Artifact
 [/card]
 [card]
 name=Deadly Grub
-auto=vanishing:3
+auto=counter(0/0,3,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 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}
@@ -26882,7 +26890,9 @@ type=Sorcery
 [/card]
 [card]
 name=Deadwood Treefolk
-auto=vanishing:3
+auto=counter(0/0,3,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 auto=moveto(ownerHand) target(other creature|myGraveyard)
 auto=@movedTo(this|nonbattlezone) from(myBattlefield):moveto(ownerHand) target(other creature|myGraveyard)
 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 Deadwood Treefolk enters the battlefield or leaves the battlefield, return another target creature card from your graveyard to your hand.
@@ -30718,7 +30728,7 @@ toughness=6
 [/card]
 [card]
 name=Door of Destinies
-auto=chooseatype transforms((,newability[@movedTo(creature[chosentype]|mystack):counter(0/0.1.Charge)],newability[thisforeach(counter{0/0.1.Charge}) lord(creature[chosentype]|mybattlefield) 1/1])) chooseend
+auto=chooseatype transforms((,newability[@movedTo(*[chosentype]|mystack):counter(0/0.1.Charge)],newability[thisforeach(counter{0/0.1.Charge}) lord(creature[chosentype]|mybattlefield) 1/1])) chooseend
 text=As Door of Destinies enters the battlefield, choose a creature type. -- Whenever you cast a spell of the chosen type, put a charge counter on Door of Destinies. -- Creatures you control of the chosen type get +1/+1 for each charge counter on Door of Destinies.
 mana={4}
 type=Artifact
@@ -31842,7 +31852,7 @@ type=Instant
 [/card]
 [card]
 name=Dream Leash
-target=*[artifact;enchantment;land;planeswalker;creature;tapped]
+target=*[artifact;battle;creature;enchantment;land;planeswalker;tapped]
 alias=1194
 text=Enchant permanent -- You can't choose an untapped permanent as Dream Leash's target as you cast Dream Leash. -- You control enchanted permanent.
 mana={3}{U}{U}
@@ -32415,7 +32425,7 @@ toughness=2
 [card]
 name=Dross Harvester
 abilities=protection from white
-auto=@movedTo(graveyard) from(creature|battlefield):life:2
+auto=@movedTo(creature|graveyard) from(battlefield):life:2
 auto=@each my end:life:-4 controller
 text=Protection from white -- At the beginning of your end step, you lose 4 life. -- Whenever a creature dies, you gain 2 life.
 mana={1}{B}{B}
@@ -33696,7 +33706,7 @@ toughness=2
 [card]
 name=Earthlink
 auto=upcost[{2}] sacrifice
-auto=lord(creature) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(land|mybattlefield) sacrifice]))
+auto=lord(creature) transforms((,newability[_DIES_target(land|mybattlefield) sacrifice]))
 text=At the beginning of your upkeep, sacrifice Earthlink unless you pay {2}. -- Whenever a creature dies, that creature's controller sacrifices a land.
 mana={3}{B}{R}{G}
 type=Enchantment
@@ -36212,7 +36222,7 @@ toughness=2
 [card]
 name=Enigma Sphinx
 abilities=Flying
-auto=@movedTo(graveyard) from(this|battlefield): moveto(ownerlibrary)
+auto=@movedTo(mygraveyard) from(battlefield): moveto(ownerlibrary)
 autostack=if casted(this) then cascade:plibrarycount
 text=Flying -- When Enigma Sphinx is put into your graveyard from the battlefield, put into your library third from the top.
 mana={4}{W}{U}{B}
@@ -37850,7 +37860,7 @@ type=Artifact
 [card]
 name=Expedition Raptor
 abilities=flying
-auto=target(<upto:2>other creature|battlefield) counter(1/1)
+auto=may target(<upto:2>other creature|battlefield) counter(1/1)
 text=Flying -- When Expedition Raptor enters the battlefield, support 2. (Put a +1/+1 counter on each of up to two other target creatures.)
 mana={3}{W}{W}
 type=Creature
@@ -38203,7 +38213,7 @@ type=Legendary Land
 [/card]
 [card]
 name=Eye of Yawgmoth
-auto={3}{T}{S(creature|mybattlefield)}:reveal:storedmanacost optionone name(pick a card) target(<1>*|reveal) moveto(ownerHand) optiononeend optiontwo name(Put in exile) target(<1>*|reveal) moveto(myexile) and!( moveto(exile) all(*|reveal) )! optiontwoend revealend
+auto={3}{T}{S(creature|mybattlefield)}:reveal:storedpower optionone name(pick a card) target(<1>*|reveal) moveto(ownerHand) optiononeend optiontwo name(Put in exile) target(<1>*|reveal) moveto(myexile) and!( moveto(exile) all(*|reveal) )! optiontwoend revealend
 text={3}, {T}, Sacrifice a creature: Reveal a number of cards from the top of your library equal to the sacrificed creature's power. Put one into your hand and exile the rest.
 mana={3}
 type=Artifact
@@ -38611,7 +38621,7 @@ type=Sorcery
 [/card]
 [card]
 name=Faith's Fetters
-target=artifact,creature,enchantment,land,planeswalker
+target=*[artifact;battle;creature;enchantment;land;planeswalker]
 auto=teach(creature) cantattack
 auto=teach(creature) cantpwattack
 auto=teach(creature) cantblock
@@ -39252,11 +39262,9 @@ type=Instant
 [card]
 name=Fateful Showdown
 target=anytarget
-auto=count(type:*:myhand)
-auto=damage:countedamount
-auto=all(*|myhand) reject
-auto=draw:countedamount controller
-text=Fateful Showdown deals damage to target creature or player equal to the number of cards in your hand. Discard all the cards in your hand, then draw that many cards.
+auto=damage:type:*:myhand
+auto=all(*|myhand) transforms((,newability[draw:1],newability[reject]))
+text=Fateful Showdown deals damage to any target equal to the number of cards in your hand. Discard all the cards in your hand, then draw that many cards.
 mana={2}{R}{R}
 type=Instant
 [/card]
@@ -43484,7 +43492,7 @@ toughness=2
 [/card]
 [card]
 name=Frenzied Fugue
-target=artifact,creature,enchantment,land,planeswalker
+target=*[artifact;battle;creature;enchantment;land;planeswalker]
 auto=transforms((,newability[moveTo(opponentbattlefield)],newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield) oneshot],newability[untap],newability[haste])) ueot
 auto=@each my upkeep:transforms((,newability[moveTo(opponentbattlefield)],newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],newability[haste])) ueot
 text=Enchant permanent -- When Frenzied Fugue enters the battlefield or at the beginning of your upkeep, gain control of enchanted permanent until end of turn. Untap that permanent. It gains haste until end of turn.
@@ -46703,7 +46711,7 @@ toughness=1
 [/card]
 [card]
 name=Gladehart Cavalry
-auto=target(<upto:6>other creature|battlefield) counter(1/1)
+auto=may target(<upto:6>other creature|battlefield) counter(1/1)
 auto=@movedto(graveyard) from(creature[counter{1/1.1}]|mybattlefield):life:2 controller
 text=When Gladehart Cavalry enters the battlefield, support 6. (Put a +1/+1 counter on each of up to six other target creatures.) -- Whenever a creature you control with a +1/+1 counter on it dies, you gain 2 life.
 mana={5}{G}{G}
@@ -57244,8 +57252,7 @@ toughness=4
 [/card]
 [card]
 name=Illusionist's Stratagem
-target=<upto:2>creature|mybattlefield
-auto=(blink)
+auto=may target(<upto:2>creature|mybattlefield) (blink)
 auto=draw:1 controller
 text=Exile up to two target creatures you control, then return those cards to the battlefield under their owner's control. -- Draw a card.
 mana={3}{U}
@@ -57901,7 +57908,7 @@ toughness=1
 [/card]
 [card]
 name=Indestructibility
-target=artifact,creature,enchantment,land,planeswalker
+target=*[artifact;battle;creature;enchantment;land;planeswalker]
 auto=indestructible
 text=Enchant permanent -- Enchanted permanent is indestructible. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
 mana={3}{W}
@@ -58958,7 +58965,7 @@ type=Instant
 [card]
 name=Inverter of Truth
 abilities=flying
-auto=all(*|mylibrary) moveto(exile) && all(*|mygraveyard) moveto(mylibrary)
+auto=all(*|mylibrary) hiddenmoveto(exile) && all(*|mygraveyard) moveto(mylibrary)
 text=Devoid (This card has no color.) -- Flying -- When Inverter of Truth enters the battlefield, exile all cards from your library face down, then shuffle all cards from your graveyard into your library.
 mana={2}{B}{B}
 abilities=devoid
@@ -60514,7 +60521,7 @@ toughness=1
 [/card]
 [card]
 name=Jokulhaups
-auto=bury all(artifact,creature,land)
+auto=bury all(*[artifact;creature;land])
 text=Destroy all artifacts, creatures, and lands. They can't be regenerated.
 mana={4}{R}{R}
 type=Sorcery
@@ -60596,7 +60603,7 @@ toughness=4
 [/card]
 [card]
 name=Joraga Auxiliary
-auto={4}{G}{W}:target(<upto:2>other creature|battlefield) counter(1/1)
+auto={4}{G}{W}:may target(<upto:2>other creature|battlefield) counter(1/1)
 text={4}{G}{W}: Support 2. (Put a +1/+1 counter on each of up to two other target creatures.)
 mana={1}{G}{W}
 type=Creature
@@ -61258,7 +61265,7 @@ type=Sorcery
 [card]
 name=Kagemaro, First to Suffer
 anyzone=type:*:myhand/type:*:myhand cdaactive
-auto={B}{S}:-type:*:myhand/-type:*:myhand all(creature) ueot
+auto={B}{S}:all(creature) -type:*:myhand/-type:*:myhand ueot
 text=Kagemaro, First to Suffer's power and toughness are each equal to the number of cards in your hand. -- {B}, Sacrifice Kagemaro: All creatures get -X/-X until end of turn, where X is the number of cards in your hand.
 mana={3}{B}{B}
 type=Legendary Creature
@@ -65989,7 +65996,9 @@ type=Land
 [/card]
 [card]
 name=Lavacore Elemental
-auto=vanishing:1
+auto=counter(0/0,1,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 auto=@combatdamaged(player) from(creature|myBattlefield):counter(0/0,1,Time)
 text=Vanishing 1 (This permanent enters the battlefield with a time counter on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.) -- Whenever a creature you control deals combat damage to a player, put a time counter on Lavacore Elemental.
 mana={2}{R}
@@ -66103,8 +66112,7 @@ type=Instant
 [/card]
 [card]
 name=Lead by Example
-target=<upto:2>creature|battlefield
-auto=counter(1/1)
+auto=may target(<upto:2>creature|battlefield) counter(1/1)
 text=Support 2. (Put a +1/+1 counter on each of up to two target creatures.)
 mana={1}{G}
 type=Instant
@@ -68469,7 +68477,9 @@ type=Instant
 [/card]
 [card]
 name=Lost Auramancers
-auto=vanishing:3
+auto=counter(0/0,3,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 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}
@@ -69506,7 +69516,9 @@ name=Maelstrom Djinn
 abilities=flying
 facedown={3}
 autofacedown={2}{u}:morph
-autofaceup=vanishing:2
+autofaceup=counter(0/0,2,Time)
+autofaceup=@each my upkeep:counter(0/0,-1,Time)
+autofaceup=this(counter{0/0.1.Time}<=0) sacrifice
 text=Flying -- Morph {2}{U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.) -- When Maelstrom Djinn is turned face up, put two time counters on it and it gains vanishing. (At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)
 mana={7}{U}
 type=Creature
@@ -74082,7 +74094,7 @@ type=Sorcery
 [card]
 name=Mind Whip
 target=creature
-auto=teach(creature) upcost[{3}] tap && damage:2 targetcontroller
+auto=teach(creature) upcost[{3}] tap and!(damage:2 targetcontroller)! 
 text=Enchant creature -- At the beginning of the upkeep of enchanted creature's controller, that player may pay {3}. If they doesn't, Mind Whip deals 2 damage to that player and you tap that creature.
 mana={2}{B}{B}
 type=Enchantment
@@ -78840,8 +78852,9 @@ subtype=Aura
 [/card]
 [card]
 name=Necromancer's Stockpile
-auto=aslongas(creature|myhand) {1}{B}:notatarget(creature|myhand) and!( if cantargetcard(zombie|*) then _ZOMBIETOKEN_ and!( tap(noevent) )! )! reject && draw:1 controller
-text={1}{B},Discard a creature card: Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
+auto={1}{B}{D(creature[Zombie]|myHand)}:_ZOMBIETOKEN_ and!( tap(noevent) && draw:1 )! restriction{type(creature[Zombie]|myHand)~morethan~0}
+auto={1}{B}{D(creature[-Zombie]|myHand)}:draw:1 restriction{type(creature[-Zombie]|myHand)~morethan~0}
+text={1}{B}, Discard a creature card: Draw a card. If the discarded card was a Zombie card, create a tapped 2/2 black Zombie creature token.
 mana={1}{B}
 type=Enchantment
 [/card]
@@ -80320,7 +80333,7 @@ mana={4}{B}{B}
 [/card]
 [card]
 name=Nissa's Chosen
-auto=@movedTo(graveyard) from(this|battlefield):all(trigger[from]) bottomoflibrary
+auto=_DIES_all(trigger[from]) bottomoflibrary
 text=If Nissa's Chosen would die, put it on the bottom of its owner's library instead.
 mana={G}{G}
 type=Creature
@@ -80943,7 +80956,7 @@ type=Instant
 [/card]
 [card]
 name=Noxious Toad
-auto=@movedto(mygraveyard) from(this|mybattlefield):ability$!name(discard) target(*|myhand) reject!$ opponent
+auto=_DIES_ability$!name(discard) target(*|myhand) reject!$ opponent
 text=When Noxious Toad dies, each opponent discards a card.
 mana={2}{B}
 type=Creature
@@ -82392,7 +82405,7 @@ type=Enchantment
 [/card]
 [card]
 name=Onulet
-auto=@movedTo(this|graveyard) from(this|battlefield):life:2 controller
+auto=_DIES_life:2 controller
 text=When Onulet dies, you gain 2 life.
 mana={3}
 type=Artifact Creature
@@ -88295,7 +88308,7 @@ type=Sorcery
 name=Press into Service
 target=creature|battlefield
 auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(previousbattlefield)],newability[untap],haste)) ueot)!
-auto=target(<upto:2>creature|battlefield) counter(1/1)
+auto=may target(<upto:2>creature|battlefield) counter(1/1)
 text=Support 2. (Put a +1/+1 counter on each of up to two target creatures.) -- Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
 mana={4}{R}
 type=Sorcery
@@ -88349,7 +88362,7 @@ type=Instant
 name=Preyseizer Dragon
 abilities=flying
 auto=may notATarget(<anyamount>other creature|mybattlefield) sacrifice && counter(1/1,2) all(this)
-auto=_ATTACKING_target(anytarget) damage:powerminus4minusend 
+auto=_ATTACKING_target(anytarget) dynamicability<!oneonecountersstrike!>
 text=Flying -- Devour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with twice that many +1/+1 counters on it.) -- Whenever Preyseizer Dragon attacks, it deals damage to any target equal to the number of +1/+1 counters on Preyseizer Dragon.
 mana={4}{R}{R}
 type=Creature
@@ -89342,7 +89355,7 @@ type=Instant
 [/card]
 [card]
 name=Prowess of the Fair
-auto=@movedTo(mygraveyard) from(other elf[-token]|battlefield):may token(Elf Warrior,creature elf warrior,1/1,green)
+auto=@movedTo(other elf[-token]|mygraveyard) from(battlefield):may token(Elf Warrior,creature elf warrior,1/1,green)
 text=Whenever another nontoken Elf is put into your graveyard from the battlefield, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
 mana={1}{B}
 type=Tribal Enchantment
@@ -89462,7 +89475,7 @@ toughness=3
 [/card]
 [card]
 name=Psychic Overload
-target=artifact,creature,enchantment,land,planeswalker
+target=*[artifact;battle;creature;enchantment;land;planeswalker]
 auto=tap
 auto=teach(*) doesnotuntap
 auto=teach(*) {D(artifact|myhand)}{D(artifact|myhand)}:untap
@@ -92278,7 +92291,9 @@ toughness=3
 [/card]
 [card]
 name=Ravaging Riftwurm
-auto=vanishing:2
+auto=counter(0/0,2,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 kicker={4}
 auto=if paid(kicker) then counter(0/0,3,Time)
 text=Kicker {4} (You may pay an additional 4 as you cast this spell.) -- Vanishing 2 (This permanent enters the battlefield with two time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.) -- If Ravaging Riftwurm was kicked, it enters the battlefield with three additional time counters on it.
@@ -93803,7 +93818,7 @@ toughness=2
 [/card]
 [card]
 name=Relief Captain
-auto=target(<upto:3>other creature|battlefield) counter(1/1)
+auto=may target(<upto:3>other creature|battlefield) counter(1/1)
 text=When Relief Captain enters the battlefield, support 3. (Put a +1/+1 counter on each of up to three other target creatures.)
 mana={2}{W}{W}
 type=Creature
@@ -97344,7 +97359,7 @@ type=Land
 [/card]
 [card]
 name=Rukh Egg
-auto=@movedTo(graveyard) from(this|battlefield):phaseaction[endofturn once] token(Bird,Creature Bird,4/4,red,flying)
+auto=_DIES_phaseaction[endofturn once] token(Bird,Creature Bird,4/4,red,flying)
 text=When Rukh Egg dies, put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step.
 mana={3}{R}
 type=Creature
@@ -98118,7 +98133,7 @@ type=Instant
 [/card]
 [card]
 name=Saddleback Lagac
-auto=target(<upto:2>other creature|battlefield) counter(1/1)
+auto=may target(<upto:2>other creature|battlefield) counter(1/1)
 text=When Saddleback Lagac enters the battlefield, support 2. (Put a +1/+1 counter on each of up to two other target creatures.)
 mana={3}{G}
 type=Creature
@@ -104522,7 +104537,7 @@ toughness=3
 [/card]
 [card]
 name=Shoulder to Shoulder
-auto=target(<upto:2>other creature|battlefield) counter(1/1)
+auto=may target(<upto:2>other creature|battlefield) counter(1/1)
 auto=draw:1
 text=Support 2. (Put a +1/+1 counter on each of up to two target creatures.) -- Draw a card.
 mana={2}{W}
@@ -106952,7 +106967,7 @@ type=Artifact
 [card]
 name=Skullclamp
 auto=teach(creature) 1/-1
-auto=@movedto(graveyard) from(mytgt|battlefield):draw:2 controller
+auto=@movedto(mytgt|graveyard) from(battlefield):draw:2 controller
 auto={1}:equip
 text=Equipped creature gets +1/-1. -- When equipped creature is put into a graveyard, draw two cards. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={1}
@@ -110106,7 +110121,9 @@ toughness=1
 [/card]
 [card]
 name=Soultether Golem
-auto=vanishing:1
+auto=counter(0/0,1,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 auto=@movedTo(other creature|myBattlefield):counter(0/0,1,Time)
 text=Vanishing 1 (This permanent enters the battlefield with a time counter on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.) -- Whenever another creature enters the battlefield under your control, put a time counter on Soultether Golem.
 mana={2}
@@ -117447,7 +117464,7 @@ type=Sorcery
 [/card]
 [card]
 name=Take Possession
-target=artifact,creature,enchantment,land,planeswalker
+target=*[artifact;battle;creature;enchantment;land;planeswalker]
 alias=1194
 text=Split second (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.) -- Enchant permanent -- You control enchanted permanent.
 mana={5}{U}{U}
@@ -120201,7 +120218,7 @@ toughness=3
 [/card]
 [card]
 name=Thopter Foundry
-auto={1}{S(artifact[-token]|myinplay)}:token(Thopter,artifact creature thopter,1/1,blue flying) && life:1
+auto={1}{S(artifact[-token]|myBattlefield)}:token(Thopter,artifact creature thopter,1/1,blue flying) && life:1
 text={1}, Sacrifice a nontoken artifact: Put a 1/1 blue Thopter artifact creature token with flying onto the battlefield. You gain 1 life.
 mana={WB}{U}
 type=Artifact
@@ -121591,17 +121608,6 @@ power=5
 toughness=5
 [/card]
 [card]
-name=Tidewalker
-auto=vanishing:type:island:mybattlefield
-auto=hascnttime/hascnttime cdaactive
-text=Tidewalker enters the battlefield with a time counter on it for each Island you control. -- Vanishing (At the beginning of your upkeep, remove a time counter from this permanent. When the last is removed, sacrifice it.) -- Tidewalker's power and toughness are each equal to the number of time counters on it.
-mana={2}{U}
-type=Creature
-subtype=Elemental
-power=*
-toughness=*
-[/card]
-[card]
 name=Tidewater Minion
 abilities=defender
 auto={4}:-defender
@@ -122900,7 +122906,9 @@ type=Enchantment
 [card]
 name=Tourach's Gate
 target=land|myBattlefield
-auto=vanishing:3
+auto=counter(0/0,3,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 auto={s(thrull|mybattlefield)}:counter(0/0,3,time)
 auto=teach(land) {T}:all(creature[attacking]) 2/-1
 text=Enchant land you control -- Sacrifice a Thrull: Put three time counters on Tourach's Gate. -- At the beginning of your upkeep, remove a time counter from Tourach's Gate. If there are no time counters on Tourach's Gate, sacrifice it. -- Enchanted land has "{T}: Attacking creatures you control get +2/-1 until end of turn."
@@ -126113,8 +126121,8 @@ toughness=2
 [/card]
 [card]
 name=Unity of Purpose
-auto=ability$!choice untap all(creature[counter{1/1.1}]|mybattlefield)!$ controller
-auto=target(<upto:2>other creature|battlefield) counter(1/1)
+auto=may target(<upto:2>other creature|battlefield) counter(1/1) && ability$!untap all(creature[counter{1/1.1}]|mybattlefield)!$ controller
+auto=may name(Just untap) ability$!untap all(creature[counter{1/1.1}]|mybattlefield)!$ controller
 text=Support 2. (Put a +1/+1 counter on each of up to two target creatures.) -- Untap each creature you control with a +1/+1 counter on it.
 mana={3}{U}
 type=Instant
@@ -128187,7 +128195,7 @@ subtype=Aura
 [/card]
 [card]
 name=Verdant Succession
-auto=lord(creature[green;-token]) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(creature[share!name!]|mylibrary) moveTo(mybattlefield)]))
+auto=lord(creature[green;-token]) transforms((,newability[_DIES_target(creature[share!name!]|mylibrary) moveTo(mybattlefield)]))
 text=Whenever a green nontoken creature dies, that creature's controller may search their library for a card with the same name as that creature and put it onto the battlefield. If that player does, they then shuffles their library.
 mana={4}{G}
 type=Enchantment
@@ -130355,7 +130363,7 @@ toughness=3
 [/card]
 [card]
 name=Volition Reins
-target=artifact,creature,enchantment,land,planeswalker
+target=*[artifact;battle;creature;enchantment;land;planeswalker]
 auto=untap
 alias=1194
 text=Enchant Permanent -- When Volition Reins enters the battlefield, if enchanted permanent is tapped, untap it. -- You control enchanted permanent.
@@ -131753,7 +131761,9 @@ toughness=4
 [/card]
 [card]
 name=Waning Wurm
-auto=vanishing:2
+auto=counter(0/0,2,Time)
+auto=@each my upkeep:counter(0/0,-1,Time)
+auto=this(counter{0/0.1.Time}<=0) sacrifice
 text=Vanishing 2 (This permanent enters the battlefield with two time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)
 mana={3}{B}
 type=Creature
@@ -132817,7 +132827,7 @@ toughness=1
 [card]
 name=Weatherseed Totem
 auto={T}:Add{G}
-auto={2}{G}{G}{G}:transforms((Treefolk Artifact Creature,newability[@movedto(graveyard) from(this|battlefield):moveto(ownerhand) all(trigger[from]|*)],setpower=5,settoughness=3,trample,green)) ueot
+auto={2}{G}{G}{G}:transforms((Treefolk Artifact Creature,newability[_DIES_moveto(ownerhand) all(trigger[from]|*)],setpower=5,settoughness=3,trample,green)) ueot
 text={T}: Add {G}. -- {2}{G}{G}{G}: Weatherseed Totem becomes a 5/3 green Treefolk artifact creature with trample until end of turn. -- When Weatherseed Totem is put into a graveyard from the battlefield, if it was a creature, return this card to its owner's hand.
 mana={3}
 type=Artifact
@@ -133501,7 +133511,7 @@ toughness=1
 name=Whirlpool Drake
 abilities=flying
 auto=all(*|myhand) transforms((,newability[draw:1],newability[moveTo(mylibrary) and!(shuffle)!]))
-auto=@movedTo(this|ownergraveyard) from(battlefield):all(*|myhand) transforms((,newability[draw:1],newability[moveTo(mylibrary) and!(shuffle)!]))
+auto=_DIES_all(*|myhand) transforms((,newability[draw:1],newability[moveTo(mylibrary) and!(shuffle)!]))
 text=Flying -- When Whirlpool Drake enters the battlefield, shuffle the cards from your hand into your library, then draw that many cards. -- When Whirlpool Drake dies, shuffle the cards from your hand into your library, then draw that many cards.
 mana={3}{U}
 type=Creature
@@ -134713,7 +134723,7 @@ toughness=2
 [card]
 name=Winnow
 target=*[-land]
-auto=aslongas(*[share!name!]|battlefield) destroy
+auto=aslongas(*[share!name!]|battlefield) destroy >1
 auto=draw:1 controller
 text=Destroy target nonland permanent if another permanent with the same name is on the battlefield. -- Draw a card.
 mana={1}{W}