diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index 688fbdbf5..3a89c7fcb 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -77,7 +77,7 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 #AUTO_DEFINE _MONSTROSITY_($cost) name(Monstrosity) this(cantargetcard(*[-monstrous]) {$cost}:becomes(monstrous) forever && counter(1/1,$c)
 
 # Heroic
-#AUTO_DEFINE _HEROIC_ @targeted(this) from(*[instant;sorcery;enchantment;aura]|myCastingzone):
+#AUTO_DEFINE _HEROIC_ @targeted(this) from(*[instant;sorcery;aura]|myCastingzone):
 
 # Outlast
 #AUTO_DEFINE _OUTLAST_($cost) {$cost}{$cost}:counter(1/1,1) all(this) asSorcery
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 28fbcf8d8..4369d6ce6 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -605,7 +605,7 @@ toughness=3
 [card]
 name=Aesi, Tyrant of Gyre Strait
 auto=maxPlay(land)+1
-auto=@movedTo(land|myBattlefield):may draw:1 controller
+auto=_LANDFALL_may draw:1 controller
 text=You may play an additional land on each of your turns. -- Whenever a land enters the battlefield under your control, you may draw a card.
 mana={4}{G}{U}
 type=Legendary Creature
@@ -4949,7 +4949,7 @@ toughness=3
 [card]
 name=Battlefield Thaumaturge
 auto=lord(instant,sorcery|myhand) altercost(colorless,-1)
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):opponentshroud ueot
+auto=_HEROIC_opponentshroud ueot
 text=Each instant and sorcery spell you cast costs {1} less to cast for each creature it targets. -- Heroic — Whenever you cast a spell that targets Battlefield Thaumaturge, Battlefield Thaumaturge gains hexproof until end of turn.
 mana={1}{U}
 type=Creature
@@ -9812,7 +9812,7 @@ type=Instant
 name=Chandra, Fire of Kaladesh
 auto=@movedTo(*[red]|mystack):untap all(this)
 auto=@movedto(Moonmist|stack):name(Transform Human Shaman) moveto(ownerBattlefield) && flip(Chandra, Roaring Flame)
-auto={T}:damage:1 target(player) limit^moveto(ownerBattlefield) && flip(Chandra, Roaring Flame)^3
+auto={T}:damage:1 target(player) limit^moveto(exile) and!(moveto(mybattlefield) and!(counter(0/0,4,Loyalty) && flip(Chandra, Roaring Flame) )! )!^3
 text=Whenever you cast a red spell, untap Chandra, Fire of Kaladesh. -- {T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control.
 mana={1}{R}{R}
 type=Legendary Creature
@@ -19820,7 +19820,7 @@ type=Sorcery
 [/card]
 [card]
 name=Evolution Sage
-auto=@movedTo(land|myBattlefield):_PROLIFERATE_
+auto=_LANDFALL__PROLIFERATE_
 text=Whenever a land enters the battlefield under your control, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
 mana={2}{G}
 type=Creature
@@ -24322,7 +24322,7 @@ toughness=3
 [card]
 name=Geode Rager
 abilities=first strike
-auto=@movedto(land|myBattlefield):name(Choose one) ability$!name(Choose one) choice name(Goad opponent creatures) mustattack all(creature|opponentBattlefield) uynt _ choice name(Goad your creatures) mustattack all(creature|myBattlefield) uynt!$ controller
+auto=_LANDFALL_name(Choose one) ability$!name(Choose one) choice name(Goad opponent creatures) mustattack all(creature|opponentBattlefield) uynt _ choice name(Goad your creatures) mustattack all(creature|myBattlefield) uynt!$ controller
 text=First strike -- Landfall — Whenever a land enters the battlefield under your control, goad each creature target player controls. (Until your next turn, those creatures attack each combat if able and attack a player other than you if able.)
 mana={4}{R}{R}
 type=Creature
@@ -25473,7 +25473,7 @@ type=Instant
 [card]
 name=Gnarlback Rhino
 abilities=trample
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):draw:1 controller
+auto=_HEROIC_draw:1 controller
 text=Trample (This creature can deal excess combat damage to the player or planeswalker it's attacking.) -- Whenever you cast a spell that targets Gnarlback Rhino, draw a card.
 mana={2}{G}{G}
 type=Creature
@@ -29026,7 +29026,7 @@ toughness=2
 [/card]
 [card]
 name=Hero of the Games
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):1/0 all(creature|mybattlefield) ueot oneshot
+auto=_HEROIC_1/0 all(creature|mybattlefield) ueot oneshot
 text=Whenever you cast a spell that targets Hero of the Games, creatures you control get +1/+0 until end of turn.
 mana={2}{R}
 type=Creature
@@ -29037,7 +29037,7 @@ toughness=2
 [card]
 name=Hero of the Nyxborn
 auto=token(Soldier,Creature Human Soldier,1/1,white)
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):1/0 all(creature|mybattlefield) ueot oneshot
+auto=_HEROIC_1/0 all(creature|mybattlefield) ueot oneshot
 text=When Hero of the Nyxborn enters the battlefield, create a 1/1 white Human Soldier creature token. -- Whenever you cast a spell that targets Hero of the Nyxborn, creatures you control get +1/+0 until end of turn.
 mana={1}{R}{W}
 type=Enchantment Creature
@@ -29047,7 +29047,7 @@ toughness=2
 [/card]
 [card]
 name=Hero of the Pride
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):1/0 all(creature|mybattlefield) ueot oneshot
+auto=_HEROIC_1/0 all(creature|mybattlefield) ueot oneshot
 text=Whenever you cast a spell that targets Hero of the Pride, creatures you control get +1/+0 until end of turn.
 mana={1}{W}
 type=Creature
@@ -29058,7 +29058,7 @@ toughness=2
 [card]
 name=Hero of the Revel
 auto=token(Satyr,Creature Satyr,1/1,red,cantblock)
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):1/0 all(creature|mybattlefield) ueot oneshot
+auto=_HEROIC_1/0 all(creature|mybattlefield) ueot oneshot
 text=When Heroes of the Revel enters the battlefield, create a 1/1 red Satyr creature token with “This creature can’t block.” -- Whenever you cast a spell that targets Heroes of the Revel, creatures you control get +1/+0 until end of turn.
 mana={4}{R}
 type=Creature
@@ -29069,7 +29069,7 @@ toughness=4
 [card]
 name=Hero of the Winds
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):1/0 all(creature|mybattlefield) ueot oneshot
+auto=_HEROIC_1/0 all(creature|mybattlefield) ueot oneshot
 text=Flying -- Whenever you cast a spell that targets Hero of the Pride, creatures you control get +1/+0 until end of turn.
 mana={3}{W}
 type=Creature
@@ -32597,7 +32597,7 @@ type=Sorcery
 [/card]
 [card]
 name=Jace, Vryn's Prodigy
-auto=@movedto(Moonmist|stack):name(Transform Human Wizard) flip(Jace, Telepath Unbound
+auto=@movedto(Moonmist|stack):name(Transform Human Wizard) flip(Jace, Telepath Unbound)
 auto={T}:draw:1 controller && ability$!name(Discard a card) reject notatarget(*|myhand)!$ controller restriction{type(*|mygraveyard)~lessthan~4}
 auto={T}:draw:1 controller && ability$!name(Discard a card) reject notatarget(*|myhand)!$ controller && moveto(exile) and!( moveto(mybattlefield) and!( haste && counter(0/0,5,Loyalty) && flip(Jace^ Telepath Unbound) )! )! restriction{type(*|mygraveyard)~morethan~3}
 text={T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn's Prodigy, then return him to the battlefield transformed under his owner's control.
@@ -35425,7 +35425,7 @@ type=Artifact
 [card]
 name=Kytheon, Hero of Akros
 auto=@movedto(Moonmist|stack):name(Transform Human Soldier) moveto(ownerBattlefield) && flip(Gideon, Battle-Forged)
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:moveto(ownerBattlefield) && flip(Gideon, Battle-Forged)
+auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:moveto(exile) and!( moveto(mybattlefield) and!(counter(0/0,3,Loyalty) && flip(Gideon, Battle-Forged)
 auto={2}{W}:all(this) indestructible ueot
 text=At end of combat, if Kytheon, Hero of Akros and at least two other creatures attacked this combat, exile Kytheon, then return him to the battlefield transformed under his owner's control. -- {2}{W}: Kytheon gains indestructible until end of turn.
 mana={W}
@@ -36706,7 +36706,7 @@ type=Instant
 name=Liliana, Heretical Healer
 abilities=lifelink
 auto=@movedto(Moonmist|stack):name(Transform Human Cleric) moveto(ownerBattlefield) && flip(Liliana, Defiant Necromancer)
-auto=@movedTo(other creature[-token]|graveyard) from(myBattlefield):moveto(ownerBattlefield) && flip(Liliana, Defiant Necromancer) && ability$!name(Create Zombie) token(Zombie,Creature Zombie,2/2,black)!$ controller
+auto=@movedTo(other creature[-token]|graveyard) from(myBattlefield):moveto(exile) and!( moveto(mybattlefield) and!(counter(0/0,3,Loyalty) && flip(Liliana, Defiant Necromancer) )! )! && ability$!name(Create Zombie) token(Zombie,Creature Zombie,2/2,black)!$ controller
 text=Lifelink -- Whenever another nontoken creature you control dies, exile Liliana, Heretical Healer, then return her to the battlefield transformed under her owner's control. If you do, put a 2/2 black Zombie creature token onto the battlefield.
 mana={1}{B}{B}
 type=Legendary Creature
@@ -37449,7 +37449,7 @@ toughness=5
 name=Lotus Field
 abilities=opponentshroud
 auto=tap(noevent)
-auto=aslongas(land|mybattlefield) choice target(<2>other land|mybattlefield) sacrifice oneshot >1
+auto=aslongas(land|mybattlefield) choice target(<2>land|mybattlefield) sacrifice oneshot >1
 auto={T}:Add{W}{W}{W}
 auto={T}:Add{U}{U}{U}
 auto={T}:Add{B}{B}{B}
@@ -40571,8 +40571,8 @@ type=Instant
 [card]
 name=Moraug, Fury of Akoum
 auto=@combat(attacking) source(creature|myBattlefield):1/0 ueot
-auto=@movedTo(land|myBattlefield):nextphasealter(add,combatphaseswithmain,controller,after<this>)
-auto=@movedTo(land|myBattlefield):transforms((,newability[@each my combatbegins:untap all(creature|myBattlefield)])) oneshot
+auto=_LANDFALL_nextphasealter(add,combatphaseswithmain,controller,after<this>)
+auto=_LANDFALL_transforms((,newability[@each my combatbegins:untap all(creature|myBattlefield)])) oneshot
 text=Each creature you control gets +1/+0 for each time it has attacked this turn. -- Landfall — Whenever a land enters the battlefield under your control, if it's your main phase, there's an additional combat phase after this phase. At the beginning of that combat, untap all creatures you control.
 mana={4}{R}{R}
 type=Legendary Creature
@@ -41135,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
@@ -41315,7 +41315,7 @@ name=Nahiri's Lithoforming
 target=<x>land|myBattlefield
 auto=transforms((,newability[sacrifice],newability[draw:1])) ueot
 auto=maxPlay(land)+1 ueot
-auto=emblem transforms((,newability[@movedTo(land|myBattlefield):all(trigger[to]) tap(noevent)])) ueot
+auto=emblem transforms((,newability[_LANDFALL_all(trigger[to]) tap(noevent)])) ueot
 text=Sacrifice X lands. For each land sacrificed this way, draw a card. You may play X additional lands this turn. Lands you control enter the battlefield tapped this turn.
 mana={X}{R}{R}
 type=Sorcery
@@ -41890,7 +41890,7 @@ toughness=1
 [card]
 name=Nesting Dragon
 abilities=flying
-auto=@movedTo(land|myBattlefield):token(dragon egg)
+auto=_LANDFALL_token(dragon egg)
 text=Flying -- Landfall — Whenever a land enters the battlefield under your control, create a 0/2 red Dragon Egg creature token with defender and "When this creature dies, create a 2/2 red Dragon creature token with flying and '{R}: This creature gets +1/+0 until end of turn.'"
 mana={3}{R}{R}
 type=Creature
@@ -42114,7 +42114,7 @@ toughness=2
 name=Nicol Bolas, the Ravager
 abilities=flying
 auto=ability$!name(discard) reject notatarget(*|myhand)!$ opponent
-auto={4}{U}{B}{R}:moveto(ownerBattlefield) && flip(Nicol Bolas, the Arisen) asSorcery
+auto={4}{U}{B}{R}:moveto(exile) and!(moveto(mybattlefield) and!(counter(0/0,7,Loyalty) && flip(Nicol Bolas, the Arisen))! )! asSorcery
 text=Flying -- When Nicol Bolas, the Ravager enters the battlefield, each opponent discards a card. -- {4}{U}{B}{R}: Exile Nicol Bolas, the Ravager, then return him to the battlefield transformed under his owner's control. Activate this ability only any time you could cast a sorcery.
 mana={1}{U}{B}{R}
 type=Legendary Creature
@@ -42556,7 +42556,7 @@ subtype=Aura
 name=Nissa, Vastwood Seer
 aicode=activate target(forest[basic]|mylibrary) moveto(myhand)
 auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>forest[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
-auto=@movedto(land|mybattlefield) restriction{type(land|mybattlefield)~morethan~6}:all(this) moveto(ownerBattlefield) && flip(Nissa, Sage Animist)
+auto=@movedto(land|mybattlefield) restriction{type(land|mybattlefield)~morethan~6}:all(this) moveto(exile) and!( moveto(mybattlefield) and!(counter(0/0,3,Loyalty) && flip(Nissa, Sage Animist) )! )!
 text=When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library. -- Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control.
 mana={2}{G}
 type=Legendary Creature
@@ -42714,7 +42714,7 @@ toughness=2
 name=Null Profusion
 auto=phasealter(remove,draw,controller)
 auto=@movedTo(*[-land]|mystack):draw:1 controller
-auto=@movedTo(land|mybattlefield):draw:1 controller
+auto=_LANDFALL_draw:1 controller
 auto=hmodifer:-5 controller
 text=Skip your draw step. -- Whenever you play a card, draw a card. -- Your maximum hand size is two.
 mana={4}{B}{B}
@@ -43121,7 +43121,7 @@ auto=@each my combatbegins restriction{compare(power)~equalto~17}:may target(lan
 auto=@each my combatbegins restriction{compare(power)~equalto~18}:may target(land|mybattlefield) transforms((Elemental Creature,setpower=18,settoughness=18,trample,haste)) ueot
 auto=@each my combatbegins restriction{compare(power)~equalto~19}:may target(land|mybattlefield) transforms((Elemental Creature,setpower=19,settoughness=19,trample,haste)) ueot
 auto=@each my combatbegins restriction{compare(power)~morethan~19}:may target(land|mybattlefield) transforms((Elemental Creature,setpower=20,settoughness=20,trample,haste)) ueot
-auto=@movedto(land|myBattlefield):counter(1/1) target(creature|mybattlefield)
+auto=_LANDFALL_counter(1/1) target(creature|mybattlefield)
 text=At the beginning of combat on your turn, up to one target land you control becomes an X/X Elemental creature with trample and haste until end of turn, where X is Obuun's power. It's still a land. -- Landfall — Whenever a land enters the battlefield under your control, put a +1/+1 counter on target creature.
 mana={1}{R}{G}{W}
 type=Legendary Creature
@@ -43537,8 +43537,8 @@ toughness=1
 [card]
 name=Omnath, Locus of the Roil
 auto=damage:type:elemental:mybattlefield target(player,creature,planeswalker)
-auto=@movedTo(land|myBattlefield):counter(1/1) target(elemental|myBattlefield)
-auto=@movedTo(land|myBattlefield):if type(land|mybattlefield)~morethan~7 then draw:1 controller
+auto=_LANDFALL_counter(1/1) target(elemental|myBattlefield)
+auto=_LANDFALL_if type(land|mybattlefield)~morethan~7 then draw:1 controller
 text=When Omnath, Locus of the Roil enters the battlefield, it deals damage to any target equal to the number of Elementals you control. -- Whenever a land enters the battlefield under your control, put a +1/+1 counter on target Elemental you control. If you control eight or more lands, draw a card.
 mana={1}{G}{U}{R}
 type=Legendary Creature
@@ -52230,7 +52230,7 @@ toughness=2
 [/card]
 [card]
 name=Sage of Hours
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1)
+auto=_HEROIC_counter(1/1)
 auto={0}:this(counter{1/1.1}=5) turns:+1 controller && removeallcounters(1/1)
 auto={0}:this(counter{1/1.1}=6) turns:+1 controller && removeallcounters(1/1)
 auto={0}:this(counter{1/1.1}=7) turns:+1 controller && removeallcounters(1/1)
@@ -57035,7 +57035,7 @@ toughness=3
 [card]
 name=Skyclave Geopede
 abilities=trample
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Trample -- Landfall — Whenever a land enters the battlefield under your control, Skyclave Geopede gets +2/+2 until end of turn.
 mana={2}{R}
 type=Creature
@@ -57046,7 +57046,7 @@ toughness=1
 [card]
 name=Skyclave Pick-Axe
 auto=aslongas(parents) name(Attach to creature) rehook target(creature|myBattlefield) <1
-auto=teach(creature) transforms((,newability[@movedTo(land|myBattlefield):2/2 ueot]))
+auto=teach(creature) transforms((,newability[_LANDFALL_2/2 ueot]))
 auto={2}{G}:equip
 text=Skyclave Pick-Axe enters the battlefield, attach it to target creature you control. -- Landfall — Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn. -- Equip {2}{G}
 mana={G}
@@ -59397,7 +59397,7 @@ type=Legendary Land
 [/card]
 [card]
 name=Spitfire Lagac
-auto=@movedTo(land|myBattlefield):damage:1 opponent
+auto=_LANDFALL_damage:1 opponent
 text=Landfall — Whenever a land enters the battlefield under your control, Spitfire Lagac deals 1 damage to each opponent.
 mana={3}{R}
 type=Creature
@@ -62699,7 +62699,7 @@ toughness=2
 [/card]
 [card]
 name=Tatyova, Benthic Druid
-auto=@movedTo(land|myBattlefield):life:1 && draw:1
+auto=_LANDFALL_life:1 && draw:1
 text=Whenever a land enters the battlefield under your control, you gain 1 life and draw a card.
 mana={3}{G}{U}
 type=Legendary Creature
@@ -63257,7 +63257,7 @@ toughness=*
 [card]
 name=Territorial Scythecat
 abilities=trample
-auto=@movedTo(land|myBattlefield):counter(1/1,1)
+auto=_LANDFALL_counter(1/1,1)
 text=Trample -- Landfall — Whenever a land enters the battlefield under your control, put a +1/+1 counter on Territorial Scythecat.
 mana={2}{G}
 type=Creature
@@ -65096,7 +65096,7 @@ toughness=2
 [/card]
 [card]
 name=Tireless Provisioner
-auto=@movedTo(land|myBattlefield):name(Create treasure) token(Treasure Sur)
+auto=_LANDFALL_name(Create treasure) token(Treasure Sur)
 text=Landfall — Whenever a land enters the battlefield under your control, create a Food token or a Treasure token. (Food is an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life." Treasure is an artifact with " {T}, Sacrifice this artifact: Add one mana of any color.")
 mana={2}{G}
 type=Creature
@@ -65252,7 +65252,7 @@ type=Enchantment
 [card]
 name=Toggo, Goblin Weaponsmith
 abilities=partner
-auto=@movedTo(land|myBattlefield):token(Rock Equipment)
+auto=_LANDFALL_token(Rock Equipment)
 text=Whenever a land enters the battlefield under your control, create a colorless Equipment artifact token named Rock with "Equipped creature has '{1}, {T}, Sacrifice Rock: This creature deals 2 damage to any target'" and equip {1}. -- Partner (You can have two commanders if both have partner.)
 mana={2}{R}
 type=Legendary Creature
@@ -66074,7 +66074,7 @@ toughness=2
 [card]
 name=Trench Behemoth
 auto={H(land|mybattlefield)}:name(Untap and gain hexproof) name(Untap and gain hexproof) transforms((,newability[untap],newability[opponentshroud])) ueot
-auto=@movedTo(land|myBattlefield):name(Target creature must attack) name(Target creature must attack) target(creature|opponentbattlefield) transforms((,newability[mustattack])) uynt
+auto=_LANDFALL_name(Target creature must attack) name(Target creature must attack) target(creature|opponentbattlefield) transforms((,newability[mustattack])) uynt
 text=Return a land you control to its owner's hand: Untap Trench Behemoth. It gains hexproof until end of turn. -- Whenever a land enters the battlefield under your control, target creature an opponent controls attacks during its controller's next combat phase if able.
 mana={5}{U}{U}
 type=Creature
@@ -66271,7 +66271,7 @@ toughness=2
 [card]
 name=Trove Warden
 abilities=vigilance
-auto=@movedto(land|myBattlefield):moveto(exile) target(*[manacost<=3]|mygraveyard)
+auto=_LANDFALL_moveto(exile) target(*[manacost<=3]|mygraveyard)
 auto=_DIES_moveto(ownerbattlefield) target(<anyamount>*[manacost<=3]|myexile)
 text=Vigilance -- Landfall — Whenever a land enters the battlefield under your control, exile target permanent card with converted mana cost 3 or less from your graveyard. -- When Trove Warden dies, put each permanent card exiled with it onto the battlefield under the control of that card's owner.
 mana={2}{W}{W}
@@ -67771,7 +67771,7 @@ type=Instant
 [/card]
 [card]
 name=Valakut Exploration
-auto=@movedTo(land|myBattlefield):all(*[zpos=1]|myLibrary) moveTo(exile) and!( transforms((,canplayfromexile)) ueot )!
+auto=_LANDFALL_all(*[zpos=1]|myLibrary) moveTo(exile) and!( transforms((,canplayfromexile)) ueot )!
 auto=@each my endofturn restriction{type(*[fresh]|myExile)~morethan~0}:count(type:*[fresh]:myExile) && moveTo(myGraveyard) all(*[fresh]|myExile) && damage:countedamount opponent
 text=Landfall — Whenever a land enters the battlefield under your control, exile the top card of your library. You may play that card for as long as it remains exiled. -- At the beginning of your end step, if there are cards exiled with Valakut Exploration, put them into their owner's graveyard, then Valakut Exploration deals that much damage to each opponent.
 mana={2}{R}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 25c88d480..c757bd434 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -871,7 +871,7 @@ type=Sorcery
 [card]
 name=Admonition Angel
 abilities=flying
-auto=@movedto(land|myBattlefield):may (blink)forsrc target(other *[-land]|battlefield)
+auto=_LANDFALL_may (blink)forsrc target(other *[-land]|battlefield)
 text=Flying -- Landfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel. -- When Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
 mana={3}{W}{W}{W}
 type=Creature
@@ -932,7 +932,7 @@ type=Instant
 [card]
 name=Adventuring Gear
 auto={1}:equip
-auto=teach(creature) transforms((,newability[@movedTo(land|myBattlefield):2/2 ueot]))
+auto=teach(creature) transforms((,newability[_LANDFALL_2/2 ueot]))
 text=Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={1}
 type=Artifact
@@ -1720,7 +1720,7 @@ toughness=1
 [card]
 name=Agent of the Fates
 abilities=deathtouch
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):ability$!name(sacrifice) notatarget(creature|mybattlefield) sacrifice !$ opponent
+auto=_HEROIC_ability$!name(sacrifice) notatarget(creature|mybattlefield) sacrifice !$ opponent
 text=Deathtouch. -- Heroic - Whenever you cast a spell that targets Agent of the Fates, each opponent sacrifices a creature. 
 mana={1}{B}{B}
 type=Creature
@@ -2107,7 +2107,7 @@ toughness=5
 name=Akoum Firebird
 abilities=flying,haste,mustattack
 text=Flying, haste -- Akoum Firebird attacks each turn if able. -- Landfall -- Whenever a land enters the battlefield under your control, you may pay {4}{R}{R}. If you do, return Akoum Firebird from your graveyard to the battlefield.
-autograveyard=@movedto(land|mybattlefield):Pay({4}{R}{R}) name(recover Firebird) moveto(mybattlefield)
+autograveyard=_LANDFALL_Pay({4}{R}{R}) name(recover Firebird) moveto(mybattlefield)
 mana={2}{R}{R}
 type=Creature
 subtype=Phoenix
@@ -2147,7 +2147,7 @@ type=Land
 [/card]
 [card]
 name=Akoum Stonewaker
-auto=@movedTo(land|myBattlefield):pay({2}{R}) token(Elemental,Creature Elemental,3/1,trample,haste,unearth,red) controller
+auto=_LANDFALL_pay({2}{R}) token(Elemental,Creature Elemental,3/1,trample,haste,unearth,red) controller
 text=Landfall -- Whenever a land enters the battlefield under your control, you may pay {2}{R}. If you do, put a 3/1 red Elemental creature token with trample and haste onto the battlefield. Exile that token at the beginning of the next end step.
 mana={1}{R}
 type=Creature
@@ -2167,7 +2167,7 @@ toughness=1
 [/card]
 [card]
 name=Akroan Conscriptor
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):name(gain control of target creature until end of turn) target(other creature|battlefield) moveTo(mybattlefield) and!( transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot )!
+auto=_HEROIC_name(gain control of target creature until end of turn) target(other creature|battlefield) moveTo(mybattlefield) and!( transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot )!
 text=Heroic -- Whenever you cast a spell that targets Akroan Conscriptor, gain control of another target creature until end of turn. Untap that creature. It gains haste until end of turn.
 mana={4}{R}
 type=Creature
@@ -2177,7 +2177,7 @@ toughness=2
 [/card]
 [card]
 name=Akroan Crusader
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):token(Soldier,Creature Soldier,1/1,red,haste) controller
+auto=_HEROIC_token(Soldier,Creature Soldier,1/1,red,haste) controller
 text=Heroic -- Whenever you cast a spell that targets Akroan Crusader, put a 1/1 red Soldier creature token with haste onto the battlefield.
 mana={R}
 type=Creature
@@ -2219,8 +2219,8 @@ toughness=1
 [/card]
 [card]
 name=Akroan Line Breaker
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):2/0 ueot
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):intimidate ueot
+auto=_HEROIC_2/0 ueot
+auto=_HEROIC_intimidate ueot
 text=Heroic -- Whenever you cast a spell that targets Akroan Line Breaker, Akroan Line Breaker gets +2/+0 and gains intimidate until end of turn.
 mana={2}{R}
 type=Creature
@@ -2263,7 +2263,7 @@ toughness=2
 [card]
 name=Akroan Skyguard
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Flying. -- Heroic -- Whenever you cast a spell that targets Akroan Skyguard, put a +1/+1 counter on Akroan Skyguard.
 mana={1}{W}
 type=Creature
@@ -3355,8 +3355,8 @@ toughness=2
 [card]
 name=Anax and Cymede
 abilities=first strike,vigilance
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):all(creature|myBattlefield) 1/1 ueot
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):all(creature|mybattlefield) trample ueot
+auto=_HEROIC_all(creature|myBattlefield) 1/1 ueot
+auto=_HEROIC_all(creature|mybattlefield) trample ueot
 text=Heroic - Whenever you cast a spell that targets Anax and Cymede, creatures you control get +1/+1 and gain trample until end of turn. 
 mana={1}{R}{W}
 type=Legendary Creature
@@ -4191,7 +4191,7 @@ type=Sorcery
 [card]
 name=Ankh of Mishra
 auto=@movedTo(land|opponentBattlefield):damage:2 opponent
-auto=@movedTo(land|myBattlefield):damage:2 controller
+auto=_LANDFALL_damage:2 controller
 text=Whenever a land enters the battlefield, Ankh of Mishra deals 2 damage to that land's controller.
 mana={2}
 type=Artifact
@@ -4301,7 +4301,7 @@ type=Enchantment
 [/card]
 [card]
 name=Anthousa, Setessan Hero
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):target(<upto:3>land) transforms((Creature Warrior,setpower=2,settoughness=2)) ueot
+auto=_HEROIC_target(<upto:3>land) transforms((Creature Warrior,setpower=2,settoughness=2)) ueot
 text=Heroic - Whenever you cast a spell that targets Anthoussa, Setessan Hero, up to three target lands you control each become 2/2 Warrior creatures until end of turn. They're still lands. 
 mana={3}{G}{G}
 type=Legendary Creature
@@ -5314,7 +5314,7 @@ toughness=2
 [/card]
 [card]
 name=Architect of the Untamed
-auto=@movedTo(land|myBattlefield):alterenergy:1 controller
+auto=_LANDFALL_alterenergy:1 controller
 auto={e:8}:create(Beast:Artifact Creature Beast:6/6)
 text=Whenever a land enters the battlefield under your control, you get {E} (an energy counter). -- Pay {E}{E}{E}{E}{E}{E}{E}{E}: Create a 6/6 colorless Beast artifact creature token.
 mana={2}{G}
@@ -5543,7 +5543,7 @@ toughness=2
 [/card]
 [card]
 name=Arena Athlete
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):cantblock target(creature|opponentbattlefield) ueot
+auto=_HEROIC_cantblock target(creature|opponentbattlefield) ueot
 text=Heroic - Whenever you cast a spell that targets Arena Athlete, target creature an opponent controls can't block this turn. 
 mana={1}{R}
 type=Creature
@@ -6386,7 +6386,7 @@ type=Sorcery
 [/card]
 [card]
 name=Ashiok's Adept
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):ability$!name(discard) reject notatarget(*|myhand)!$ opponent
+auto=_HEROIC_ability$!name(discard) reject notatarget(*|myhand)!$ opponent
 text=Heroic -- Whenever you cast a spell that targets Ashiok's Adept, each opponent discards a card.
 mana={2}{B}
 type=Creature
@@ -7819,7 +7819,7 @@ toughness=1
 [card]
 name=Avenger of Zendikar
 auto=foreach(land|myBattlefield) token(Plant,creature plant, 0/1,green)
-auto=@movedTo(land|myBattlefield):may counter(1/1,1) all(plant|myBattlefield)
+auto=_LANDFALL_may counter(1/1,1) all(plant|myBattlefield)
 text=When Avenger of Zendikar enters the battlefield, put a 0/1 green Plant creature token onto the battlefield for each land you control. -- Landfall - Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control.
 mana={5}{G}{G}
 type=Creature
@@ -8640,8 +8640,8 @@ toughness=1
 [/card]
 [card]
 name=Baloth Woodcrasher
-auto=@movedTo(land|myBattlefield):4/4 ueot
-auto=@movedTo(land|myBattlefield):trample ueot
+auto=_LANDFALL_4/4 ueot
+auto=_LANDFALL_trample ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Baloth Woodcrasher gets +4/+4 and gains trample until end of turn.
 mana={4}{G}{G}
 type=Creature
@@ -9860,7 +9860,7 @@ toughness=2
 [card]
 name=Battlewise Hoplite
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) && scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+auto=_HEROIC_counter(1/1,1) && scry:1 scrycore delayed dontshow donothing scrycoreend scryend
 text=Heroic -- Whenever you cast a spell that targets Battlewise Hoplite, put a +1/+1 counter on Battlewise Hoplite, then scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
 mana={W}{U}
 type=Creature
@@ -10299,7 +10299,7 @@ toughness=2
 [/card]
 [card]
 name=Belligerent Whiptail
-auto=@movedTo(land|myBattlefield):first strike ueot
+auto=_LANDFALL_first strike ueot
 text=Landfall -- Whenever a land enters the battlefield under your control, Belligerent Whiptail gains first strike until end of turn.
 mana={3}{R}
 type=Creature
@@ -12292,7 +12292,7 @@ toughness=2
 [/card]
 [card]
 name=Bloodcrazed Hoplite
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 auto=@counteradded(1/1) from(this):counter(1/1,-1) target(creature|opponentbattlefield)
 text=Heroic -- Whenever you cast a spell that targets Bloodcrazed Hoplite, put a +1/+1 counter on it. -- Whenever a +1/+1 counter is placed on Bloodcrazed Hoplite, remove a +1/+1 counter from target creature an opponent controls.
 mana={1}{B}
@@ -12450,7 +12450,7 @@ toughness=3
 name=Bloodghast
 abilities=cantblock
 auto=this(opponentlife < 11) haste
-autograveyard=@movedTo(land|myBattlefield):may moveTo(mybattlefield)
+autograveyard=_LANDFALL_may moveTo(mybattlefield)
 text=Bloodghast can't block. -- Bloodghast has haste as long as an opponent has 10 or less life. -- Landfall - Whenever a land enters the battlefield under your control, you may return Bloodghast from your graveyard to the battlefield.
 mana={B}{B}
 type=Creature
@@ -16338,7 +16338,7 @@ toughness=5
 [card]
 name=Calcite Snapper
 abilities=shroud
-auto=@movedTo(land|myBattlefield):may swap ueot
+auto=_LANDFALL_may swap ueot
 text=Shroud (This creature can't be the target of spells or abilities.) -- Landfall - Whenever a land enters the battlefield under your control, you may switch Calcite Snapper's power and toughness until end of turn.
 mana={1}{U}{U}
 type=Creature
@@ -17672,7 +17672,7 @@ toughness=1
 [/card]
 [card]
 name=Caustic Crawler
-auto=@movedTo(land|myBattlefield):may -1/-1 target(creature) ueot
+auto=_LANDFALL_may -1/-1 target(creature) ueot
 text=Landfall - Whenever a land enters the battlefield under your control, you may have target creature get -1/-1 until end of turn.
 mana={3}{B}{B}
 type=Creature
@@ -18059,7 +18059,7 @@ toughness=2
 [/card]
 [card]
 name=Centaur Battlemaster
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,3)
+auto=_HEROIC_counter(1/1,3)
 text=Heroic - Whenever you cast a spell that targets Centaur Battlemaster, put three +1/+1 counters on Centaur Battlemaster. 
 mana={3}{G}{G}
 type=Creature
@@ -19538,7 +19538,7 @@ type=Instant
 name=Chorus of the Tides
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) && name(Scry 1) scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+auto=_HEROIC_counter(1/1,1) && name(Scry 1) scry:1 scrycore delayed dontshow donothing scrycoreend scryend
 text=Flying -- Heroic -- Whenever you cast a spell that targets Chorus of the Tides, scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
 mana={3}{U}
 type=Creature
@@ -22585,7 +22585,7 @@ toughness=1
 [card]
 name=Core Prowler
 abilities=infect
-auto=@movedto(this|mygraveyard) from(this|mybattlefield):_PROLIFERATE_
+auto=_DIES__PROLIFERATE_
 text=Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) -- When Core Prowler dies, proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.)
 mana={4}
 type=Artifact Creature
@@ -22831,7 +22831,7 @@ type=Sorcery
 [/card]
 [card]
 name=Cosi's Ravager
-auto=@movedTo(land|myBattlefield):may damage:1 target(player)
+auto=_LANDFALL_may damage:1 target(player)
 text=Landfall - Whenever a land enters the battlefield under your control, you may have Cosi's Ravager deal 1 damage to target player.
 mana={3}{R}
 type=Creature
@@ -22997,7 +22997,7 @@ type=Artifact
 [card]
 name=Courser of Kruphix
 abilities=showfromtoplibrary,canplaylandlibrarytop
-auto=@movedTo(land|mybattlefield):life:1
+auto=_LANDFALL_life:1
 text=Play with the top card of your library revealed. -- You may play the top card of your library if it's a land card. -- Whenever a land enters the battlefield under your control, you gain 1 life.
 mana={1}{G}{G}
 type=Enchantment Creature
@@ -26459,7 +26459,7 @@ toughness=5
 [card]
 name=Dawnbringer Charioteers
 abilities=flying,lifelink
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Flying, lifelink -- Heroic -- Whenever you cast a spell that targets Dawnbringer Charioteers, put a +1/+1 counter on Dawnbringer Charioteers.
 mana={2}{W}{W}
 type=Creature
@@ -34703,7 +34703,7 @@ toughness=3
 [/card]
 [card]
 name=Elite Skirmisher
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):may tap target(creature)
+auto=_HEROIC_may tap target(creature)
 text=Heroic -- Whenever you cast a spell that targets Elite Skirmisher, you may tap target creature.
 mana={2}{W}
 type=Creature
@@ -35363,7 +35363,7 @@ subtype=Aura
 name=Embodiment of Fury
 abilities=trample
 auto=lord(creature[land]|mybattlefield) trample
-auto=@movedTo(land|mybattlefield):target(land|mybattlefield) transforms((Elemental Creature,setpower=3,settoughness=3,newability[haste])) ueot
+auto=_LANDFALL_target(land|mybattlefield) transforms((Elemental Creature,setpower=3,settoughness=3,newability[haste])) ueot
 text=Trample -- Land creatures you control have trample. -- Landfall -- Whenever a land enters the battlefield under your control, you may have target land you control become a 3/3 Elemental creature with haste until end of turn. It's still a land.
 mana={3}{R}
 type=Creature
@@ -35375,7 +35375,7 @@ toughness=3
 name=Embodiment of Insight
 abilities=vigilance
 auto=lord(creature[land]|mybattlefield) vigilance
-auto=@movedTo(land|mybattlefield):target(land|mybattlefield) transforms((Elemental Creature,setpower=3,settoughness=3,newability[haste])) ueot
+auto=_LANDFALL_target(land|mybattlefield) transforms((Elemental Creature,setpower=3,settoughness=3,newability[haste])) ueot
 text=Vigilance -- Land creatures you control have vigilance. -- Landfall -- Whenever a land enters the battlefield under your control, you may have target land you control become a 3/3 Elemental creature with haste until end of turn. It's still a land.
 mana={4}{G}
 type=Creature
@@ -35469,7 +35469,7 @@ type=Instant
 [card]
 name=Emeria Angel
 abilities=flying
-auto=@movedTo(land|myBattlefield):may token(Bird,creature bird, 1/1,flying,white)
+auto=_LANDFALL_may token(Bird,creature bird, 1/1,flying,white)
 text=Flying -- Landfall - Whenever a land enters the battlefield under your control, you may put a 1/1 white Bird creature token with flying onto the battlefield.
 mana={2}{W}{W}
 type=Creature
@@ -37173,7 +37173,7 @@ subtype=Aura
 name=Eternity Vessel
 text=Eternity Vessel enters the battlefield with X charge counters on it, where X is your life total. Landfall -- Whenever a land enters the battlefield under your control, you may have your life total become the number of charge counters on Eternity Vessel.
 auto=counter(0/0,lifetotal,Charge)
-auto=@movedto(land|myBattlefield):may lifeset:counter{0%0.1.Charge} controller
+auto=_LANDFALL_may lifeset:counter{0%0.1.Charge} controller
 auto=Eternity Vessel enters the battlefield with X charge counters on it, where X is your life total. -- Landfall - Whenever a land enters the battlefield under your control, you may have your life total become the number of charge counters on Eternity Vessel.
 mana={6}
 type=Artifact
@@ -38260,7 +38260,7 @@ type=Enchantment
 [card]
 name=Fabled Hero
 abilities=double strike
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Double strike. -- Heroic - Whenever you cast a spell that targets Fabled Hero, put a +1/+1 counter on Fabled Hero. 
 mana={1}{W}{W}
 type=Creature
@@ -39339,7 +39339,7 @@ type=Enchantment
 [/card]
 [card]
 name=Favored Hoplite
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) && preventAllDamage to(this) ueot
+auto=_HEROIC_counter(1/1,1) && preventAllDamage to(this) ueot
 text=Heroic - Whenever you cast a spell that targets Favored Hoplite, put a +1/+1 counter on Favored Hoplite and prevent all damage that would be dealt to it this turn.
 mana={W}
 type=Creature
@@ -41534,7 +41534,7 @@ toughness=2
 [/card]
 [card]
 name=Fledgling Griffin
-auto=@movedTo(land|myBattlefield):flying ueot
+auto=_LANDFALL_flying ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Fledgling Griffin gains flying until end of turn.
 mana={1}{W}
 type=Creature
@@ -42969,7 +42969,7 @@ name=Forsaken Wastes
 abilities=nolifegain,nolifegainopponent
 auto=@each my upkeep:life:-1 controller
 auto=@each opponent upkeep:life:-1 opponent
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):life:-5 controller
+auto=_HEROIC_life:-5 controller
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|opponentcastingzone):life:-5 opponent
 auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Players can't gain life. -- At the beginning of each player's upkeep, that player loses 1 life. -- Whenever Forsaken Wastes becomes the target of a spell, that spell's controller loses 5 life.
@@ -45422,7 +45422,7 @@ type=Instant
 [/card]
 [card]
 name=Geyser Glider
-auto=@movedTo(land|myBattlefield):flying ueot
+auto=_LANDFALL_flying ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Geyser Glider gains flying until end of turn.
 mana={3}{R}{R}
 type=Creature
@@ -45433,7 +45433,7 @@ toughness=4
 [card]
 name=Geyserfield Stalker
 abilities=menace
-auto=@movedto(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Menace (This creature can't be blocked except by two or more creatures.) -- Landfall -- Whenever a land enters the battlefield under your control, Geyserfield Stalker gets +2/+2 until end of turn.
 mana={4}{B}
 type=Creature
@@ -49794,7 +49794,7 @@ toughness=1
 [/card]
 [card]
 name=Grazing Gladehart
-auto=@movedTo(land|myBattlefield):may life:2
+auto=_LANDFALL_may life:2
 text=Landfall - Whenever a land enters the battlefield under your control, you may gain 2 life.
 mana={2}{G}
 type=Creature
@@ -50884,7 +50884,7 @@ type=Land
 [card]
 name=Grove Rumbler
 abilities=trample
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Trample -- Landfall -- Whenever a land enters the battlefield under your control, Grove Rumbler gets +2/+2 until end of turn.
 mana={2}{R}{G}
 type=Creature
@@ -51765,7 +51765,7 @@ toughness=2
 [card]
 name=Hagra Crocodile
 abilities=cantblock
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Hagra Crocodile can't block. -- Landfall - Whenever a land enters the battlefield under your control, Hagra Crocodile gets +2/+2 until end of turn.
 mana={3}{B}
 type=Creature
@@ -53464,7 +53464,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Hedron Crab
-auto=@movedTo(land|myBattlefield):deplete:3 target(player)
+auto=_LANDFALL_deplete:3 target(player)
 text=Landfall - Whenever a land enters the battlefield under your control, target player puts the top three cards of his or her library into his or her graveyard.
 mana={U}
 type=Creature
@@ -53493,7 +53493,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Hedron Rover
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Hedron Rover gets +2/+2 until end of turn.
 mana={4}
 type=Artifact Creature
@@ -53503,7 +53503,7 @@ toughness=2
 [/card]
 [card]
 name=Hedron Scrabbler
-auto=@movedTo(land|myBattlefield):1/1 ueot
+auto=_LANDFALL_1/1 ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Hedron Scrabbler gets +1/+1 until end of turn.
 mana={2}
 type=Artifact Creature
@@ -54163,7 +54163,7 @@ toughness=3
 name=Hero of Iroas
 auto=lord(aura|mycastingzone) altercost(colorless,-1)
 auto=modbenchant(colorless:-1) controller
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Aura spells you cast cost 1 less to cast. -- Heroic -- Whenever you cast a spell that targets Hero of Iroas, put a +1/+1 counter on Hero of Iroas.
 mana={1}{W}
 type=Creature
@@ -58979,7 +58979,7 @@ type=Sorcery
 [/card]
 [card]
 name=Ior Ruin Expedition
-auto=@movedTo(land|myBattlefield):may counter(0/0,1,Quest)
+auto=_LANDFALL_may counter(0/0,1,Quest)
 auto={C(0/0,-3,Quest)}{S}:draw:2
 text=Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Ior Ruin Expedition. -- Remove three quest counters from Ior Ruin Expedition and sacrifice it: Draw two cards.
 mana={1}{U}
@@ -59746,7 +59746,7 @@ toughness=8
 [card]
 name=Jaddi Offshoot
 abilities=defender
-auto=@movedTo(land|myBattlefield):life:1 controller
+auto=_LANDFALL_life:1 controller
 text=Defender -- Landfall -- Whenever a land enters the battlefield under your control, you gain 1 life.
 mana={G}
 type=Creature
@@ -62666,7 +62666,7 @@ type=Artifact
 [/card]
 [card]
 name=Khalni Heart Expedition
-auto=@movedto(land|myBattlefield):counter(0/0,1,Quest)
+auto=_LANDFALL_counter(0/0,1,Quest)
 aicode=activate moveTo(myBattlefield) and!(tap(noevent))! target(<upto:2>land[basic]|myLibrary)
 auto={C(0/0,-3,Quest)}{S}:name(search card) reveal:plibrarycount optionone name(choose card) target(<upto:2>land[basic]|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(ownerlibrary) and!(moveTo(myBattlefield) and!(tap(noevent))!)! afterrevealedend revealend
 text=Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Khalni Heart Expedition. -- Remove three quest counters from Khalni Heart Expedition and sacrifice it: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library.
@@ -65158,7 +65158,7 @@ toughness=2
 [/card]
 [card]
 name=Labyrinth Champion
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):damage:2 target(creature,player)
+auto=_HEROIC_damage:2 target(creature,player)
 text=Heroic - Whenever you cast a spell that targets Labyrinth Champion, Labyrinth Champion deals 2 damage to target creature or player. 
 mana={3}{R}
 type=Creature
@@ -65293,7 +65293,7 @@ toughness=2
 [/card]
 [card]
 name=Lagonna-Band Trailblazer
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Heroic -- Whenever you cast a spell that targets  Lagonna-Band Trailblazer, put a +1/+1 counter on Lagonna-Band Trailblazer.
 mana={W}
 type=Creature
@@ -66373,7 +66373,7 @@ toughness=1
 [/card]
 [card]
 name=Leonin Iconoclast
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):destroy target(Creature[enchantment]|opponentbattlefield)
+auto=_HEROIC_destroy target(Creature[enchantment]|opponentbattlefield)
 text=Heroic -- Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls.
 mana={3}{W}
 type=Creature
@@ -68433,7 +68433,7 @@ type=Artifact
 [/card]
 [card]
 name=Lotus Cobra
-auto=@movedTo(land|mybattlefield):may name(choose mana) ability$! choice add{G} _ choice add{R} _ choice add{U} _ choice add{B} _ choice add{W} !$ controller
+auto=_LANDFALL_may name(choose mana) ability$! choice add{G} _ choice add{R} _ choice add{U} _ choice add{B} _ choice add{W} !$ controller
 text=Landfall - Whenever a land enters the battlefield under your control, you may add one mana of any color to your mana pool.
 mana={1}{G}
 type=Creature
@@ -70086,7 +70086,7 @@ toughness=3
 [card]
 name=Makindi Sliderunner
 abilities=trample
-auto=@movedTo(land|myBattlefield):1/1 ueot
+auto=_LANDFALL_1/1 ueot
 text=Trample -- Landfall -- Whenever a land enters the battlefield under your control, Makindi Sliderunner gets +1/+1 until end of turn.
 mana={1}{R}
 type=Creature
@@ -72390,7 +72390,7 @@ toughness=3
 [card]
 name=Meletis Astronomer
 aicode=activate target(enchantment[zpos<=3]|mylibrary) moveto(myhand)
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):name(look) reveal:3 optionone name(put in hand) notatarget(<1>*[enchantment]|reveal) moveto(ownerhand) optiononeend optiontwo notatarget(<3>*|reveal) bottomoflibrary optiontwoend revealend
+auto=_HEROIC_name(look) reveal:3 optionone name(put in hand) notatarget(<1>*[enchantment]|reveal) moveto(ownerhand) optiononeend optiontwo notatarget(<3>*|reveal) bottomoflibrary optiontwoend revealend
 text=Heroic -- Whenever you cast a spell that targets Meletis Astronomer, look at the top three cards of your library. You may reveal an enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 mana={1}{U}
 type=Creature
@@ -77116,7 +77116,7 @@ toughness=2
 [/card]
 [card]
 name=Murasa Ranger
-auto=@movedTo(land|myBattlefield):pay({3}{G}) counter(1/1,2)
+auto=_LANDFALL_pay({3}{G}) counter(1/1,2)
 text=Landfall -- Whenever a land enters the battlefield under your control, you may pay {3}{G}. If you do, put two +1/+1 counters on Murasa Ranger.
 mana={3}{G}
 type=Creature
@@ -81275,7 +81275,7 @@ toughness=4
 [/card]
 [card]
 name=Ob Nixilis, the Fallen
-auto=@movedTo(land|myBattlefield):may life:-3 target(player) && counter(1/1,3) all(this)
+auto=_LANDFALL_may life:-3 target(player) && counter(1/1,3) all(this)
 text=Landfall - Whenever a land enters the battlefield under your control, you may have target player lose 3 life. If you do, put three +1/+1 counters on Ob Nixilis, the Fallen.
 mana={3}{B}{B}
 type=Legendary Creature
@@ -82046,7 +82046,7 @@ toughness=3
 [/card]
 [card]
 name=Omnath, Locus of Rage
-auto=@movedTo(land|myBattlefield):token(Elemental,Creature Elemental,5/5,red,green) controller
+auto=_LANDFALL_token(Elemental,Creature Elemental,5/5,red,green) controller
 auto=@movedto(Elemental|graveyard) from(mybattlefield):damage:3 target(creature,player)
 text=Landfall -- Whenever a land enters the battlefield under your control, put a 5/5 red and green Elemental creature token onto the battlefield. -- Whenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to target creature or player.
 mana={3}{R}{R}{G}{G}
@@ -82118,7 +82118,7 @@ toughness=4
 [card]
 name=Ondu Greathorn
 abilities=first strike
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=First strike -- Landfall -- Whenever a land enters the battlefield under your control, Ondu Greathorn gets +2/+2 until end of turn.
 mana={3}{W}
 type=Creature
@@ -85560,7 +85560,7 @@ toughness=4
 [/card]
 [card]
 name=Phalanx Leader
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) all(creature|mybattlefield)
+auto=_HEROIC_counter(1/1,1) all(creature|mybattlefield)
 text=Heroic - Whenever you cast a spell that targets Phalanx Leader, put a+1/+1 counter on each creature you control. 
 mana={W}{W}
 type=Creature
@@ -85931,7 +85931,7 @@ toughness=5
 [/card]
 [card]
 name=Pheres-Band Thunderhoof
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,2)
+auto=_HEROIC_counter(1/1,2)
 text=Heroic -- Whenever you cast a spell that targets Pheres-Band Thunderhoof, put two +1/+1 counters on Pheres-Band Thunderhoof.
 mana={4}{G}
 type=Creature
@@ -87271,7 +87271,7 @@ toughness=6
 [card]
 name=Plated Geopede
 abilities=first strike
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=First strike -- Landfall - Whenever a land enters the battlefield under your control, Plated Geopede gets +2/+2 until end of turn.
 mana={1}{R}
 type=Creature
@@ -88522,7 +88522,7 @@ toughness=1
 name=Primeval Bounty
 auto=@movedTo(creature|mystack):token(Beast,Creature Beast,3/3,green) controller
 auto=@movedTo(*[-creature]|mystack):counter(1/1,3) target(creature|mybattlefield)
-auto=@movedTo(land|myBattlefield):life:3 controller
+auto=_LANDFALL_life:3 controller
 text=Enchantment. -- Whenever you cast a creature spell, put a 3/3 green Beast creature token onto the battlefield. -- Whenever you cast a noncreature spell, put three +1/+1 counters on target creature you control. -- Whenever a land enters the battlefield under your control, you gain 3 life. 
 mana={5}{G}
 type=Enchantment
@@ -91656,7 +91656,7 @@ toughness=3
 [card]
 name=Rampaging Baloths
 abilities=trample
-auto=@movedTo(land|myBattlefield):may token(Beast,Creature Beast,4/4,green)
+auto=_LANDFALL_may token(Beast,Creature Beast,4/4,green)
 text=Trample -- Landfall - Whenever a land enters the battlefield under your control, you may put a 4/4 green Beast creature token onto the battlefield.
 mana={4}{G}{G}
 type=Creature
@@ -94503,35 +94503,35 @@ type=Instant
 [card]
 name=Retreat to Coralhelm
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@movedTo(land|myBattlefield):name(Choose one) transforms((,newability[choice name(Scry 1) scry:1 scrycore delayed dontshow donothing scrycoreend scryend],newability[choice name(untap creature) target(creature) untap],newability[choice name(tap creature) target(creature) tap])) ueot
+auto=_LANDFALL_name(Choose one) transforms((,newability[choice name(Scry 1) scry:1 scrycore delayed dontshow donothing scrycoreend scryend],newability[choice name(untap creature) target(creature) untap],newability[choice name(tap creature) target(creature) tap])) ueot
 text=Landfall -- Whenever a land enters the battlefield under your control, choose one -- -- You may tap or untap target creature. -- Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={2}{U}
 type=Enchantment
 [/card]
 [card]
 name=Retreat to Emeria
-auto=@movedTo(land|myBattlefield):name(Choose one) transforms((,newability[choice name(Kor Token) create(Kor Ally:Creature Kor Ally:1/1:white) controller],newability[choice name(1/1 ueot) all(creature|mybattlefield) 1/1 ueot])) oneshot
+auto=_LANDFALL_name(Choose one) transforms((,newability[choice name(Kor Token) create(Kor Ally:Creature Kor Ally:1/1:white) controller],newability[choice name(1/1 ueot) all(creature|mybattlefield) 1/1 ueot])) oneshot
 text=Landfall -- Whenever a land enters the battlefield under your control, choose one -- -- -- Put a 1/1 white Kor Ally creature token onto the battlefield. -- -- Creatures you control get +1/+1 until end of turn.
 mana={3}{W}
 type=Enchantment
 [/card]
 [card]
 name=Retreat to Hagra
-auto=@movedTo(land|myBattlefield):name(Choose one) transforms((,newability[choice name(Creature gains 1/0 and deachtouch) 1/0 && deathtouch target(creature)],newability[choice life:-1 opponent && life:1 controller])) oneshot
+auto=_LANDFALL_name(Choose one) transforms((,newability[choice name(Creature gains 1/0 and deachtouch) 1/0 && deathtouch target(creature)],newability[choice life:-1 opponent && life:1 controller])) oneshot
 text=Landfall -- Whenever a land enters the battlefield under your control, choose one -- -- Target creature gets +1/+0 and gains deathtouch until end of turn. -- Each opponent loses 1 life and you gain 1 life.
 mana={2}{B}
 type=Enchantment
 [/card]
 [card]
 name=Retreat to Kazandu
-auto=@movedTo(land|myBattlefield):transforms((,newability[if type(creature|battlefield)~morethan~0 then choice name(Put Counter) name(Put Counter) target(creature) counter(1/1)],newability[choice name(gain 2 life) life:2 controller])) oneshot
+auto=_LANDFALL_transforms((,newability[if type(creature|battlefield)~morethan~0 then choice name(Put Counter) name(Put Counter) target(creature) counter(1/1)],newability[choice name(gain 2 life) life:2 controller])) oneshot
 text=Landfall -- Whenever a land enters the battlefield under your control, choose one -- -- -- Put a +1/+1 counter on target creature. -- -- You gain 2 life.
 mana={2}{G}
 type=Enchantment
 [/card]
 [card]
 name=Retreat to Valakut
-auto=@movedTo(land|myBattlefield):if type(creature|battlefield)~morethan~0 then transforms((,newability[choice name(2/0) 2/0 target(creature) ueot],newability[choice name(cant block) cantblock target(creature) ueot])) oneshot
+auto=_LANDFALL_if type(creature|battlefield)~morethan~0 then transforms((,newability[choice name(2/0) 2/0 target(creature) ueot],newability[choice name(cant block) cantblock target(creature) ueot])) oneshot
 text=Landfall - Whenever a land enters the battlefield under your control, choose one - Target creature gets +2/+0 until end of turn. - Target creature can't block this turn.
 mana={2}{R}
 type=Enchantment
@@ -96326,7 +96326,7 @@ toughness=5
 [card]
 name=Roil Elemental
 abilities=flying
-auto=@movedTo(land|myBattlefield):may steal target(creature)
+auto=_LANDFALL_may steal target(creature)
 text=Flying -- Landfall -- Whenever a land enters the battlefield under your control, you may gain control of target creature for as long as you control Roil Elemental.
 mana={3}{U}{U}{U}
 type=Creature
@@ -99215,7 +99215,7 @@ toughness=1
 [/card]
 [card]
 name=Satyr Hoplite
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Heroic -- Whenever you cast a spell that targets Satyr Hoplite, put a +1/+1 counter on Satyr Hoplite.
 mana={R}
 type=Creature
@@ -100637,7 +100637,7 @@ toughness=1
 [card]
 name=Scrib Nibblers
 auto={T}:target(player) moveto(exile) and!( if cantargetcard(*[land]|*) then life:1 controller )! all(*[zpos=1]|targetedpersonslibrary)
-auto=@movedTo(land|mybattlefield):untap all(this)
+auto=_LANDFALL_untap all(this)
 text={T}: Exile the top card of target player's library. If it's a land card, you gain 1 life. -- Landfall -- Whenever a land enters the battlefield under your control, you may untap Scrib Nibblers.
 mana={2}{B}
 type=Creature
@@ -100861,7 +100861,7 @@ toughness=1
 [/card]
 [card]
 name=Scythe Leopard
-auto=@movedTo(land|myBattlefield):1/1 ueot
+auto=_LANDFALL_1/1 ueot
 text=Landfall -- Whenever a land enters the battlefield under your control, Scythe Leopard gets +1/+1 until end of turn.
 mana={G}
 type=Creature
@@ -101573,7 +101573,7 @@ type=Instant
 [/card]
 [card]
 name=Seed the Land
-auto=@movedto(land|myBattlefield):token(Snake,Creature Snake,1/1,green)
+auto=_LANDFALL_token(Snake,Creature Snake,1/1,green)
 auto=@movedto(land|opponentBattlefield):token(Snake,Creature Snake,1/1,green) opponent
 text=Whenever a land enters the battlefield, its controller puts a 1/1 green Snake creature token onto the battlefield.
 mana={2}{G}{G}
@@ -101702,7 +101702,7 @@ type=Artifact
 [/card]
 [card]
 name=Seer's Sundial
-auto=@movedTo(land|mybattlefield):pay({2}) draw:1
+auto=_LANDFALL_pay({2}) draw:1
 text=Landfall - Whenever a land enters the battlefield under your control, you may pay {2}. If you do, draw a card.
 mana={4}
 type=Artifact
@@ -102843,7 +102843,7 @@ type=Sorcery
 [/card]
 [card]
 name=Setessan Battle Priest
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):life:2 controller
+auto=_HEROIC_life:2 controller
 text=Heroic - Whenever you cast a spell that targets Setessan Battle Priest, you gain 2 life. 
 mana={1}{W}
 type=Creature
@@ -102864,7 +102864,7 @@ toughness=2
 [/card]
 [card]
 name=Setessan Oathsworn
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,2)
+auto=_HEROIC_counter(1/1,2)
 text=Heroic -- Whenever you cast a spell that targets Setessan Oathsworn, put two +1/+1 counters on Setessan Oathsworn.
 mana={1}{G}{G}
 type=Creature
@@ -104284,7 +104284,7 @@ toughness=3
 [card]
 name=Shoal Serpent
 abilities=defender
-auto=@movedTo(land|myBattlefield):name(loses defender) -defender all(this)
+auto=_LANDFALL_name(loses defender) -defender all(this)
 text=Defender -- Landfall - Whenever a land enters the battlefield under your control, Shoal Serpent loses defender until end of turn.
 mana={5}{U}
 type=Creature
@@ -108513,7 +108513,7 @@ type=Instant
 [/card]
 [card]
 name=Snapping Creeper
-auto=@movedTo(land|myBattlefield):vigilance ueot
+auto=_LANDFALL_vigilance ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Snapping Creeper gains vigilance until end of turn.
 mana={2}{G}
 type=Creature
@@ -108533,7 +108533,7 @@ toughness=2
 [/card]
 [card]
 name=Snapping Gnarlid
-auto=@movedTo(land|myBattlefield):1/1 ueot
+auto=_LANDFALL_1/1 ueot
 text=Landfall -- Whenever a land enters the battlefield under your control, Snapping Gnarlid gets +1/+1 until end of turn.
 mana={1}{G}
 type=Creature
@@ -109707,7 +109707,7 @@ type=Instant
 [/card]
 [card]
 name=Soul Stair Expedition
-auto=@movedTo(land|myBattlefield):may counter(0/0,1,Quest)
+auto=_LANDFALL_may counter(0/0,1,Quest)
 auto={C(0/0,-3,Quest)}{S}:target(<upto:2>other creature|mygraveyard) moveTo(myhand)
 text=Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Soul Stair Expedition. -- Remove three quest counters from Soul Stair Expedition and sacrifice it: Return up to two target creature cards from your graveyard to your hand.
 mana={B}
@@ -111933,7 +111933,7 @@ toughness=5
 [/card]
 [card]
 name=Sporemound
-auto=@movedTo(land|myBattlefield):token(Saproling,Creature Saproling, 1/1,green)
+auto=_LANDFALL_token(Saproling,Creature Saproling, 1/1,green)
 text=Whenever a land enters the battlefield under your control, put a 1/1 green Saproling creature token onto the battlefield.
 mana={3}{G}{G}
 type=Creature
@@ -112886,7 +112886,7 @@ toughness=4
 [/card]
 [card]
 name=Staunch-Hearted Warrior
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,2)
+auto=_HEROIC_counter(1/1,2)
 text=Heroic - Whenever you cast a spell that targets Staunch-Hearted Warrior, put two +1/+1 counters on Staunch-Hearted Warrior. 
 mana={3}{G}
 type=Creature
@@ -113245,7 +113245,7 @@ toughness=4
 [/card]
 [card]
 name=Steppe Lynx
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Steppe Lynx gets +2/+2 until end of turn.
 mana={W}
 type=Creature
@@ -113819,7 +113819,7 @@ toughness=4
 [/card]
 [card]
 name=Stone-Seeder Hierophant
-auto=@movedto(land|myBattlefield):untap
+auto=_LANDFALL_untap
 auto={T}:untap target(land)
 text=Whenever a land enters the battlefield under your control, untap Stone-Seeder Hierophant. -- {T}: Untap target land.
 mana={2}{G}{G}
@@ -115782,7 +115782,7 @@ toughness=3
 [/card]
 [card]
 name=Sunspring Expedition
-auto=@movedTo(land|myBattlefield):may counter(0/0,1,Quest)
+auto=_LANDFALL_may counter(0/0,1,Quest)
 auto={C(0/0,-3,Quest)}{S}:life:8
 text=Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Sunspring Expedition. -- Remove three quest counters from Sunspring Expedition and sacrifice it: You gain 8 life.
 mana={W}
@@ -116093,7 +116093,7 @@ toughness=3
 [/card]
 [card]
 name=Surrakar Marauder
-auto=@movedTo(land|myBattlefield):intimidate ueot
+auto=_LANDFALL_intimidate ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Surrakar Marauder gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
 mana={1}{B}
 type=Creature
@@ -118188,7 +118188,7 @@ toughness=7
 [card]
 name=Tectonic Instability
 auto=@movedTo(land|opponentBattlefield):tap all(land|opponentBattlefield)
-auto=@movedTo(land|myBattlefield):tap all(land|myBattlefield)
+auto=_LANDFALL_tap all(land|myBattlefield)
 text=Whenever a land enters the battlefield, tap all lands its controller controls.
 mana={2}{R}
 type=Enchantment
@@ -119188,7 +119188,7 @@ type=Instant
 [/card]
 [card]
 name=Territorial Baloth
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Landfall - Whenever a land enters the battlefield under your control, Territorial Baloth gets +2/+2 until end of turn.
 mana={4}{G}
 type=Creature
@@ -119302,7 +119302,7 @@ toughness=2
 [/card]
 [card]
 name=Tethmos High Priest
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):moveTo(mybattlefield) target(creature[manacost<=2]|mygraveyard)
+auto=_HEROIC_moveTo(mybattlefield) target(creature[manacost<=2]|mygraveyard)
 text=Heroic -- Whenever you cast a spell that targets Tethmos High Priest, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
 mana={2}{W}
 type=Creature
@@ -121444,7 +121444,7 @@ toughness=2
 name=Tideforce Elemental
 auto={U}{T}:tap target(other creature)
 auto={U}{T}:untap target(other creature)
-auto=@movedTo(land|myBattlefield):may untap
+auto=_LANDFALL_may untap
 text={U}, {T}: You may tap or untap another target creature. -- Landfall - Whenever a land enters the battlefield under your control, you may untap Tideforce Elemental.
 mana={2}{U}
 type=Creature
@@ -121900,7 +121900,7 @@ toughness=3
 [/card]
 [card]
 name=Tireless Tracker
-auto=@movedto(land|mybattlefield):token(Clue,Artifact Clue,0/0) and!( transforms((,newability[{S}{2}:draw:1])) forever )! controller
+auto=_LANDFALL_token(Clue,Artifact Clue,0/0) and!( transforms((,newability[{S}{2}:draw:1])) forever )! controller
 auto=@sacrificed(clue|mybattlefield):counter(1/1,1)
 text=Whenever a land enters the battlefield under your control, investigate. (Put a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") -- Whenever you sacrifice a Clue, put a +1/+1 counter on Tireless Tracker.
 mana={2}{G}
@@ -122453,7 +122453,7 @@ toughness=5
 [card]
 name=Tormented Hero
 auto=tap(noevent)
-auto=@targeted(this) from(*|mycastingzone):lifeleech:-1 opponent
+auto=_HEROIC_lifeleech:-1 opponent
 text=Tormented Hero enters the battlefield tapped. -- Heroic - Whenever you cast a spell that targets Tormented Hero, each opponent loses 1 life. You gain life equal to the life lost this way. 
 mana={B}
 type=Creature
@@ -124218,7 +124218,7 @@ toughness=1
 [/card]
 [card]
 name=Triton Cavalry
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):may moveTo(ownerhand) target(enchantment|battlefield) 
+auto=_HEROIC_may moveTo(ownerhand) target(enchantment|battlefield) 
 text=Heroic -- Whenever you cast a spell that targets Triton Cavalry, you may return target enchantment to its owner's hand.
 mana={3}{U}
 type=Creature
@@ -124228,7 +124228,7 @@ toughness=4
 [/card]
 [card]
 name=Triton Fortune Hunter
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):draw:1 controller
+auto=_HEROIC_draw:1 controller
 text=Heroic - Whenever you cast a spell that targets Triton Fortune Hunter, draw a card. 
 mana={2}{U}
 type=Creature
@@ -124711,7 +124711,7 @@ type=Instant
 [/card]
 [card]
 name=Tunneling Geopede
-auto=@movedTo(land|myBattlefield):damage:1 all(opponent)
+auto=_LANDFALL_damage:1 all(opponent)
 text=Landfall -- Whenever a land enters the battlefield under your control, Tunneling Geopede deals 1 damage to each opponent.
 mana={2}{R}
 type=Creature
@@ -124795,7 +124795,7 @@ mana={2}{U}{U}
 [card]
 name=Turntimber Basilisk
 abilities=deathtouch
-auto=@movedTo(land|myBattlefield):may setblocker target(creature|opponentbattlefield)
+auto=_LANDFALL_may setblocker target(creature|opponentbattlefield)
 text=Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.) -- Landfall -- Whenever a land enters the battlefield under your control, you may have target creature block Turntimber Basilisk this turn if able.
 mana={1}{G}{G}
 type=Creature
@@ -125701,7 +125701,7 @@ subtype=Island Swamp
 [card]
 name=Undergrowth Champion
 auto=this(counter{1/1.1}>0) phantom
-auto=@movedTo(land|myBattlefield):counter(1/1,1)
+auto=_LANDFALL_counter(1/1,1)
 text=If damage would be dealt to Undergrowth Champion while it has a +1/+1 counter on it, prevent that damage and remove a +1/+1 counter from Undergrowth Champion. -- Landfall -- Whenever a land enters the battlefield under your control, put a +1/+1 counter on Undergrowth Champion.
 mana={1}{G}{G}
 type=Creature
@@ -126899,7 +126899,7 @@ toughness=3
 [/card]
 [card]
 name=Valakut Predator
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Landfall -- Whenever a land enters the battlefield under your control, Valakut Predator gets +2/+2 until end of turn.
 mana={2}{R}
 type=Creature
@@ -127262,7 +127262,7 @@ type=Sorcery
 [card]
 name=Vanguard of Brimaz
 abilities=vigilance
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):token(Cat Soldier,Creature Cat Soldier,1/1,white,vigilance) controller
+auto=_HEROIC_token(Cat Soldier,Creature Cat Soldier,1/1,white,vigilance) controller
 text=Vigilance -- Heroic -- Whenever you cast a spell that targets Vanguard of Brimaz, put a 1/1 white Cat Soldier creature token with vigilance onto the battlefield.
 mana={W}{W}
 type=Creature
@@ -129126,7 +129126,7 @@ toughness=4
 [/card]
 [card]
 name=Vinelasher Kudzu
-auto=@movedTo(land|myBattlefield):counter(1/1,1)
+auto=_LANDFALL_counter(1/1,1)
 text=Whenever a land enters the battlefield under your control, put a +1/+1 counter on Vinelasher Kudzu.
 mana={1}{G}
 type=Creature
@@ -132189,7 +132189,7 @@ toughness=1
 [card]
 name=War-Wing Siren
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Flying -- Heroic -- Whenever you cast a spell that targets War-Wing Siren, put a +1/+1 counter on War-Wing Siren.
 mana={2}{U}
 type=Creature
@@ -132485,7 +132485,7 @@ type=Enchantment
 [/card]
 [card]
 name=Wavecrash Triton
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):target(creature|opponentbattlefield) transforms((,newability[tap],newability[frozen])) oneshot
+auto=_HEROIC_target(creature|opponentbattlefield) transforms((,newability[tap],newability[frozen])) oneshot
 text=Heroic -- Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 mana={2}{U}
 type=Creature
@@ -132515,7 +132515,7 @@ toughness=4
 [card]
 name=Wave-Wing Elemental
 abilities=flying
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Flying -- Landfall -- Whenever a land enters the battlefield under your control, Wave-Wing Elemental gets +2/+2 until end of turn.
 mana={5}{U}
 type=Creature
@@ -134340,7 +134340,7 @@ toughness=3
 [card]
 name=Windrider Eel
 abilities=flying
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=_LANDFALL_2/2 ueot
 text=Flying -- Landfall - Whenever a land enters the battlefield under your control, Windrider Eel gets +2/+2 until end of turn.
 mana={3}{U}
 type=Creature
@@ -134587,7 +134587,7 @@ subtype=Shapeshifter
 [card]
 name=Wingsteed Rider
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
+auto=_HEROIC_counter(1/1,1)
 text=Flying. -- Heroic -- Whenever you cast a spell that targets Wingsteed Rider, put a +1/+1 counter on Wingsteed Rider.
 mana={1}{W}{W}
 type=Creature
@@ -136887,7 +136887,7 @@ toughness=2
 [/card]
 [card]
 name=Zektar Shrine Expedition
-auto=@movedTo(land|myBattlefield):may counter(0/0,1,Quest)
+auto=_LANDFALL_may counter(0/0,1,Quest)
 auto={C(0/0,-3,Quest)}{S}:token(Elemental,Creature Elemental,7/1,red,trample,haste,unearth)
 text=Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Zektar Shrine Expedition. -- Remove three quest counters from Zektar Shrine Expedition and sacrifice it: Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step.
 mana={1}{R}
@@ -136932,7 +136932,7 @@ type=Enchantment
 [/card]
 [card]
 name=Zendikar's Roil
-auto=@movedto(land|mybattlefield):token(Elemental,Creature Elemental,2/2,green) controller
+auto=_LANDFALL_token(Elemental,Creature Elemental,2/2,green) controller
 text=Whenever a land enters the battlefield under your control, put a 2/2 green Elemental creature token onto the battlefield.
 mana={3}{G}{G}
 type=Enchantment
@@ -137451,7 +137451,7 @@ toughness=2
 [/card]
 [card]
 name=Zo-Zu the Punisher
-auto=@movedTo(land|myBattlefield):damage:2 controller
+auto=_LANDFALL_damage:2 controller
 auto=@movedTo(land|opponentBattlefield):damage:2 opponent
 text=Whenever a land enters the battlefield, Zo-Zu the Punisher deals 2 damage to that land's controller.
 mana={1}{R}{R}
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index 1e306054f..bd164a8a6 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -1622,7 +1622,7 @@ subtype=Liliana
 [card]
 name=Liliana, Defiant Necromancer
 auto=counter(0/0,3,Loyalty)
-auto={C(0/0,2,Loyalty)}:name(+2: Each Player Discard) ability$!name(discard) notatarget(*|myhand) reject!$ controller && ability$!name(discard) notatarget(*|myhand) reject!$ opponent
+auto={C(0/0,2,Loyalty)}:name(+2: Each Player Discard) transforms((,newability[ability$!name(discard) notatarget(*|myhand) reject!$ controller],newability[ability$!name(discard) notatarget(*|myhand) reject!$ opponent])) ueot
 auto={C(0/0,-0,Loyalty)}:name(-0: Reanimate nonLegendary creature with manacost 0) moveto(mybattlefield) target(creature[-legendary;manacost=0]|mygraveyard)
 auto={C(0/0,-1,Loyalty)}:name(-1: Reanimate nonLegendary creature with manacost 1) moveto(mybattlefield) target(creature[-legendary;manacost=1]|mygraveyard)
 auto={C(0/0,-2,Loyalty)}:name(-2: Reanimate nonLegendary creature with manacost 2) moveto(mybattlefield) target(creature[-legendary;manacost=2]|mygraveyard)