diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index 3403fd280..b5aed1acc 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -59,6 +59,11 @@
 
 # Scry, Evergreen
 #AUTO_DEFINE _SCRY_($c) scry:$c scrycore delayed dontshow donothing scrycoreend scryend
+#AUTO_DEFINE _SCRY1_ scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+#AUTO_DEFINE _SCRY2_ scry:2 scrycore delayed dontshow donothing scrycoreend scryend
+#AUTO_DEFINE _SCRY3_ scry:3 scrycore delayed dontshow donothing scrycoreend scryend
+#AUTO_DEFINE _SCRY4_ scry:4 scrycore delayed dontshow donothing scrycoreend scryend
+#AUTO_DEFINE _SCRY5_ scry:5 scrycore delayed dontshow donothing scrycoreend scryend
 
 # Fabricate
 #AUTO_DEFINE _FABRICATE_($c) transforms((,newability[choice counter(1/1.$c)],newability[choice create(Servo:Artifact Creature Servo:1/1)*$c])) ueot
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index ae3220a07..e76bc8d06 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -21,7 +21,7 @@ type=Sorcery
 [card]
 name=Abandon the Post
 flashback={3}{R}
-auto=may name(Creatures can't block) target(upto:2>creature) transforms((,newability[cantblock])) ueot
+auto=may name(Creatures can't block) target(<upto:2>creature) transforms((,newability[cantblock])) ueot
 text=Up to two target creatures can't block this turn. -- Flashback {3}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={1}{R}
 type=Sorcery
@@ -1354,8 +1354,8 @@ toughness=4
 [card]
 name=Alhammarret's Archive
 abilities=lifefaker
-auto=@lifeof(player) from(*[-Alhammarret's Archive]):life:thatmuch
-auto=replacedraw draw:2 noreplace
+auto=@lifeof(player) from(*[-lifefaker]|*):life:thatmuch
+auto=replacedraw if compare(currentphase)~equalto~3 then draw:1 noreplace else draw:2 noreplace
 text=If you would gain life, you gain twice that much life instead. -- If you would draw a card except the first one you draw in each of your draw steps, draw two cards instead.
 mana={5}
 type=Legendary Artifact
@@ -1515,7 +1515,7 @@ toughness=2
 [card]
 name=Alpha Status
 target=creature
-auto=teach(creature) foreach(other creature[share!subtype!]|battlefield) 2/2
+auto=teach(creature) foreach(other *[creature;share!types!]|battlefield) 2/2
 text=Enchant creature -- Enchanted creature gets +2/+2 for each other creature on the battlefield that shares a creature type with it.
 mana={2}{G}
 type=Enchantment
@@ -2618,7 +2618,7 @@ name=Anticognition
 target=*[creature;planeswalker]|stack
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) forever
-auto=if type(*|opponentGraveyard)~morethan~7 then _SCRY_(2)
+auto=if type(*|opponentGraveyard)~morethan~7 then _SCRY2_
 text=Counter target creature or planeswalker spell unless its controller pays {2}. If an opponent has eight or more cards in their graveyard, instead counter that spell, then scry 2.
 mana={1}{U}
 type=Instant
@@ -3974,7 +3974,7 @@ type=Instant
 name=Artificer's Assistant
 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=_CASTHISTORIC__SCRY_(1)
+auto=_CASTHISTORIC__SCRY1_
 text=Flying -- Whenever you cast a historic spell, scry 1. (Artifacts, legendaries, and Sagas are historic. To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
 mana={U}
 type=Creature
@@ -4714,7 +4714,7 @@ toughness=3
 [/card]
 [card]
 name=Automatic Librarian
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Automatic Librarian enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}
 type=Artifact Creature
@@ -5187,7 +5187,8 @@ type=Legendary Artifact
 name=Azor, the Lawbringer
 abilities=flying
 auto=phaseaction[upkeep once] maxCast(*[instant;sorcery])0 opponent ueot
-auto=_ATTACKING_may pay({X}{W}{U}{U}) name(Gain X life and draw X cards) life:x controller && draw:x controller
+auto=_ATTACKING_may pay({1}{W}{U}{U}) name(Gain X life and draw X cards) life:x controller && draw:x controller
+auto=_ATTACKING_may pay({2}{W}{U}{U}) name(Gain X life and draw X cards) life:x controller && draw:x controller
 text=Flying -- When Azor, the Lawbringer enters the battlefield, each opponent can't cast instant or sorcery spells during that player's next turn. -- Whenever Azor attacks, you may pay {X}{W}{U}{U}. If you do, you gain X life and draw X cards.
 mana={2}{W}{W}{U}{U}
 type=Legendary Creature
@@ -5415,6 +5416,7 @@ type=Land
 [/card]
 [card]
 name=Balan, Wandering Knight
+abilities=first strike
 auto=this(gear > 1) double strike
 auto={1}{W}:all(equipment|mybattlefield) newhook
 text=First strike -- Balan, Wandering Knight has double strike as long as two or more Equipment are attached to it. -- {1}{W}: Attach all Equipment you control to Balan.
@@ -6174,7 +6176,7 @@ aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,n
 auto=@each my firstmain:counter(0/0,1,Lore)
 auto=all(creature[-giant]|battlefield) damage:3
 auto=all(planeswalker|battlefield) damage:3
-auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.2.Lore}=) _SCRY_(3)
+auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.2.Lore}=) _SCRY3_
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) emblem transforms((,newability[@movedTo(*[manacost>=5]|mystack):name(Draw and discard) draw:2 && transforms((,newability[target(*|myhand) reject])) forever])) ueot
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) sacrifice(this)
 text=(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.) -- I - Battle of Frost and Fire deals 4 damage to each non-Giant creature and each planeswalker. -- II - Scry 3. -- III - Whenever you cast a spell with mana value 5 or greater this turn, draw two cards, then discard a card.
@@ -7076,7 +7078,7 @@ abilities=defender
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(backside)
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 auto=@sacrificed(this):name(Return transformed) name(Return transformed) transforms((,newability[@each endofturn:name(Return transformed) flip(backside) forcetype(Creature Serpent)])) ueot
 text=Defender -- When Biolume Egg enters the battlefield, scry 2. -- When you sacrifice Biolume Egg, return it to the battlefield transformed under its owner's control at the beginning of the next end step. // Biolume Serpent
 mana={2}{U}
@@ -8040,6 +8042,7 @@ type=Instant
 name=Blizzard Brawl
 target=creature|mybattlefield
 restriction=type(creature|mybattlefield)~morethan~0,type(creature|opponentbattlefield)~morethan~0
+auto=if type(*[snow]|mybattlefield)~lessthan~3 then transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>])) ueot
 auto=if type(*[snow]|mybattlefield)~morethan~2 then transforms((,newability[1/0],newability[indestructible],newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>])) ueot
 text=Choose target creature you control and target creature you don't control. If you control three or more snow permanents, the creature you control gets +1/+0 and gains indestructible until end of turn. Then those creatures fight each other. (Each deals damage equal to its power to the other.)
 mana={G}
@@ -9320,7 +9323,7 @@ aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,n
 auto=@movedto(creature|mygraveyard) from(mybattlefield):-cantattack ueot
 auto=@movedto(creature|mygraveyard) from(mybattlefield):-cantpwattack ueot
 auto=@movedto(creature|mygraveyard) from(mybattlefield):-cantblock ueot
-auto={1}{B}{S(other creature|mybattlefield)}:_SCRY_(1) && life:-1 opponent && life:1 controller
+auto={1}{B}{S(other creature|mybattlefield)}:_SCRY1_ && life:-1 opponent && life:1 controller
 text=Menace, indestructible -- Bontu the Glorified can't attack or block unless a creature died under your control this turn. -- {1}{B}, Sacrifice another creature: Scry 1. Each opponent loses 1 life and you gain 1 life.
 mana={2}{B}
 type=Legendary Creature
@@ -10529,7 +10532,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Bronze Walrus
-auto=_SCRY_(2)
+auto=_SCRY2_
 auto={T}:Add{W}
 auto={T}:Add{U}
 auto={T}:Add{B}
@@ -10893,7 +10896,7 @@ type=Instant
 name=Burning Prophet
 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(*[-creature]|mystack):1/0 ueot
-auto=@movedTo(*[-creature]|mystack):_SCRY_(1)
+auto=@movedTo(*[-creature]|mystack):_SCRY1_
 text=Whenever you cast a noncreature spell, Burning Prophet gets +1/+0 until end of turn, then scry 1.
 mana={1}{R}
 type=Creature
@@ -11246,7 +11249,7 @@ name=Calculated Dismissal
 target=*|stack
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) oneshot
-auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then _SCRY_(2)
+auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then _SCRY2_
 text=Counter target spell unless its controller pays {3}. -- Spell mastery - If there are two or more instant and/or sorcery cards in your graveyard, scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={2}{U}
 type=Instant
@@ -12051,7 +12054,7 @@ name=Castle Vantress
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto={T}:add{U}
 auto=aslongas(land[island]|myBattlefield) tap(noevent) <1 oneshot
-auto={2}{U}{U}{T}:_SCRY_(2)
+auto={2}{U}{U}{T}:_SCRY2_
 text=Castle Vantress enters the battlefield tapped unless you control an Island. -- {T}: Add {U}. -- {2}{U}{U}, {T}: Scry 2.
 type=Land
 [/card]
@@ -12329,7 +12332,7 @@ name=Cavalier of Gales
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=draw:3 controller && transforms((,newability[target(<2>*|myhand) moveto(mylibrary)])) oneshot
-auto=_DIES_all(trigger[to]) moveTo(mylibrary) and!( transforms((,newability[_SCRY_(2)],newability[shuffle])) oneshot )!
+auto=_DIES_all(trigger[to]) moveTo(mylibrary) and!( transforms((,newability[_SCRY2_],newability[shuffle])) oneshot )!
 text=Flying -- When Cavalier of Gales enters the battlefield, draw three cards, then put two cards from your hand on top of your library in any order. -- When Cavalier of Gales dies, shuffle it into its owner's library, then scry 2.
 mana={2}{U}{U}{U}
 type=Creature
@@ -12780,7 +12783,7 @@ name=Chain to Memory
 target=creature
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=-4/-0
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Target creature gets -4/-0 until end of turn. Scry 2.
 mana={U}
 type=Instant
@@ -13541,7 +13544,7 @@ toughness=1
 [card]
 name=Charming Prince
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=choice name(Scry 2) _SCRY_(2)
+auto=choice name(Scry 2) _SCRY2_
 auto=choice name(Gain 3 life) life:3
 auto=choice name(Exile your creature) (blink)ueot target(other *[creature]|mybattlefield)
 text=When Charming Prince enters the battlefield, Choose one -- Scry 2. -- You gain 3 life. -- Exile another target creature you own. Return it to the battlefield under your control at the beginning of the next end step.
@@ -13969,7 +13972,7 @@ type=Legendary Artifact
 [/card]
 [card]
 name=Chrome Cat
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=When Chrome Cat enters the battlefield, scry 1.
 mana={3}
 type=Artifact Creature
@@ -14911,7 +14914,7 @@ toughness=4
 name=Cloudreader Sphinx
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Flying -- When Cloudreader Sphinx enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={4}{U}
 type=Creature
@@ -15479,7 +15482,7 @@ name=Coming In Hot
 target=creature
 auto=1/0
 auto=first strike
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets +1/+0 and gains first strike until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom.)
 mana={R}
 type=Instant
@@ -17496,9 +17499,9 @@ type=Land
 [card]
 name=Cryptic Annelid
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
-auto=_SCRY_(3)
-auto=_SCRY_(2)
+auto=_SCRY1_
+auto=_SCRY3_
+auto=_SCRY2_
 text=When Cryptic Annelid enters the battlefield, scry 1, then scry 2, then scry 3. (To scry X, look at the top X cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}{U}
 type=Creature
@@ -17570,7 +17573,7 @@ subtype=Aura
 [/card]
 [card]
 name=Crystal Grotto
-auto=_SCRY_(1)
+auto=_SCRY1_
 auto={T}:Add{C}
 auto={1}{T}:Add{W}
 auto={1}{T}:Add{U}
@@ -17772,7 +17775,7 @@ type=Instant
 name=Curator of Mysteries
 abilities=flying,cycling
 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(*|mygraveyard) from(myhand):_SCRY_(1)
+auto=@movedto(*|mygraveyard) from(myhand):_SCRY1_
 autohand=__CYCLING__({U})
 text=Flying -- Whenever you cycle or discard another card, scry 1. -- Cycling {U} ({U}, Discard this card: Draw a card.)
 mana={2}{U}{U}
@@ -18559,7 +18562,7 @@ name=Daring Escape
 target=creature
 auto=1/0
 auto=first strike
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets +1/+0 and gains first strike until end of turn. Scry 1.
 mana={R}
 type=Instant
@@ -18567,7 +18570,7 @@ type=Instant
 [card]
 name=Daring Fiendbonder
 abilities=haste,mustattack
-autograveyard={1}{B}{E}:target(creature) transform((,newability[counter(0/0.1.Indestructible)],newability[this(counter{0/0.1.Indestructible}>=1) indestructible]))
+autograveyard={1}{B}{E}:target(creature) transforms((,newability[counter(0/0.1.Indestructible)],newability[this(counter{0/0.1.Indestructible}>=1) indestructible]))
 text=Haste -- Daring Fiendbonder attacks each combat if able. -- {1}{B}, Exile Daring Fiendbonder from your graveyard: Put an indestructible counter on target creature. Activate this ability only any time you could cast a sorcery.
 mana={3}{B}
 type=Creature
@@ -20759,7 +20762,7 @@ type=Sorcery
 name=Devout Decree
 target=*[creature;planeswalker;black;red]
 auto=moveTo(exile)
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Exile target creature or planeswalker that's black or red. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{W}
 type=Sorcery
@@ -21668,26 +21671,26 @@ name=Djinni Windseer
 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=transforms((,newability[name(Roll a d20) rolld20 20 winability donothing winabilityend rolld20end])) oneshot
-auto=@dierolled(this) result(1) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(2) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(3) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(4) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(5) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(6) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(7) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(8) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(9) from(controller):name(Scry 1) _SCRY_(1)
-auto=@dierolled(this) result(10) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(11) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(12) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(13) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(14) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(15) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(16) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(17) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(18) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(19) from(controller):name(Scry 2) _SCRY_(2)
-auto=@dierolled(this) result(20) from(controller):name(Scry 3) _SCRY_(3)
+auto=@dierolled(this) result(1) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(2) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(3) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(4) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(5) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(6) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(7) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(8) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(9) from(controller):name(Scry 1) _SCRY1_
+auto=@dierolled(this) result(10) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(11) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(12) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(13) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(14) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(15) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(16) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(17) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(18) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(19) from(controller):name(Scry 2) _SCRY2_
+auto=@dierolled(this) result(20) from(controller):name(Scry 3) _SCRY3_
 text=Flying -- When Djinni Windseeker enters the battlefield, roll a d20. -- 1-9 | Scry 1. -- 10-19 | Scry 2. -- 20 | Scry 3.
 mana={3}{U}
 type=Creature
@@ -23525,11 +23528,11 @@ restriction=never
 aicode=activate target(*[zpos<=3]|mylibrary) moveto(myhand) and!( transforms((,newability[zerocast],newability[draw:2 controller])) forever )!
 autocommandzone=transforms((,newability[shroud],newability[indestructible])) forever
 autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~1}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Yawning Portal) name(Yawning Portal) life:1 controller!$ controller
-autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~2}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Dungeon Level) name(Dungeon Level) _SCRY_(1)!$ controller
+autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~2}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Dungeon Level) name(Dungeon Level) _SCRY1_!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~3}:ability$!name(Goblin Bazaar or Twisted Caverns) all(Dungeon of the Mad Mage|mycommandzone) transforms((,newability[choice name(Goblin Bazaar) token(Treasure Sur)*type:*[twodngtrg]:mybattlefieldplus1plusend],newability[if type(creature|battlefield)~morethan~0 then choice name(Twisted Caverns) name(Twisted Caverns) target(<type:*[twodngtrg]:mybattlefieldplus1plusend>creature|battlefield) transforms((,newability[cantattack],newability[cantpwattack])) uynt])) oneshot!$ controller
-autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~4}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Lost Level) name(Lost Level) _SCRY_(2)!$ controller
+autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~4}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Lost Level) name(Lost Level) _SCRY2_!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~5}:ability$!name(Runestone Caverns or Muiral's Graveyard) transforms((,newability[choice name(Muiral's Graveyard) token(Skeleton Mad)*twicetype:*[twodngtrg]:mybattlefieldplus1plusend],newability[choice name(Runestone Caverns) all(*[zpos<=twicecardcountabiltwodngtrgplus1plusend]|mylibrary) moveto(exile) and!( transforms((,newability[canplayfromexile])) forever )!])) oneshot!$ controller
-autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~6}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Deep Mines) name(Deep Mines) _SCRY_(3)!$ controller
+autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~6}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Deep Mines) name(Deep Mines) _SCRY3_!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~7}:choice name(Dungeon completed) all(Dungeon of the Mad Mage|mycommandzone) completedungeon:1 controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Dungeon of the Mad Mage|mycommandzone) restriction{compare(hascntexplore)~equalto~7}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Mad Wizard's Lair) name(Mad Wizard's Lair) reveal:3 optionone name(Choose a card) target(<upto:1>*|reveal) moveto(myhand) and!( transforms((,newability[zerocast])) forever )! optiononeend optiontwo all(*|reveal) moveto(myhand) optiontwoend revealend!$ controller
 text=Yawning Portal - You gain 1 life. -- Dungeon Level - Scry 1. -- Goblin Bazaar - Create a Treasure token. -- Twisted Caverns - Target creature can't attack until your next turn. -- Lost Level - Scry 2. -- Runestone Caverns - Exile the top two cards of your library. You may play them. -- Muiral's Graveyard - Create two 1/1 black Skeleton creature tokens. -- Deep Mines - Scry 3. -- Mad Wizard's Lair - Draw three cards and reveal them. You may cast one of them without paying its mana cost.
@@ -23824,8 +23827,8 @@ toughness=2
 [card]
 name=Eager Construct
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=may name(Scry 1) _SCRY_(1)
-auto=ability$!name(Scry 1) may name(Scry 1) _SCRY_(1)!$ opponent
+auto=may name(Scry 1) _SCRY1_
+auto=ability$!name(Scry 1) may name(Scry 1) _SCRY1_!$ opponent
 text=When Eager Construct enters the battlefield, each player may scry 1.
 mana={2}
 type=Artifact Creature
@@ -24245,7 +24248,7 @@ type=Sorcery
 [/card]
 [card]
 name=Elaborate Firecannon
-auto=@each my upkeep:frozen
+auto=doesnotuntap
 auto={4}{T}:damage:2 target(creature,player)
 auto=@each my upkeep:may discard(*|myhand) && untap
 text=Elaborate Firecannon doesn't untap during your untap step. -- {4}, {T}: Elaborate Firecannon deals 2 damage to target creature or player. -- At the beginning of your upkeep, you may discard a card. If you do, untap Elaborate Firecannon.
@@ -25074,8 +25077,8 @@ type=Land
 [card]
 name=Emiel the Blessed
 auto={3}:name(Move to exile) target(other creature|mybattlefield) moveto(exile) and!(moveto(ownerbattlefield))!
-auto=@movedto(other creature[-unicorn]|mybattlefield):may all(trigger[to]) counter(1/1)
-auto=@movedto(other creature[unicorn]|mybattlefield):may counter(1/1,2) all(trigger[to])
+auto=@movedto(other creature[-unicorn]|mybattlefield):all(trigger[to]) pay[[{GW}]] counter(1/1)
+auto=@movedto(other creature[unicorn]|mybattlefield):all(trigger[to]) pay[[{GW}]] counter(1/1,2)
 text={3}: Exile another target creature you control, then return it to the battlefield under its owner's control. -- Whenever another creature enters the battlefield under your control, you may pay {G} or {W}. If you do, put a +1/+1 counter on it. If it's a Unicorn, put two +1/+1 counters on it instead. ( {G} or {W} can be paid with either {G} or {W}.)
 mana={2}{W}{W}
 type=Legendary Creature
@@ -25443,7 +25446,7 @@ name=Enlarge
 target=creature
 auto=trample ueot
 auto=7/7 ueot
-auto=transform((,newability[_ATTACKING_ all(creature|opponentbattlefield) mustblock ueot])) ueot
+auto=transforms((,newability[_ATTACKING_ all(creature|opponentbattlefield) mustblock ueot])) ueot
 text=Target creature gets +7/+7 and gains trample until end of turn. It must be blocked this turn if able. (If a creature with trample would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
 mana={3}{G}{G}
 type=Sorcery
@@ -26693,7 +26696,7 @@ name=Expose to Daylight
 target=artifact,enchantment
 auto=destroy
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Destroy target artifact or enchantment. Scry 1.
 mana={2}{W}
 type=Instant
@@ -26840,7 +26843,7 @@ toughness=1
 [/card]
 [card]
 name=Eye of Malcator
-auto=_SCRY_(2)
+auto=_SCRY2_
 auto=@movedTo(other artifact|myBattlefield):becomes(Artifact Creature Phyrexian Eye,4/4) ueot
 text=When Eye of Malcator enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.) -- Whenever another artifact enters the battlefield under your control, Eye of Malcator becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
 mana={2}{U}
@@ -26880,7 +26883,7 @@ toughness=2
 name=Eyes Everywhere
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto={5}{U}:moveto(mybattlefield) target(*[-land]|opponentbattlefield) and!( moveto(opponentbattlefield) all(this) )! asSorcery
-auto=@each my upkeep:_SCRY_(1)
+auto=@each my upkeep:_SCRY1_
 text=At the beginning of your upkeep, scry 1. -- {5}{U}: Exchange control of Eyes Everywhere and target nonland permanent. Activate this ability only any time you could cast a sorcery.
 mana={2}{U}
 type=Enchantment
@@ -27024,7 +27027,7 @@ type=Sorcery
 name=Fading Hope
 target=creature
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=moveto(ownerhand) and!( if cantargetcard(*[manacost<=3]|*) then _SCRY_(1) )!
+auto=moveto(ownerhand) and!( if cantargetcard(*[manacost<=3]|*) then _SCRY1_ )!
 text=Return target creature to its owner's hand. If its mana value was 3 or less, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={U}
 type=Instant
@@ -27067,7 +27070,7 @@ toughness=0
 [card]
 name=Faerie Artisans
 abilities=flying
-auto=@movedto(creature[-token]|opponentBattlefield):name(Copy creature) all(trigger[to]) clone addtype(artifact) and!( transform((,newability[counter(0/0.1.ArtisanCreated)])) oneshot )!
+auto=@movedto(creature[-token]|opponentBattlefield):name(Copy creature) all(trigger[to]) clone addtype(artifact) and!( transforms((,newability[counter(0/0.1.ArtisanCreated)])) oneshot )!
 auto=@movedto(creature[-token]|opponentBattlefield):name(Exile other tokens) all(creature[counter(0/0.1.ArtisanCreated)]|myBattlefield) moveTo(exile)
 text=Flying -- Whenever a nontoken creature enters the battlefield under an opponent's control, create a token that's a copy of that creature except it's an artifact in addition to its other types. Then exile all other tokens created with Faerie Artisans.
 mana={3}{U}
@@ -27127,7 +27130,7 @@ toughness=1
 name=Faerie Seer
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Flying -- When Faerie Seer enters the battlefield, scry 2.
 mana={U}
 type=Creature
@@ -27669,7 +27672,7 @@ name=Fateful End
 target=player,creature,plansewalker
 auto=damage:3
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Fateful End deals 3 damage to any target. Scry 1.
 mana={2}{R}
 type=Instant
@@ -28576,11 +28579,8 @@ type=Artifact
 [/card]
 [card]
 name=Fight as One
-target=creature|mybattlefield
-other={W} name(Both)
-auto=if paid(alternative) then target(creature[human]) 1/1 && indestructible ueot
-auto=if paid(alternative) then target(creature[-human]) 1/1 && indestructible ueot
-auto=ifnot paid(alternative) then 1/1 && indestructible ueot
+auto=ability$!name(Target Human) may name(Target Human) target(creature[human]|mybattlefield) transforms((,newability[1/1],newability[indestructible])) ueot!$ controller
+auto=ability$!name(Target non-Human) may name(Target non-Human) target(creature[-human]|mybattlefield) transforms((,newability[1/1],newability[indestructible])) ueot!$ controller
 text=Choose one or both -- Target Human creature you control gets +1/+1 and gains indestructible until end of turn. -- Target non-Human creature you control gets +1/+1 and gains indestructible until end of turn.
 mana={W}
 type=Instant
@@ -29592,7 +29592,7 @@ type=Sorcery
 [card]
 name=Fleshtaker
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@sacrificed(other creature|myBattlefield):name(Gain life and scry) life:1 controller && _SCRY_(1)
+auto=@sacrificed(other creature|myBattlefield):name(Gain life and scry) life:1 controller && _SCRY1_
 auto={1}{S(other creature|myBattlefield)}:name(Gets 2/2) 2/2 ueot
 text=Whenever you sacrifice another creature, you gain 1 life and scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {1}, Sacrifice another creature: Fleshtaker gets +2/+2 until end of turn.
 type=Creature
@@ -30250,7 +30250,7 @@ type=Instant
 name=Forsaken Crossroads
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=tap(noevent)
-auto=chooseacolor transforms((,newability[{T}:add{chosencolor}],newability[if compare(startingplayer)~morethan~0 then may name(Untap card) name(Untap card) untap],newability[name(Scry 1) _SCRY_(1)])) forever chooseend
+auto=chooseacolor transforms((,newability[{T}:add{chosencolor}],newability[if compare(startingplayer)~morethan~0 then may name(Untap card) name(Untap card) untap],newability[name(Scry 1) _SCRY1_])) forever chooseend
 text=Forsaken Crossroads enters the battlefield tapped. -- As Forsaken Crossroads enters the battlefield, choose a color. -- When Forsaken Crossroads enters the battlefield, scry 1. If you weren't the starting player, you may untap Forsaken Crossroads instead. -- {T}: Add one mana of the chosen color.
 type=Land
 [/card]
@@ -30962,7 +30962,7 @@ toughness=5
 [card]
 name=Furious Bellow
 target=creature
-auto=3/0 && _SCRY_(1)
+auto=3/0 && _SCRY1_
 text=Target creature gets +3/+0 and gains first strike until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{R}
 type=Instant
@@ -32093,7 +32093,7 @@ name=Get the Point
 target=creature
 auto=destroy
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Destroy target creature. Scry 1.
 mana={3}{B}{R}
 type=Instant
@@ -33232,7 +33232,7 @@ toughness=2
 [card]
 name=Glistener Seer
 auto=counter(0/0,3,oil)
-auto={T}{C(0/0,-1,oil)}:_SCRY_(1)
+auto={T}{C(0/0,-1,oil)}:_SCRY1_
 text=Glistener Seer enters the battlefield with three oil counters on it. -- {T}, Remove an oil counter from Glistener Seer: Scry 1. (Look at the top card of your library. You may put that card on the bottom.)
 mana={U}
 type=Creature
@@ -35090,11 +35090,11 @@ toughness=4
 name=Graven Lore
 restriction=compare(mysnowpoolcount)~equalto~0
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-autohand={2}{i}{U}{U} restriction{compare(mysnowpoolcount)~equalto~1}:name(Cast with 1 snow mana) name(Cast with 1 snow mana) _SCRY_(1) && activate castcard(alternative)
-autohand={1}{i}{i}{U}{U} restriction{compare(mysnowpoolcount)~equalto~2}:name(Cast with 2 snow mana) name(Cast with 2 snow mana) _SCRY_(2) && activate castcard(alternative)
-autohand={i}{i}{i}{U}{U} restriction{compare(mysnowpoolcount)~morethan~2}:name(Cast with 3 snow mana) name(Cast with 3 snow mana) _SCRY_(3) && activate castcard(alternative)
-autohand={i}{i}{i}{i}{U} restriction{compare(mysnowpoolcount)~morethan~3,compare(mysnowbluepoolcount)~morethan~0}:name(Cast with 4 snow mana) name(Cast with 4 snow mana) _SCRY_(4) && activate castcard(alternative)
-autohand={i}{i}{i}{i}{i} restriction{compare(mysnowpoolcount)~morethan~4,compare(mysnowbluepoolcount)~morethan~1}:name(Cast with 5 snow mana) name(Cast with 5 snow mana) _SCRY_(5) && activate castcard(alternative)
+autohand={2}{i}{U}{U} restriction{compare(mysnowpoolcount)~equalto~1}:name(Cast with 1 snow mana) name(Cast with 1 snow mana) _SCRY1_ && activate castcard(alternative)
+autohand={1}{i}{i}{U}{U} restriction{compare(mysnowpoolcount)~equalto~2}:name(Cast with 2 snow mana) name(Cast with 2 snow mana) _SCRY2_ && activate castcard(alternative)
+autohand={i}{i}{i}{U}{U} restriction{compare(mysnowpoolcount)~morethan~2}:name(Cast with 3 snow mana) name(Cast with 3 snow mana) _SCRY3_ && activate castcard(alternative)
+autohand={i}{i}{i}{i}{U} restriction{compare(mysnowpoolcount)~morethan~3,compare(mysnowbluepoolcount)~morethan~0}:name(Cast with 4 snow mana) name(Cast with 4 snow mana) _SCRY4_ && activate castcard(alternative)
+autohand={i}{i}{i}{i}{i} restriction{compare(mysnowpoolcount)~morethan~4,compare(mysnowbluepoolcount)~morethan~1}:name(Cast with 5 snow mana) name(Cast with 5 snow mana) _SCRY5_ && activate castcard(alternative)
 auto=draw:3 controller
 text=Scry X, where is the amount of {S}i} spent to cast this spell, then draw three cards. ({S}i} is mana from a snow source.)
 mana={3}{U}{U}
@@ -36016,7 +36016,7 @@ toughness=4
 name=Guiding Bolt
 target=creature[power>=4]
 auto=destroy
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Destroy target creature with power 4 or greater. -- Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={2}{W}
 type=Instant
@@ -36435,8 +36435,8 @@ toughness=3
 name=Hakka, Whispering Raven
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@combatdamagefoeof(player) from(this):name(Return to hand and scry 2) name(Return to hand and scry 2) moveTo(ownerhand) and!( _SCRY_(2) )!
-auto=@combatdamageof(player) from(this):name(Return to hand and scry 2) name(Return to hand and scry 2) moveTo(ownerhand) and!( _SCRY_(2) )!
+auto=@combatdamagefoeof(player) from(this):name(Return to hand and scry 2) name(Return to hand and scry 2) moveTo(ownerhand) and!( _SCRY2_ )!
+auto=@combatdamageof(player) from(this):name(Return to hand and scry 2) name(Return to hand and scry 2) moveTo(ownerhand) and!( _SCRY2_ )!
 text=Flying -- Whenever Hakka, Whispering Raven deals combat damage to a player, return it to its owner's hand, then scry 2. // {3}{U}{U} Alrund, God of the Cosmos
 mana={1}{U}
 type=Legendary Creature
@@ -37733,7 +37733,7 @@ type=Instant
 [card]
 name=Heirloom Blade
 auto=teach(creature) 3/1
-auto=teach(creature) transforms((,newability[@movedto(mygraveyard) from(this|mybattlefield):Reveal:1 revealzone(mylibrary) revealuntil(creature[share!subtype!]|mylibrary) optionone name(Get Creature) target(creature|myreveal) moveto(myHand) optiononeend optiontwo choice name(Shuffle) all(*|myreveal) bottomoflibrary && shuffle controller optiontwoend revealend]))
+auto=teach(creature) transforms((,newability[@movedto(mygraveyard) from(this|mybattlefield):Reveal:1 revealzone(mylibrary) revealuntil(*[creature;share!types!]|mylibrary) optionone name(Get Creature) target(creature|myreveal) moveto(myHand) optiononeend optiontwo choice name(Shuffle) all(*|myreveal) bottomoflibrary && shuffle controller optiontwoend revealend]))
 auto={1}:equip
 text=Equipped creature gets +3/+1. -- Whenever equipped creature dies, you may reveal cards from the top of your library until you reveal a creature card that shares a creature type with it. Put that card into your hand and the rest on the bottom of your library in a random order. -- Equip {1}
 mana={3}
@@ -40697,7 +40697,7 @@ toughness=1
 [card]
 name=Imperial Oath
 auto=create(Samurai:creature Samurai:2/2:white:vigilance)*3
-auto=_SCRY_(3)
+auto=_SCRY3_
 text=Create three 2/2 white Samurai creature tokens with vigilance. Scry 3.
 mana={5}{W}
 type=Sorcery
@@ -40875,8 +40875,8 @@ type=Instant
 [card]
 name=In Search of Greatness
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@each my upkeep restriction{type(*[-instant;-sorcery;manacost=convertedcost:highest:*:mybattlefieldplus1plusend]|myhand)~morethan~0}:ability$!name(Choose one) choice name(Cast permanent) target(*[-instant;-sorcery;manacost=convertedcost:highest:*:mybattlefieldplus1plusend]|myhand) activate castcard(normal) _ choice name(Scry 1) _SCRY_(1)!$ controller
-auto=@each my upkeep restriction{type(*[-instant;-sorcery;manacost=convertedcost:highest:*:mybattlefieldplus1plusend]|myhand)~equalto~0}:name(Scry 1) _SCRY_(1)
+auto=@each my upkeep restriction{type(*[-instant;-sorcery;manacost=convertedcost:highest:*:mybattlefieldplus1plusend]|myhand)~morethan~0}:ability$!name(Choose one) choice name(Cast permanent) target(*[-instant;-sorcery;manacost=convertedcost:highest:*:mybattlefieldplus1plusend]|myhand) activate castcard(normal) _ choice name(Scry 1) _SCRY1_!$ controller
+auto=@each my upkeep restriction{type(*[-instant;-sorcery;manacost=convertedcost:highest:*:mybattlefieldplus1plusend]|myhand)~equalto~0}:name(Scry 1) _SCRY1_
 text=At the beginning of your upkeep, you may cast a permanent spell from your hand with mana value equal to 1 plus the highest mana value among other permanents you control without paying its mana cost. If you don't, scry 1.
 mana={G}{G}
 type=Enchantment
@@ -41420,7 +41420,7 @@ type=Instant
 [card]
 name=Inga Rune-Eyes
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(3)
+auto=_SCRY3_
 auto=@movedto(creature|graveyard) from(battlefield):counter(0/0,1,IngaEffect)
 auto=_DIES_this(counter{0/0.1.IngaEffect}>=3) draw:3 controller
 auto=@each endofturn:this(counter{0/0.1.IngaEffect}>=1) removeallcounters(0/0,1,IngaEffect)
@@ -41458,7 +41458,7 @@ other={2}{U} name(Cast without X)
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=if paid(alternative) then draw:3 controller
 auto=if paid(alternative) then token(Treasure Sur)*2 opponent
-auto=if paid(alternative) then ability$!name(Scry 2) name(Scry 2) _SCRY_(2)!$ opponent
+auto=if paid(alternative) then ability$!name(Scry 2) name(Scry 2) _SCRY2_!$ opponent
 auto=ifnot paid(alternative) then draw:x controller
 text=You may pay {2}{U} rather than pay this spell's mana cost. -- If the {2}{U} cost was paid, you draw three cards, then an opponent creates two Treasure tokens and they scry 2. If that cost wasn't paid, you draw X cards.
 mana={X}{2}{U}
@@ -41596,7 +41596,7 @@ name=Inordinate Rage
 target=creature
 auto=3/2 ueot
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets +3/+2 until end of turn. Scry 1.
 mana={1}{R}
 type=Instant
@@ -41604,7 +41604,7 @@ type=Instant
 [card]
 name=Inquisitive Puppet
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 auto={E}:create(Human:creature Human:1/1:white)
 text=When Inquisitive Puppet enters the battlefield, scry 1. -- Exile Inquisitive Puppet: Create a 1/1 white Human creature token.
 mana={1}
@@ -41768,7 +41768,7 @@ type=Sorcery
 name=Inspire Awe
 auto=preventallcombatdamage from(creature[-enchantment;-enchanted]|battlefield) ueot
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Prevent all combat damage that would be dealt this turn except by enchanted creatures and enchantment creatures. Scry 2.
 mana={3}{G}
 type=Instant
@@ -42133,7 +42133,7 @@ name=Invasion of the Giants
 auto=counter(0/0,1,Lore)
 auto=@each my firstmain:counter(0/0,1,Lore)
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.2.Lore}=) transforms((,newability[draw:1 controller],newability[if type(giant|myhand)~morethan~0 then damage:2 target(player^planeswalker)])) oneshot
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) name(Next giant costs 2 less) target(giant|mycastingzone) transforms((,newability[changecost(colorless:-2)])) ueot
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) sacrifice(this)
@@ -42650,7 +42650,7 @@ name=Jace's Defeat
 target=*[blue]|stack
 auto=fizzle
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if casted(this) then if type(jace|opponentstack)~morethan~0 then _SCRY_(2)
+auto=if casted(this) then if type(jace|opponentstack)~morethan~0 then _SCRY2_
 text=Counter target blue spell. If it was a Jace planeswalker spell, scry 2.
 mana={1}{U}
 type=Instant
@@ -43048,7 +43048,7 @@ toughness=3
 [card]
 name=Jaya's Firenado
 target=creature,planeswalker
-auto=damage:5 && _SCRY_(1)
+auto=damage:5 && _SCRY1_
 text=Jaya's Firenado deals 5 damage to target creature or planeswalker. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={4}{R}
 type=Sorcery
@@ -43058,7 +43058,7 @@ name=Jaya's Greeting
 target=creature
 auto=damage:3
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Jaya's Greeting deals 3 damage to target creature. Scry 1.
 mana={1}{R}
 type=Instant
@@ -43084,7 +43084,7 @@ toughness=4
 [/card]
 [card]
 name=Jenson Carthalion, Druid Exile
-auto=@movedTo(*[multicolor]|mystack):_SCRY_(1)
+auto=@movedTo(*[multicolor]|mystack):_SCRY1_
 auto=@movedTo(*[white&blue&black&red&green]|mystack):create(angel:creature angel:4/4:white:flying,vigilance)
 auto={5}{T}:Add{W}{U}{B}{R}{G}
 text=Whenever you cast a multicolored spell, scry 1. If that spell was all colors, create a 4/4 white Angel creature token with flying and vigilance. -- {5}, {T}: Add {W}{U}{B}{R}{G}.
@@ -46122,7 +46122,7 @@ toughness=7
 [/card]
 [card]
 name=Krydle of Baldur's Gate
-auto=@combatdamaged(player) from(this):name(Gain life and scry) life:-1 opponent && deplete:1 opponent && life:1 controller && _SCRY_(1)
+auto=@combatdamaged(player) from(this):name(Gain life and scry) life:-1 opponent && deplete:1 opponent && life:1 controller && _SCRY1_
 auto=@each my blockers:name(Pay 2 for unblockable) pay({2}) name(Pay 2 for unblockable) target(creature|myBattlefield) transforms((,newability[unblockable])) ueot
 text=Whenever Krydle of Baldur's Gate deals combat damage to a player, that player loses 1 life and mills a card, then you gain 1 life and scry 1. -- Whenever you attack, you may pay {2}. If you do, target creature can't be blocked this turn.
 mana={U}{B}
@@ -48089,7 +48089,7 @@ toughness=3
 name=Littjara Kinseekers
 abilities=changeling
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if compare(sametypecreatures)~morethan~2 then counter(1/1) && _SCRY_(1)
+auto=if compare(sametypecreatures)~morethan~2 then counter(1/1) && _SCRY1_
 text=Changeling (This card is every creature type.) -- When Littjara Kinseekers enters the battlefield, if you control three or more creatures that share a creature type, put a +1/+1 counter on Littjara Kinseekers, then scry 1.
 mana={3}{U}
 type=Creature
@@ -48526,7 +48526,7 @@ name=Loran's Escape
 target=artifact,creature
 auto=hexproof
 auto=indestructible
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target artifact or creature gains hexproof and indestructible until end of turn. Scry 1.
 mana={W}
 type=Instant
@@ -48661,7 +48661,7 @@ toughness=2
 name=Lorehold Campus
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=tap(noevent)
-auto={4}{T}:name(Scry 1) _SCRY_(1)
+auto={4}{T}:name(Scry 1) _SCRY1_
 auto={T}:add{R}
 auto={T}:add{W}
 text=Lorehold Campus enters the battlefield tapped. -- {T}: Add {R} or {W}. -- {4}, {T}: Scry 1.
@@ -48732,7 +48732,7 @@ type=Sorcery
 [card]
 name=Lost Legion
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Lost Legion enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={1}{B}{B}
 type=Creature
@@ -48744,7 +48744,7 @@ toughness=3
 name=Lost Mine of Phandelver
 restriction=never
 autocommandzone=transforms((,newability[shroud],newability[indestructible])) forever
-autocommandzone=@counteradded(0/0,1,Explore) from(Lost Mine of Phandelver|mycommandzone) restriction{compare(hascntexplore)~equalto~1}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Cave Entrance) name(Cave Entrance) _SCRY_(1)!$ controller
+autocommandzone=@counteradded(0/0,1,Explore) from(Lost Mine of Phandelver|mycommandzone) restriction{compare(hascntexplore)~equalto~1}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Cave Entrance) name(Cave Entrance) _SCRY1_!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Lost Mine of Phandelver|mycommandzone) restriction{compare(hascntexplore)~equalto~2}:ability$!name(Goblin Lair or Mine Tunnels) all(Lost Mine of Phandelver|mycommandzone) transforms((,newability[choice name(Goblin Lair)*type:*[twodngtrg]:mybattlefieldplus1plusend _GOBLINTOKEN_ and!( all(Lost Mine of Phandelver|mycommandzone) counter(0/0.1.GoblinLiar) notrg )!],newability[choice name(Mine Tunnels) token(Treasure Sur)*type:*[twodngtrg]:mybattlefieldplus1plusend and!( all(Lost Mine of Phandelver|mycommandzone) counter(0/0.1.MineTunnels) notrg )!])) oneshot!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Lost Mine of Phandelver|mycommandzone) restriction{compare(hascntexplore)~equalto~3,compare(hascntgoblinliar)~morethan~0}:ability$!name(Storeroom or Dark Pool) all(Lost Mine of Phandelver|mycommandzone) transforms((,newability[if type(creature|battlefield)~morethan~0 then choice name(Storeroom) name(Storeroom) target(<type:*[twodngtrg]:myBattlefieldplus1plusend>creature|battlefield) counter(1/1)],newability[choice name(Dark Pool) life:type:*[twodngtrg]:mybattlefieldplus1plusend controller && life:-type:*[twodngtrg]:mybattlefieldplus1plusend opponent])) oneshot!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Lost Mine of Phandelver|mycommandzone) restriction{compare(hascntexplore)~equalto~3,compare(hascntminetunnels)~morethan~0}:ability$!name(Dark Pool or Fungi Cavern) all(Lost Mine of Phandelver|mycommandzone) transforms((,newability[choice name(Dark Pool) life:type:*[twodngtrg]:mybattlefieldplus1plusend controller controller && life:-type:*[twodngtrg]:mybattlefieldplus1plusend controller opponent],newability[if type(creature|battlefield)~morethan~0 then choice name(Fungi Cavern) name(Fungi Cavern) target(<type:*[twodngtrg]:myBattlefieldplus1plusend>creature|battlefield) transforms((,newability[-4/0])) uynt])) oneshot!$ controller
@@ -50001,7 +50001,7 @@ type=Instant
 [card]
 name=Mana Geode
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 auto={T}:Add{W}
 auto={T}:Add{U}
 auto={T}:Add{B}
@@ -50390,8 +50390,8 @@ toughness=5
 [card]
 name=Marit Lage's Slumber
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
-auto=@movedTo(*[snow]|mybattlefield):_SCRY_(1)
+auto=_SCRY1_
+auto=@movedTo(*[snow]|mybattlefield):_SCRY1_
 auto=@each my upkeep restriction{type(*[snow]|myBattlefield)~morethan~9}:may sacrifice all(this) && token(Avatar,creature Avatar,20/20,black,flying,indestructible) controller
 text=Whenever Marit Lage's Slumber or another snow permanent enters the battlefield under your control, scry 1. -- At the beginning of your upkeep, if you control ten or more snow permanents, sacrifice Marit Lage's Slumber. If you do, create Marit Lage, a legendary 20/20 black Avatar creature token with flying and indestructible.
 mana={1}{U}
@@ -50974,7 +50974,7 @@ type=Land
 [card]
 name=Mazemind Tome
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={T}{C(0/0,1,Page)}:name(Scry 1) _SCRY_(1)
+auto={T}{C(0/0,1,Page)}:name(Scry 1) _SCRY1_
 auto={2}{T}{C(0/0,1,Page)}:name(Draw 1) draw:1 controller
 auto=this(counter{0/0.1.Page}>=4) transforms((,newability[moveTo(myExile) all(this)],newability[life:4 controller]))
 text={T}, Put a page counter on Mazemind Tome: Scry 1. -- {2], {T}, Put a page counter on Mazemind Tome: Draw a card. -- When there are four or more page counters on Mazemind Tome, exile it. If you do, you gain 4 life.
@@ -51018,7 +51018,7 @@ name=Medomai's Prophecy
 auto=counter(0/0,1,Lore)
 auto=@each my firstmain:counter(0/0,1,Lore)
 aicode=activate donothing
-auto=_SCRY_(2)
+auto=_SCRY2_
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.2.Lore}=) chooseaname donothing chooseend
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) transforms((,newability[@movedto(*[lastnamechosen]|mystack) once:draw:1 controller])) ueot
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.4.Lore}) name(Look your top card) reveal:1 optionone name(Look your top card) target(*|reveal) doNothing optiononeend optiontwo all(*|reveal) moveto(mylibrary) optiontwoend revealend
@@ -51126,7 +51126,7 @@ name=Memory Drain
 target=*|stack
 auto=fizzle
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Counter target spell. Scry 2.
 mana={2}{U}{U}
 type=Instant
@@ -51326,7 +51326,7 @@ toughness=1
 name=Merfolk Falconer
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@movedTo(*[kicked>=1]|myStack):_SCRY_(2)
+auto=@movedTo(*[kicked>=1]|myStack):_SCRY2_
 text=Flying -- Whenever you cast a kicked spell, scry 2.
 mana={3}{U}{U}
 type=Creature
@@ -52349,7 +52349,7 @@ toughness=1
 name=Mischievous Chimera
 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=@movedto(*|mystack) restriction{opponentturnonly,thisturn(*|mystack)~equalto~0}:damage:1 opponent && _SCRY_(1)
+auto=@movedto(*|mystack) restriction{opponentturnonly,thisturn(*|mystack)~equalto~0}:damage:1 opponent && _SCRY1_
 text=Flying -- Whenever you cast your first spell during each opponent's turn, Mischievous Chimera deals 1 damage to each opponent. Scry 1.
 mana={U}{R}
 type=Enchantment Creature
@@ -53044,7 +53044,7 @@ toughness=2
 [card]
 name=Moonfolk Puzzlemaker
 abilities=flying
-auto=@tapped(this):_SCRY_(1)
+auto=@tapped(this):_SCRY1_
 text=Flying -- Whenever Moonfolk Puzzlemaker becomes tapped, scry 1.
 mana={2}{U}
 type=Artifact Creature
@@ -53817,7 +53817,7 @@ toughness=1
 [/card]
 [card]
 name=Myr Custodian
-auto=_SCRY_(2) && ability$!name(scry 1) scry:$c scrycore delayed dontshow donothing scrycoreend scryend!$ opponent
+auto=_SCRY2_ && ability$!name(scry 1) scry:$c scrycore delayed dontshow donothing scrycoreend scryend!$ opponent
 text=When Myr Custodian enters the battlefield, scry 2. Then each opponent may scry 1. (To scry X, that player looks at the top X cards of their library, then put any number of them on the bottom and the rest on top in any order.)
 mana={3}
 type=Artifact Creature
@@ -53968,7 +53968,7 @@ toughness=6
 [card]
 name=Mystic Redaction
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@each my upkeep:_SCRY_(1)
+auto=@each my upkeep:_SCRY1_
 auto=@discarded(*|myHand):deplete:2 opponent
 text=At the beginning of your upkeep, scry 1. -- Whenever you discard a card, each opponent mills two cards. (They put the top two cards of their library into their graveyard.)
 mana={2}{U}
@@ -55766,7 +55766,7 @@ name=No Escape
 target=*[creature;planeswalker]|stack
 auto=fizzleto(exile)
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Counter target creature or planeswalker spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. -- Scry 1.
 mana={2}{U}
 type=Instant
@@ -55846,7 +55846,7 @@ toughness=4
 [card]
 name=Norn's Wellspring
 auto=@movedTo(creature|graveyard) from(mybattlefield):counter(0/0,1,oil)
-auto=@movedTo(creature|graveyard) from(mybattlefield):_SCRY_(1)
+auto=@movedTo(creature|graveyard) from(mybattlefield):_SCRY1_
 auto={1}{T}{C(0/0,-2,oil)}:draw:1
 text=Whenever a creature you control dies, scry 1 and put an oil counter on Norn's Wellspring. -- {1}, {T}, Remove two oil counters from Norn's Wellspring: Draw a card.
 mana={1}{W}
@@ -56565,7 +56565,7 @@ toughness=8
 [card]
 name=Octoprophet
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Octoprophet enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}{U}
 type=Creature
@@ -56666,7 +56666,7 @@ type=Enchantment
 name=Oggyar Battle-Seer
 abilities=haste
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={T}:_SCRY_(1)
+auto={T}:_SCRY1_
 text=Haste -- {T}: Scry 1.
 mana={3}{U}{R}
 type=Creature
@@ -56762,7 +56762,7 @@ toughness=4
 [/card]
 [card]
 name=Oji, the Exquisite Blade
-auto=life:2 && _SCRY_(2)
+auto=life:2 && _SCRY2_
 auto=@movedto(*|mystack) restriction{thisturn(*|mystack)~equalto~1}:may target(creature|myBattlefield) moveto(exile) and!(moveto(ownerbattlefield))!
 text=When Oji, the Exquisite Blade enters the battlefield, you gain 2 life and scry 2. -- Whenever you cast your second spell each turn, exile up to one target creature you control, then return it to the battlefield under its owner's control.
 mana={2}{W}{U}
@@ -57003,7 +57003,7 @@ name=Omen of the Dead
 abilities=flash
 auto=moveto(myHand) target(creature|myGraveyard)
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={2}{W}{S}:_SCRY_(2)
+auto={2}{W}{S}:_SCRY2_
 text=Flash -- When Omen of the Dead enters the battlefield, return target creature card from your graveyard to your hand. -- {2}{B}, Sacrifice Omen of the Dead: Scry 2.
 mana={B}
 type=Enchantment
@@ -57013,7 +57013,7 @@ name=Omen of the Forge
 abilities=flash
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=damage:2 target(player,creature,planeswalker)
-auto={2}{R}{S}:_SCRY_(2)
+auto={2}{R}{S}:_SCRY2_
 text=Flash -- When Omen of the Forge enters the battlefield, it deals 2 damage to any target. -- {2}{R}, Sacrifice Omen of the Forge: Scry 2.
 mana={1}{R}
 type=Enchantment
@@ -57023,7 +57023,7 @@ name=Omen of the Hunt
 abilities=flash
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=may name(Search a basic land) target(land[basic]|mylibrary) moveto(myBattlefield) and!( transforms((,newability[tap(noevent)],newability[shuffle])) oneshot )!
-auto={2}{G}{S}:_SCRY_(2)
+auto={2}{G}{S}:_SCRY2_
 text=Flash -- When Omen of the Hunt enters the battlefield, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. -- {2}{G}, Sacrifice Omen of the Hunt: Scry 2.
 mana={2}{G}
 type=Enchantment
@@ -57033,7 +57033,7 @@ name=Omen of the Sea
 abilities=flash
 aicode=activate transforms((,newability[draw:1 controller])) oneshot
 auto=scry:2 scrycore delayed draw:1 controller scrycoreend scryend
-auto={2}{U}{S}:_SCRY_(2)
+auto={2}{U}{S}:_SCRY2_
 text=Flash -- When Omen of the Sea enters the battlefield, scry 2, then draw a card. -- {2}{U}, Sacrifice Omen of the Sea: Scry 2.
 mana={1}{U}
 type=Enchantment
@@ -57044,7 +57044,7 @@ abilities=flash
 auto=token(Soldier,Creature Human Soldier,1/1,white)*2
 auto=life:2 controller
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={2}{W}{S}:_SCRY_(2)
+auto={2}{W}{S}:_SCRY2_
 text=Flash -- When Omen of the Sun enters the battlefield, create two 1/1 white Human Soldier creature tokens and you gain 2 life. -- {2}{W}, Sacrifice Omen of the Sun: Scry 2.
 mana={2}{W}
 type=Enchantment
@@ -58268,7 +58268,7 @@ type=Sorcery
 name=Overwhelmed Apprentice
 auto=deplete:2 opponent
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Overwhelmed Apprentice enters the battlefield, each opponent puts the top two cards of their library into their graveyard. Then you scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={U}
 type=Creature
@@ -58391,7 +58391,7 @@ name=Pack's Betrayal
 target=creature
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=moveto(mybattlefield) and!( transforms((,newability[haste],newability[untap],newability[phaseaction[endofturn once sourceinplay] moveto(ownerbattlefield)])) ueot )!
-auto=if type(*[wolf;werewolf]|mybattlefield)~morethan~0 then name(Scry 2) name(Scry 2) _SCRY_(2)
+auto=if type(*[wolf;werewolf]|mybattlefield)~morethan~0 then name(Scry 2) name(Scry 2) _SCRY2_
 text=Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. If you control a Wolf or Werewolf, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={2}{R}
 type=Sorcery
@@ -58977,7 +58977,7 @@ auto=aslongas(*[iscommander&white]|myzones) {T}:name(Add white mana) name(Add wh
 auto=aslongas(*[iscommander&green]|myzones) {T}:name(Add green mana) name(Add green mana) transforms((,newability[add{G}],newability[if type(creature|myrestrictedcastingzone)~morethan~0 then counter(0/0.1.PathEffect)])) oneshot
 auto=aslongas(*[iscommander&blue]|myzones) {T}:name(Add blue mana) name(Add blue mana) transforms((,newability[add{U}],newability[if type(creature|myrestrictedcastingzone)~morethan~0 then counter(0/0.1.PathEffect)])) oneshot
 auto=aslongas(*[iscommander&black]|myzones) {T}:name(Add black mana) name(Add black mana) transforms((,newability[add{B}],newability[if type(creature|myrestrictedcastingzone)~morethan~0 then counter(0/0.1.PathEffect)])) oneshot
-auto=@movedto(creature|mybattlefield) restriction{compare(hascntpatheffect)~morethan~0}:name(Scry if share type) all(trigger[to]) name(Scry if share type) transforms((,newability[if type(*[iscommander&share!types!]|myzones)~morethan~0 then _SCRY_(1)])) oneshot
+auto=@movedto(creature|mybattlefield) restriction{compare(hascntpatheffect)~morethan~0}:name(Scry if share type) all(trigger[to]) name(Scry if share type) transforms((,newability[if type(*[iscommander&share!types!]|myzones)~morethan~0 then _SCRY1_])) oneshot
 auto=@movedto(creature|mybattlefield) restriction{compare(hascntpatheffect)~morethan~0}:name(Effect ends) removeallcounters(0/0.1.PathEffect)
 auto=@each endofturn restriction{compare(hascntpatheffect)~morethan~0}:name(Effect ends) removeallcounters(0/0.1.PathEffect)
 text=Path of Ancestry enters the battlefield tapped. -- {T}: Add one mana of any color in your commander's color identity. When that mana is spent to cast a creature spell that shares a creature type with your commander, scry 1.
@@ -59027,7 +59027,7 @@ type=Sorcery
 name=Path to the Festival
 flashback={4}{G}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Search basic land) target(land[basic]|mylibrary) moveto(myBattlefield) and!( transforms((,newability[tap(noevent)],newability[shuffle],newability[if compare(pbasiclandtypes)~morethan~2 then _SCRY_(1)])) oneshot
+auto=name(Search basic land) target(land[basic]|mylibrary) moveto(myBattlefield) and!( transforms((,newability[tap(noevent)],newability[shuffle],newability[if compare(pbasiclandtypes)~morethan~2 then _SCRY1_])) oneshot
 text=Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Then if there are three or more basic land types among lands you control, scry 1. (Lok at the top card of your library. You may put that card on the bottom of your library.) -- Flashback {4}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={2}{G}
 type=Sorcery
@@ -59282,9 +59282,9 @@ toughness=3
 [/card]
 [card]
 name=Peregrination
-auto=if type(land|myLibrary)~morethan~1 then choice name(Search two lands) name(Search two lands) target(land[basic]|mylibrary) moveto(mybattlefield) and!( transforms((,newability[tap(noevent)],newability[name(Search another land) target(land[basic]|mylibrary) moveto(myhand) and!( transforms((,newability[name(Scry 1) _SCRY_(1)])) oneshot )!])) oneshot )!
-auto=if type(land|myLibrary)~morethan~0 then choice name(Search one land) name(Search one land) target(land[basic]|mylibrary) moveto(mybattlefield) and!( tap(noevent) && _SCRY_(1) )!
-auto=choice name(Don't search any land) _SCRY_(1)
+auto=if type(land|myLibrary)~morethan~1 then choice name(Search two lands) name(Search two lands) target(land[basic]|mylibrary) moveto(mybattlefield) and!( transforms((,newability[tap(noevent)],newability[name(Search another land) target(land[basic]|mylibrary) moveto(myhand) and!( transforms((,newability[name(Scry 1) _SCRY1_])) oneshot )!])) oneshot )!
+auto=if type(land|myLibrary)~morethan~0 then choice name(Search one land) name(Search one land) target(land[basic]|mylibrary) moveto(mybattlefield) and!( tap(noevent) && _SCRY1_ )!
+auto=choice name(Don't search any land) _SCRY1_
 text=Search your library for up to two basic land cards, reveal those cards, and put one onto the battlefield tapped and the other into your hand. Shuffle your library, then scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{G}
 type=Sorcery
@@ -59303,7 +59303,7 @@ toughness=7
 [card]
 name=Perilous Voyage
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if type(*[-land;manacost<=2]|opponentBattlefield)~morethan~0 then choice name(Return permanent with manacost 2 or less) name(Return permanent with manacost 2 or less) target(*[-land;manacost<=2]|opponentBattlefield) moveto(ownerhand) && _SCRY_(2)
+auto=if type(*[-land;manacost<=2]|opponentBattlefield)~morethan~0 then choice name(Return permanent with manacost 2 or less) name(Return permanent with manacost 2 or less) target(*[-land;manacost<=2]|opponentBattlefield) moveto(ownerhand) && _SCRY2_
 auto=choice name(Return permanent with manacost 3 or more) target(*[-land;manacost>=3]|opponentBattlefield) moveto(ownerhand)
 text=Return target nonland permanent you don't control to its owner's hand. If its mana value was 2 or less, scry 2.
 mana={1}{U}
@@ -59891,7 +59891,7 @@ toughness=9
 [/card]
 [card]
 name=Phyrexian Vivisector
-auto=@movedTo(creature|graveyard) from(mybattlefield):_SCRY_(1)
+auto=@movedTo(creature|graveyard) from(mybattlefield):_SCRY1_
 text=Whenever a creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{B}
 type=Creature
@@ -59922,7 +59922,7 @@ type=Instant
 [card]
 name=Piercing Light
 target=creature[attacking;blocking]|battlefield
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 auto=damage:2
 text=Piercing Light deals 2 damage to target attacking or blocking creature. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={W}
@@ -60540,7 +60540,7 @@ name=Play with Fire
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=if type(creature|battlefield)~morethan~0 then choice name(Damage creature) name(Damage creature) damage:2 target(creature)
 auto=if type(planeswalker|battlefield)~morethan~0 then choice name(Damage planeswalker) name(Damage planeswalker) damage:2 target(planeswalker)
-auto=choice name(Damage player) damage:2 target(player) && _SCRY_(1)
+auto=choice name(Damage player) damage:2 target(player) && _SCRY1_
 text=Play with Fire deals 2 damage to any target. If a player is dealt damage this way, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={R}
 type=Instant
@@ -60666,7 +60666,7 @@ aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,n
 autohand=_FORETELL_
 autoexile={1}{B} restriction{compare(canforetellcast)~morethan~0}:name(Cast with foretell) name(Cast with foretell) activate castcard(alternative)
 auto=destroy
-auto=if paid(alternative) then _SCRY_(2)
+auto=if paid(alternative) then _SCRY2_
 text=Destroy target creature. If this spell was foretold, scry 2. -- Foretell {1}{B} (During your turn, you may pay {2} and exile this card from your hand face down. Cast it on a later turn for its foretell cost.)
 mana={1}{B}{B}
 type=Instant
@@ -61680,7 +61680,7 @@ toughness=2
 name=Prismari Campus
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=tap(noevent)
-auto={4}{T}:name(Scry 1) _SCRY_(1)
+auto={4}{T}:name(Scry 1) _SCRY1_
 auto={T}:add{R}
 auto={T}:add{U}
 text=Prismari Campus enters the battlefield tapped. -- {T}: Add {U} or {R}. -- {4}, {T}: Scry 1.
@@ -61747,7 +61747,7 @@ toughness=1
 name=Prison Realm
 auto=(blink)forsrc target(*[creature;planeswalker]|opponentbattlefield)
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=When Prison Realm enters the battlefield, exile target creature or planeswalker an opponent controls until Prison Realm leaves the battlefield. -- When Prison Realm enters the battlefield, scry 1.
 mana={2}{W}
 type=Enchantment
@@ -61755,7 +61755,7 @@ type=Enchantment
 [card]
 name=Prison Sentence
 target=creature
-auto=_SCRY_(2)
+auto=_SCRY2_
 auto=teach(creature) cantattack
 auto=teach(creature) cantpwattack
 auto=teach(creature) cantblock
@@ -61937,7 +61937,7 @@ toughness=3
 [card]
 name=Prophet of the Peak
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Prophet of the Peak enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={6}
 type=Artifact Creature
@@ -62237,7 +62237,7 @@ name=Psychic Impetus
 target=creature
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=teach(creature) transforms((,newability[2/2],newability[counter(0/0.1.Goaded)],newability[this(counter{0/0.1.Goaded}>0) mustattack]))
-auto=@combat(attacking) source(mytgt):name(Scry 2) _SCRY_(2)
+auto=@combat(attacking) source(mytgt):name(Scry 2) _SCRY2_
 text=Enchant creature -- Enchanted creature gets +2/+2 and is goaded. (It attacks each combat if able and attacks a player other than you if able.) -- Whenever enchanted creature attacks, you scry 2.
 mana={2}{U}
 type=Enchantment
@@ -62811,7 +62811,7 @@ toughness=2
 name=Quandrix Campus
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=tap(noevent)
-auto={4}{T}:name(Scry 1) _SCRY_(1)
+auto={4}{T}:name(Scry 1) _SCRY1_
 auto={T}:add{G}
 auto={T}:add{U}
 text=Quandrix Campus enters the battlefield tapped. -- {T}: Add {G} or {U}. -- {4}, {T}: Scry 1.
@@ -64657,7 +64657,7 @@ name=Reason // Believe
 abilities=hasaftermath
 flashback={4}{G} name(Believe)
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=ifnot paid(flashback) then _SCRY_(3)
+auto=ifnot paid(flashback) then _SCRY3_
 auto=if paid(flashback) then all(*[zpos=1]|mylibrary) moveTo(myhand) and!( if cantargetcard(*[creature]|*) then transforms((,newability[may name(Put on battlefield) moveto(myBattlefield)])) oneshot )!
 text=Scry 3. -- Aftermath (Cast this spell only from your graveyard. Then exile it.) Look at the top card of your library. You may put it onto the battlefield if it's a creature card. If you don't, put it into your hand.
 mana={U}
@@ -66437,7 +66437,7 @@ subtype=Trap
 name=Riddleform
 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(*[-creature]|mystack):may transforms((Sphinx Creature,setpower=3,settoughness=3,flying)) ueot
-auto={2}{U}:_SCRY_(1)
+auto={2}{U}:_SCRY1_
 text=Whenever you cast a noncreature spell, you may have Riddleform become a 3/3 Sphinx creature with flying in addition to its other types until end of turn. -- {2}{U}: Scry 1.
 mana={1}{U}
 type=Enchantment
@@ -67645,7 +67645,7 @@ toughness=2
 [/card]
 [card]
 name=Root Snare
-auto=preventAllcombatDamage ueotauto=preventAllcombatDamage ueot
+auto=preventAllcombatDamage ueot
 text=Prevent all combat damage that would be dealt this turn.
 mana={1}{G}
 type=Instant
@@ -67980,7 +67980,7 @@ name=Rubble Reading
 target=land
 auto=destroy
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Destroy target land. Scry 2.
 mana={3}{R}
 type=Sorcery
@@ -68204,7 +68204,7 @@ toughness=6
 [card]
 name=Rumbling Sentry
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=When Rumbling Sentry enters the battlefield, scry 1.
 mana={3}{W}{W}
 type=Creature
@@ -68459,7 +68459,7 @@ type=Sorcery
 [card]
 name=Runic Shot
 kicker={U}
-auto=if paid(kicker) then _SCRY_(2)
+auto=if paid(kicker) then _SCRY2_
 target=creature[tapped]
 auto=destroy
 text=Kicker {U} (You may pay an additional {U} as you cast this spell.) -- Destroy target tapped creature. If this spell was kicked, scry 2.
@@ -68846,7 +68846,7 @@ toughness=5
 [card]
 name=Sage's Row Savant
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Sage's Row Savant enters the battlefield, scry 2.
 mana={1}{U}
 type=Creature
@@ -69059,7 +69059,7 @@ subtype=Aura
 [/card]
 [card]
 name=Samite Herbalist
-auto=@tapped(this):name(Scry 1) transforms((,newability[life:1],newability[_SCRY_(1)]))
+auto=@tapped(this):name(Scry 1) transforms((,newability[life:1],newability[_SCRY1_]))
 text=Whenever Samite Herbalist becomes tapped, you gain 1 life and scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{W}
 type=Creature
@@ -69081,7 +69081,7 @@ target=creature
 auto=+2/+1
 auto=haste
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets +2/+1 and gains haste until end of turn. Scry 1.
 mana={R}
 type=Instant
@@ -70908,7 +70908,7 @@ type=Land
 [card]
 name=Season of Growth
 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(creature|mybattlefield):_SCRY_(1)
+auto=@movedto(creature|mybattlefield):_SCRY1_
 auto=@targeted(creature|myBattlefield) from(instant,sorcery|mystack):draw:1 controller
 auto=@targeted(creature|mybattlefield) from(*[instant;sorcery]|nonbattlezone,stack):draw:1 controller
 text=Whenever a creature enters the battlefield under your control, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- Whenever you cast a spell that targets a creature you control, draw a card.
@@ -71404,7 +71404,7 @@ toughness=4
 name=Senate Griffin
 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=_SCRY_(1)
+auto=_SCRY1_
 text=Flying -- When Senate Griffin enters the battlefield, scry 1.
 mana={2}{WU}{WU}
 type=Creature
@@ -71456,7 +71456,7 @@ type=Conspiracy
 [card]
 name=Sentinel Totem
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=When Sentinel Totem enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}, Exile Sentinel Totem: Exile all cards from all graveyards.
 mana={1}
 type=Artifact
@@ -71743,7 +71743,7 @@ toughness=2
 name=Serum Sovereign
 abilities=flying
 auto=@movedTo(*[-creature]|mystack):counter(0/0,1,oil)
-auto={U}{C(0/0,-1,oil)}:draw:1 && _SCRY_(2)
+auto={U}{C(0/0,-1,oil)}:draw:1 && _SCRY2_
 text=Flying -- Whenever you cast a noncreature spell, put an oil counter on Serum Sovereign. -- {U}, Remove an oil counter from Serum Sovereign: Draw a card, then scry 2.
 mana={4}{U}
 type=Creature
@@ -72511,7 +72511,7 @@ name=Sheltering Light
 target=creature
 auto=indestructible
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gains indestructible until end of turn. Scry 1. (Damage and effects that say "destroy" don't destroy the creature.)
 mana={W}
 type=Instant
@@ -73742,7 +73742,7 @@ mana={1}
 name=Silver Raven
 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=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Flying -- When Silver Raven enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={U}
 type=Artifact Creature
@@ -73839,7 +73839,7 @@ toughness=2
 name=Silverquill Campus
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=tap(noevent)
-auto={4}{T}:name(Scry 1) _SCRY_(1)
+auto={4}{T}:name(Scry 1) _SCRY1_
 auto={T}:add{B}
 auto={T}:add{W}
 text=Silverquill Campus enters the battlefield tapped. -- {T}: Add {W} or {B}. -- {4}, {T}: Scry 1.
@@ -74963,8 +74963,7 @@ toughness=1
 [card]
 name=Skyrider Patrol
 abilities=flying
-auto=@each my combatbegins:may pay({g}{u}):target(other creature|myBattlefield) counter(1/1) and!(flying)!
-#&& flying ueot
+auto=@each my combatbegins:may pay({g}{u}):target(other creature|myBattlefield) transforms((,newability[counter(1/1)],newability[flying])) ueot
 text=Flying -- At the beginning of combat on your turn, you may pay {G}{U}. When you do, put a +1/+1 counter on another target creature you control, and that creature gains flying until end of turn.
 mana={2}{G}{U}
 type=Creature
@@ -75629,7 +75628,7 @@ target=creature
 auto=doesnotuntap
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=if type(*[token]|myBattlefield)~morethan~0 then teach(creature) tap
-auto=if type(*[token]|myBattlefield)~morethan~0 then _SCRY_(2)
+auto=if type(*[token]|myBattlefield)~morethan~0 then _SCRY2_
 text=Enchant creature -- When So Shiny enters the battlefield, if you control a token, tap enchanted creature, then scry 2. -- Enchanted creature doesn't untap during its controller's untap step.
 mana={2}{U}
 type=Enchantment
@@ -77166,9 +77165,9 @@ toughness=5
 [card]
 name=Sphinx of Foresight
 abilities=flying
-autohand=@each upkeep restriction{compare(currentturn)~lessthan~2}:may name(Reveal Sphinx of Foresight) _SCRY_(3)
+autohand=@each upkeep restriction{compare(currentturn)~lessthan~2}:may name(Reveal Sphinx of Foresight) _SCRY3_
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@each my upkeep:_SCRY_(1)
+auto=@each my upkeep:_SCRY1_
 text=You may reveal this card from your opening hand. If you do, scry 3 at the beginning of your first upkeep. -- Flying -- At the beginning of your upkeep, scry 1.
 mana={2}{U}{U}
 type=Creature
@@ -77370,7 +77369,7 @@ toughness=4
 name=Spined Megalodon
 abilities=opponentshroud
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_ATTACKING__SCRY_(1)
+auto=_ATTACKING__SCRY1_
 text=Hexproof (This creature can't be the target of spells or abilities your opponents control.) -- Whenever Spined Megalodon attacks, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={5}{U}{U}
 type=Creature
@@ -79012,7 +79011,7 @@ toughness=1
 [card]
 name=Stonebound Mentor
 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(*|mybattlefield,mystack,myhand,mylibrary,mysideboard,myexile,mycommandzone) from(mygraveyard):name(Scry 1) _SCRY_(1)
+auto=@movedto(*|mybattlefield,mystack,myhand,mylibrary,mysideboard,myexile,mycommandzone) from(mygraveyard):name(Scry 1) _SCRY1_
 text=Whenever one or more cards leave your graveyard, scry 1.
 mana={1}{R}{W}
 type=Creature
@@ -79219,7 +79218,7 @@ target=creature
 auto=first strike
 auto=+1/+0
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets +1/+0 and gains first strike until end of turn. Scry 1.
 mana={R}
 type=Instant
@@ -79394,7 +79393,7 @@ aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,n
 anyzone=@movedTo(*[instant;sorcery]|mystack) once:changecost(colorless:-2) ueot forcedalive
 anyzone=@movedTo(*[instant;sorcery]|mystack) once:altercost(blue:-1) ueot forcedalive
 auto=@movedTo(*[-creature]|mystack):1/1 ueot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=This spell costs {2}{U} less to cast if you've cast an instant or sorcery spell this turn. -- Flying -- Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.) -- When Stormwing Entity enters the battlefield, scry 2.
 mana={3}{U}{U}
 type=Creature
@@ -80260,7 +80259,7 @@ name=Sunset Pyramid
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=counter(0/0,3,brick)
 auto={2}{T}{counter(0/0,-1,brick)}:name(Draw 1) draw:1 controller
-auto={2}{T}:name(Scry 1) _SCRY_(1)
+auto={2}{T}:name(Scry 1) _SCRY1_
 text=Sunset Pyramid enters the battlefield with three brick counters on it. -- {2}, {T}, Remove a brick counter from Sunset Pyramid: Draw a card. -- {2}, {T}: Scry 1.
 mana={2}
 type=Artifact
@@ -80537,14 +80536,14 @@ name=Surtland Frostpyre
 auto=tap(noevent)
 auto={T}:add{R}
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={2}{U}{U}{R}{T}{S}:_SCRY_(2) && damage:2 all(creature|battlefield) asSorcery
+auto={2}{U}{U}{R}{T}{S}:_SCRY2_ && damage:2 all(creature|battlefield) asSorcery
 text=Surtland Frostpyre enters the battlefield tapped. -- {T}: Add {R}. -- {2}{U}{U}{R}, {T}, Sacrifice Surtland Frostpyre: Scry 2. Surtland Frostpyre deals 2 damage to each creature. Activate this ability only any time you could cast a sorcery.
 type=Land
 [/card]
 [card]
 name=Survivor of Korlis
 abilities=first strike
-autograveyard={1}{W}{E}:_SCRY_(2)
+autograveyard={1}{W}{E}:_SCRY2_
 text=First strike -- {1}{W}, Exile Survivor of Korlis from your graveyard: Scry 2.
 mana={W}
 type=Creature
@@ -80980,7 +80979,7 @@ toughness=3
 [card]
 name=Sylvan Anthem
 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(creature[green]|myBattlefield):name(Scry 1) _SCRY_(1)
+auto=@movedTo(creature[green]|myBattlefield):name(Scry 1) _SCRY1_
 auto=lord(creature[green]|myBattlefield) 1/1
 text=Green creatures you control get +1/+1. -- Whenever a green creature enters the battlefield under your control, scry 1.
 mana={G}{G}
@@ -81272,7 +81271,7 @@ auto=@movedTo(myGraveyard) from(other creature|*):damage:1 opponent
 auto=@movedTo(opponentGraveyard) from(other creature|*):damage:1 opponent
 auto=@movedTo(myHand) from(creature|myGraveyard):damage:1 opponent
 auto=@movedTo(myLibrary) from(creature|myGraveyard):damage:1 opponent
-auto=@movedTo(exile) from(creature|myGraveyard):damage:1 opponent
+auto=@movedTo(creature|anyzone) from(myGraveyard):damage:1 opponent
 auto={1}{B}:deplete:1 && deplete:1 opponent
 text=Whenever another creature dies, or a creature card is put into a graveyard from anywhere other than the battlefield, or a creature card leaves your graveyard, Syr Konrad, the Grim deals 1 damage to each opponent. -- {1}{B}: Each player puts the top card of their library into their graveyard.
 mana={3}{B}{B}
@@ -82184,7 +82183,7 @@ toughness=5
 [card]
 name=Tectonic Reformation
 abilities=cycling
-auto=lord(land|myhand) transform((newability[__CYLCLING__({R})]))
+auto=lord(land|myhand) transforms((,newability[{R}{cycle}:name(cycling) draw:1]))
 autohand=__CYCLING__({2})
 text=Each land card in your hand has cycling {R}. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{R}
@@ -82555,7 +82554,7 @@ toughness=2
 name=Tenth District Legionnaire
 abilities=haste
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_HEROIC_counter(1/1) && _SCRY_(1)
+auto=_HEROIC_counter(1/1) && _SCRY1_
 text=Haste -- Whenever you cast a spell that targets Tenth District Legionnaire, put a +1/+1 counter on Tenth District Legionnaire, then scry 1.
 mana={R}{W}
 type=Creature
@@ -82998,7 +82997,7 @@ type=Artifact
 name=Thaumaturge's Familiar
 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=_SCRY_(1)
+auto=_SCRY1_
 text=Flying -- When Thaumaturge's Familiar enters the battlefield, scry 1.
 mana={3}
 type=Artifact Creature
@@ -84679,7 +84678,7 @@ type=Land
 [/card]
 [card]
 name=Tidepool Turtle
-auto={2}{U}:_SCRY_(1)
+auto={2}{U}:_SCRY1_
 text={2}{U}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{U}
 type=Creature
@@ -85114,7 +85113,7 @@ toughness=11
 [card]
 name=Titans' Nest
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@each my upkeep:_SCRY_(1)
+auto=@each my upkeep:_SCRY1_
 auto={E(*|myGraveyard)}:Add{C}
 text=At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard. -- Exile a card from your graveyard: Add Colorless . Spend this mana only to cast a colored spell without Variable Colorless in its mana cost.
 mana={1}{B}{G}{U}
@@ -86227,7 +86226,7 @@ type=Land
 [card]
 name=Treasure Map
 aicode=activate transforms((,newability[all(*[zpos<=type:zombie:mybattlefield]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={1}{T}:_SCRY_(1) && counter(0/0,1,landmark)
+auto={1}{T}:_SCRY1_ && counter(0/0,1,landmark)
 auto=@counteradded(0/0,1,landmark) from(this):this(counter{0/0.3.landmark}=) removeallcounters(0/0.1.landmark) && flip(Treasure Cove) && token(Treasure Sur)*3
 text={1}, {T}: Scry 1. Put a landmark counter on Treasure Map. Then if there are three or more landmark counters on it, remove those counters, transform Treasure Map, and create three colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
 mana={2}
@@ -86327,7 +86326,7 @@ toughness=2
 [/card]
 [card]
 name=Trelasarra, Moon Dancer
-auto=@lifeof(player) from(*[-lifefaker]|*):counter(1/1) && _SCRY_(1)
+auto=@lifeof(player) from(*[-lifefaker]|*):counter(1/1) && _SCRY1_
 text=Whenever you gain life, put a +1/+1 counter on Trelasarra, Moon Dancer and scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={G}{W}
 type=Legendary Creature
@@ -86613,7 +86612,7 @@ type=Instant
 name=True Polymorph
 target=artifact,creature
 auto=counter(0/0.1.PolymorphEffect)
-auto=name(Choose the card to transform) target(other *[creature;artifact]|battlefield) transforms((,newability[all(*[counter{0/0.1.PolymorphEffect}]|battlefield) copy],newability[all(*[counter{0/0.1.PolymorphEffect}]|battlefield) removeallcounters(0/0.1.PolymorphEffect)])) forever
+auto=name(becomes the first chosen) target(other *[creature;artifact]|battlefield) transforms((,newability[all(*[counter{0/0.1.PolymorphEffect}]|battlefield) copy],newability[all(*[counter{0/0.1.PolymorphEffect}]|battlefield) removeallcounters(0/0.1.PolymorphEffect)])) forever
 text=Target artifact or creature becomes a copy of another target artifact or creature.
 mana={4}{U}{U}
 type=Instant
@@ -87474,7 +87473,7 @@ name=Unblinking Bleb
 facedown={3}
 autofacedown={2}{U}:morph
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-autofaceup=may name(Scry 2) _SCRY_(2)
+autofaceup=may name(Scry 2) _SCRY2_
 text=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.) -- Whenever Unblinking Bleb or another permanent is turned face up, you may scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}{U}
 type=Creature
@@ -87644,7 +87643,7 @@ toughness=3
 [card]
 name=Undercity Scavenger
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=may name(Sacrifice Creature) sacrifice notatarget(other creature|mybattlefield) and!( all(this) counter(1/1,2) && _SCRY_(2) )!
+auto=may name(Sacrifice Creature) sacrifice notatarget(other creature|mybattlefield) and!( all(this) counter(1/1,2) && _SCRY2_ )!
 text=When Undercity Scavenger enters the battlefield, you may sacrifice another creature. If you do, put two +1/+1 counters on Undercity Scavenger, then scry 2.
 mana={3}{B}
 type=Creature
@@ -87887,7 +87886,7 @@ type=Instant
 [card]
 name=Unexplained Vision
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if casted(this) then if spent({U}{U}{U}) then _SCRY_(3)
+auto=if casted(this) then if spent({U}{U}{U}) then _SCRY3_
 auto=draw:3 controller
 text=Draw three cards. -- Adamant - If at least three blue mana was spent to cast this spell, scry 3.
 mana={4}{U}
@@ -91324,7 +91323,7 @@ toughness=5
 name=Wall of Runes
 abilities=defender
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Defender -- When Wall of Runes enters the battlefield, scry 1.
 mana={U}
 type=Creature
@@ -91734,7 +91733,7 @@ toughness=1
 [card]
 name=Warteye Witch
 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(creature|graveyard) from(mybattlefield):_SCRY_(1)
+auto=@movedTo(creature|graveyard) from(mybattlefield):_SCRY1_
 text=Whenever Warteye Witch or another creature you control dies, scry 1.
 mana={2}{B}
 type=Creature
@@ -93234,7 +93233,7 @@ type=Instant
 [card]
 name=Witching Well
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 auto={3}{U}{S}:draw:2 controller
 text=When Witching Well enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.) -- {3}{U}, Sacrifice Witching Well: Draw two cards.
 mana={U}
@@ -93262,7 +93261,7 @@ toughness=2
 name=Witherbloom Campus
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=tap(noevent)
-auto={4}{T}:name(Scry 1) _SCRY_(1)
+auto={4}{T}:name(Scry 1) _SCRY1_
 auto={T}:add{B}
 auto={T}:add{G}
 text=Witherbloom Campus enters the battlefield tapped. -- {T}: Add {B} or {G}. -- {4}, {T}: Scry 1.
@@ -93316,7 +93315,7 @@ type=Instant
 name=Witness of Tomorrows
 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={3}{U}:_SCRY_(1)
+auto={3}{U}:_SCRY1_
 text=Flying -- {3}{U}: Scry 1.
 mana={4}{U}
 type=Enchantment Creature
@@ -93419,7 +93418,7 @@ toughness=3
 name=Woe Strider
 auto=token(Goat,Creature Goat,0/1,white)
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={S(other creature|myBattlefield}:_SCRY_(1)
+auto={S(other creature|myBattlefield}:_SCRY1_
 retrace={3}{B}{B}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)}{E(other *|myGraveyard)} name(Escape)
 auto=if paid(retrace) then counter(1/1,2)
 text=When Woe Strider enters the battlefield, create a 0/1 white Goat creature token. -- Sacrifice another creature: Scry 1. -- Escape-{3}{B}{B}, Exile four other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.) -- Woe Strider escapes with two +1/+1 counters on it.
@@ -93968,7 +93967,7 @@ subtype=Island Swamp Mountain
 [card]
 name=Xantcha, Sleeper Agent
 auto=moveto(opponentBattlefield)
-auto=this(cantattack)
+auto=cantattack
 auto={3}:life:-2 controller && draw:1 opponent
 text=Xantcha, Sleeper Agent enters the battlefield under the control of an opponent of your choice. -- Xantcha attacks each combat if able and can't attack its owner or planeswalkers its owner controls. -- {3}: Xantcha's controller loses 2 life and you draw a card. Any player may activate this ability.
 mana={1}{B}{R}
@@ -94011,7 +94010,8 @@ toughness=2
 [card]
 name=Xyris, the Writhing Storm
 abilities=flying
-auto=@drawfoeof(player):token(Snake Xyr)
+auto=@drawfoeof(player) restriction{opponentturnonly,compare(odrewcount)~morethan~1}:token(Snake Xyr)
+auto=@drawfoeof(player) restriction{myturnonly}:token(Snake Xyr)
 auto=@damagefoeof(player) from(this):draw:storedpower controller && draw:storedpower opponent
 text=Flying -- Whenever an opponent draws a card except the first one they draw in each of their draw steps, create a 1/1 green Snake creature token. -- Whenever Xyris, the Writhing Storm deals combat damage to a player, you and that player each draw that many cards.
 mana={2}{G}{U}{R}
@@ -94535,7 +94535,7 @@ toughness=9
 [card]
 name=Zaffai, Thunder Conductor
 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(*[instant;sorcery]|mystack):_SCRY_(1)
+auto=@movedto(*[instant;sorcery]|mystack):_SCRY1_
 auto=@movedto(instant[manacost>=5]|mystack):token(Elemental,Creature Elemental,4/4,blue,red)
 auto=@movedto(sorcery[manacost>=5]|mystack):token(Elemental,Creature Elemental,4/4,blue,red)
 auto=@movedto(instant[manacost>=10]|mystack):damage:10 opponent
@@ -94825,7 +94825,7 @@ type=Instant
 [card]
 name=Zhalfirin Void
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 auto={T}:Add{C}
 text=When Zhalfirin Void enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {C}.
 type=Land
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index c8c784f26..65d7fc743 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1361,7 +1361,7 @@ toughness=2
 name=Aether Theorist
 auto=alterenergy:3 controller
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={t}{e:1}:_SCRY_(1)
+auto={t}{e:1}:_SCRY1_
 text=When Aether Theorist enters the battlefield, you get {E}{E}{E} (three energy counters). -- {T}, Pay {E}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{U}
 type=Creature
@@ -3467,7 +3467,7 @@ name=Anchor to the Aether
 target=creature
 auto=moveto(ownerlibrary)
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Put target creature on top of its owner's library. 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=Sorcery
@@ -4659,7 +4659,7 @@ toughness=0
 name=Aqueous Form
 target=creature
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@combat(attacking) source(mytgt):_SCRY_(1)
+auto=@combat(attacking) source(mytgt):_SCRY1_
 auto=teach(creature) unblockable
 text=Enchant creature -- Enchanted creature can't be blocked. -- Whenever enchanted creature attacks, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={U}
@@ -6210,7 +6210,7 @@ name=Artisan's Sorrow
 target=*[artifact;enchantment]
 auto=destroy
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Destroy target artifact or enchantment. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}{G}
 type=Instant
@@ -6925,7 +6925,7 @@ toughness=2
 name=Augury Owl
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(3)
+auto=_SCRY3_
 text=Flying -- When Augury Owl enters the battlefield, scry 3. (To scry 3, look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={1}{U}
 type=Creature
@@ -7710,8 +7710,8 @@ toughness=3
 [/card]
 [card]
 name=Aven Shrine
-auto=lord(*|opponentgraveyard) transforms((,newability[@movedTo(*[share!name!]|mystack):life:1 controller)]))
-auto=lord(*|opponentgraveyard) transforms((,newability[@movedTo(*[share!name!]|opponentstack):life:1 opponent)]))
+auto=lord(*|opponentgraveyard) transforms((,newability[@movedTo(*[share!name!]|mystack):life:1 controller]))
+auto=lord(*|opponentgraveyard) transforms((,newability[@movedTo(*[share!name!]|opponentstack):life:1 opponent]))
 auto=lord(*|mygraveyard) transforms((,newability[@movedTo(*[share!name!]|mystack):life:1 controller)]))
 auto=lord(*|mygraveyard) transforms((,newability[@movedTo(*[share!name!]|opponentstack):life:1 opponent]))
 text=Whenever a player casts a spell, that player gains X life, where X is the number of cards in all graveyards with the same name as that spell.
@@ -9893,7 +9893,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=_HEROIC_counter(1/1) && _SCRY_(1)
+auto=_HEROIC_counter(1/1) && _SCRY1_
 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
@@ -9906,7 +9906,7 @@ name=Battlewise Valor
 target=creature
 auto=+2/+2 ueot
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets +2/+2 until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{W}
 type=Instant
@@ -13455,7 +13455,7 @@ name=Bolt of Keranos
 target=creature,player
 auto=damage:3
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Bolt of Keranos deals 3 damage to target creature or player. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{R}{R}
 type=Sorcery
@@ -14326,11 +14326,11 @@ type=Instant
 name=Brain in a Jar
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto={1}{T}:counter(0/0,1,Charge) && transforms((,newability[target(*[instant;sorcery;manacost=counter{0%0.1.charge}]|myhand) castcard(normal)])) oneshot
-auto={3}{T}{c(0/0,-1,Charge)}:name(Scry 1) _SCRY_(1)
-auto={3}{T}{c(0/0,-2,Charge)}:name(Scry 2) _SCRY_(2)
-auto={3}{T}{c(0/0,-3,Charge)}:name(Scry 3) _SCRY_(3)
-auto={3}{T}{c(0/0,-4,Charge)}:name(Scry 4) _SCRY_(4)
-auto={3}{T}{c(0/0,-5,Charge)}:name(Scry 5) _SCRY_(5)
+auto={3}{T}{c(0/0,-1,Charge)}:name(Scry 1) _SCRY1_
+auto={3}{T}{c(0/0,-2,Charge)}:name(Scry 2) _SCRY2_
+auto={3}{T}{c(0/0,-3,Charge)}:name(Scry 3) _SCRY3_
+auto={3}{T}{c(0/0,-4,Charge)}:name(Scry 4) _SCRY4_
+auto={3}{T}{c(0/0,-5,Charge)}:name(Scry 5) _SCRY5_
 auto={3}{T}{c(0/0,-6,Charge)}:name(Scry 6) _SCRY_(6)
 auto={3}{T}{c(0/0,-7,Charge)}:name(Scry 7) _SCRY_(7)
 auto={3}{T}{c(0/0,-8,Charge)}:name(Scry 8) _SCRY_(8)
@@ -17456,7 +17456,7 @@ name=Catacomb Sifter
 abilities=devoid
 auto=choice token(Eldrazi Scion,Creature Eldrazi Scion,1/1) and!( transforms((,newability[{S}:Add{C}])) forever )! controller
 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(other creature|graveyard) from(myBattlefield):name(Scry 1) _SCRY_(1)
+auto=@movedTo(other creature|graveyard) from(myBattlefield):name(Scry 1) _SCRY1_
 text=Devoid (This card has no color.) -- When Catacomb Sifter enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." -- Whenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{B}{G}
 type=Creature
@@ -19583,7 +19583,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=_HEROIC_counter(1/1) && name(Scry 1) _SCRY_(1)
+auto=_HEROIC_counter(1/1) && name(Scry 1) _SCRY1_
 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
@@ -21802,7 +21802,7 @@ name=Condescend
 target=*|stack
 auto=transforms((,newability[pay[[{value:storedx}]] name(pay {value} mana) donothing?fizzle])) forever
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Counter target spell unless its controller pays {X}. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={X}{U}
 type=Instant
@@ -22284,7 +22284,7 @@ type=Sorcery
 name=Contraband Kingpin
 abilities=lifelink
 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(artifact|mybattlefield):_SCRY_(1)
+auto=@movedTo(artifact|mybattlefield):_SCRY1_
 text=Lifelink -- Whenever an artifact enters the battlefield under your control, scry 1.
 mana={U}{B}
 type=Creature
@@ -24163,7 +24163,7 @@ name=Cruel Finality
 target=creature
 auto=-2/-2 ueot
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets -2/-2 until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={2}{B}
 type=Instant
@@ -24580,7 +24580,7 @@ type=Enchantment
 [card]
 name=Crystal Ball
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={1}{T}:_SCRY_(2)
+auto={1}{T}:_SCRY2_
 text={1}, {T}: Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}
 type=Artifact
@@ -30064,7 +30064,7 @@ type=Instant
 [card]
 name=Disowned Ancestor
 auto={1}{B}{T}:counter(1/1) asSorcery
-text=Outlast {1}{B}, {T}: Put a +1/+1 counter on this creature. Outlast only as a sorcery.)
+text=Outlast ({1}{B}, {T}: Put a +1/+1 counter on this creature. Outlast only as a sorcery.)
 mana={B}
 type=Creature
 subtype=Spirit Warrior
@@ -30209,7 +30209,7 @@ name=Dissolve
 target=*|stack
 auto=fizzle
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Counter target spell. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{U}{U}
 type=Instant
@@ -32480,7 +32480,7 @@ type=Instant
 name=Drown in Sorrow
 auto=all(creature) -2/-2 ueot
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=All creatures get -2/-2 until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{B}{B}
 type=Sorcery
@@ -38256,7 +38256,7 @@ type=Instant
 [card]
 name=Eyes of the Watcher
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@movedto(*[instant;sorcery]|mystack):target(trigger[to]<1>) pay[[{U}{R}]] _SCRY_(2)
+auto=@movedto(*[instant;sorcery]|mystack):target(trigger[to]<1>) pay[[{U}{R}]] _SCRY2_
 text=Whenever you cast an instant or sorcery spell, you may pay {1}. If you do, scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={2}{U}
 type=Enchantment
@@ -39197,7 +39197,7 @@ name=Fated Conflagration
 target=creature,planeswalker
 auto=damage:5
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY_(2)
+auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY2_
 text=Fated Conflagration deals 5 damage to target creature or planeswalker. If it's your turn, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={1}{R}{R}{R}
 type=Instant
@@ -39207,7 +39207,7 @@ name=Fated Infatuation
 target=creature|mybattlefield
 auto=clone
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY_(2)
+auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY2_
 text=Create a token that's a copy of target creature you control. If it's your turn, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={U}{U}{U}
 type=Instant
@@ -39216,7 +39216,7 @@ type=Instant
 name=Fated Intervention
 auto=token(Centaur,Enchantment Creature Centaur,3/3,green)*2 controller
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY_(2)
+auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY2_
 text=Put two 3/3 green Centaur enchantment creature tokens onto the battlefield. If it's your turn, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={2}{G}{G}{G}
 type=Instant
@@ -39225,7 +39225,7 @@ type=Instant
 name=Fated Retribution
 auto=all(creature,planeswalker) destroy
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY_(2)
+auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY2_
 text=Destroy all creatures and planeswalkers. If it's your turn, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={4}{W}{W}{W}
 type=Instant
@@ -39236,7 +39236,7 @@ target=creature|mygraveyard
 auto=moveto(mybattlefield)
 auto=transforms((,indestructible)) forever
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY_(2)
+auto=if compare(restriction{myturnonly}~morethan~0) then _SCRY2_
 text=Put target creature card from a graveyard onto the battlefield under your control. It gains indestructible. If it's your turn, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={4}{B}{B}{B}
 type=Instant
@@ -39910,7 +39910,7 @@ name=Ferocious Charge
 target=creature
 auto=4/4
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Target creature gets +4/+4 until end of turn. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={2}{G}
 type=Instant
@@ -45007,7 +45007,7 @@ toughness=2
 name=Geist of the Archives
 abilities=defender
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@each my upkeep:_SCRY_(1)
+auto=@each my upkeep:_SCRY1_
 text=Defender -- At the beginning of your upkeep, 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=Creature
@@ -46753,8 +46753,8 @@ toughness=2
 [card]
 name=Glassblower's Puzzleknot
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2) && ability$!choice alterenergy:2 controller!$ controller
-auto={2}{U}{S}:_SCRY_(2) && ability$!choice alterenergy:2 controller!$ controller
+auto=_SCRY2_ && ability$!choice alterenergy:2 controller!$ controller
+auto={2}{U}{S}:_SCRY2_ && ability$!choice alterenergy:2 controller!$ controller
 text=When Glassblower's Puzzleknot enters the battlefield, scry 2, then you get {E}{E}. (You get two energy counters. To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.) -- {2}{U}, Sacrifice Glassblower's Puzzleknot: Scry 2, then you get {E}{E}.
 mana={2}
 type=Artifact
@@ -48622,11 +48622,11 @@ type=Legendary Land
 name=Gods Willing
 target=creature|mybattlefield
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=choice name(green) transforms((,newability[protection from green],newability[choice _SCRY_(1)])) ueot
-auto=choice name(red) transforms((,newability[protection from red],newability[choice _SCRY_(1)])) ueot
-auto=choice name(blue) transforms((,newability[protection from blue],newability[choice _SCRY_(1)])) ueot
-auto=choice name(black) transforms((,newability[protection from black],newability[choice _SCRY_(1)])) ueot
-auto=choice name(white) transforms((,newability[protection from white],newability[choice _SCRY_(1)])) ueot
+auto=choice name(green) transforms((,newability[protection from green],newability[choice _SCRY1_])) ueot
+auto=choice name(red) transforms((,newability[protection from red],newability[choice _SCRY1_])) ueot
+auto=choice name(blue) transforms((,newability[protection from blue],newability[choice _SCRY1_])) ueot
+auto=choice name(black) transforms((,newability[protection from black],newability[choice _SCRY1_])) ueot
+auto=choice name(white) transforms((,newability[protection from white],newability[choice _SCRY1_])) ueot
 text=Target creature you control gains protection from the color of your choice until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={W}
 type=Instant
@@ -52561,9 +52561,9 @@ type=Sorcery
 [card]
 name=Harsh Scrutiny
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if type(*|opponenthand)~morethan~0 then if type(creature|opponenthand)~equalto~0 then name(Look opponent hand) name(Look opponent hand) name(Look opponent hand) target(*|opponenthand) moveto(myreveal) and!( moveto(opponenthand) and!( name(Scry 1) _SCRY_(1) )! )!
-auto=if type(*|opponenthand)~morethan~0 then if type(creature|opponenthand)~morethan~0 then name(Choose a creature) name(Choose a creature) name(Choose a creature) target(creature|opponenthand) reject and!( name(Scry 1) _SCRY_(1) )!
-auto=if type(*|opponenthand)~equalto~0 then name(Scry 1) name(Scry 1) _SCRY_(1)
+auto=if type(*|opponenthand)~morethan~0 then if type(creature|opponenthand)~equalto~0 then name(Look opponent hand) name(Look opponent hand) name(Look opponent hand) target(*|opponenthand) moveto(myreveal) and!( moveto(opponenthand) and!( name(Scry 1) _SCRY1_ )! )!
+auto=if type(*|opponenthand)~morethan~0 then if type(creature|opponenthand)~morethan~0 then name(Choose a creature) name(Choose a creature) name(Choose a creature) target(creature|opponenthand) reject and!( name(Scry 1) _SCRY1_ )!
+auto=if type(*|opponenthand)~equalto~0 then name(Scry 1) name(Scry 1) _SCRY1_
 text=Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card. Scry 1.
 mana={B}
 type=Sorcery
@@ -53501,7 +53501,7 @@ toughness=2
 name=Hedron Alignment
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=@each my upkeep:aslongas(Hedron Alignment|myhand) aslongas(Hedron Alignment|mygraveyard) aslongas(Hedron Alignment|myexile) aslongas(Hedron Alignment|mybattlefield) wingame controller
-auto={1}{u}:name(Scry 1) _SCRY_(1)
+auto={1}{u}:name(Scry 1) _SCRY1_
 text=Hexproof -- At the beginning of your upkeep, you may reveal your hand. If you do, you win the game if you own a card named Hedron Alignment in exile, in your hand, in your graveyard, and on the battlefield. -- {1}{U}: Scry 1.
 mana={2}{U}
 type=Enchantment
@@ -54191,7 +54191,7 @@ name=Hermit of the Natterknolls
 backside=Lone Wolf of the Natterknolls
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(backside)
-auto=@movedTo(*|opponentstack) restriction{during opponent turn}:name(Draw a card) draw:1
+auto=@movedTo(*|opponentstack) restriction{myturnonly}:name(Draw a card) draw:1
 auto=@each upkeep restriction{lastturn(*|stack)~lessthan~1}:name(Transform Human Werewolf) flip(backside)
 text=Whenever an opponent casts a spell during your turn, draw a card. -- At the beginning of each upkeep, if no spells were cast last turn, transform Hermit of the Natterknolls. // Lone Wolf of the Natterknolls
 mana={2}{G}
@@ -54481,7 +54481,7 @@ type=Enchantment
 name=Hidden Stockpile
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=@each my end restriction{revolt}:_SERVOTOKEN_
-auto={1}{S(creature|mybattlefield)}:_SCRY_(1)
+auto={1}{S(creature|mybattlefield)}:_SCRY1_
 text=Revolt -- At the beginning of your end step, if a permanent you controlled left the battlefield this turn, create a 1/1 colorless Servo artifact creature token. -- {1}, Sacrifice a creature: Scry 1.
 mana={W}{B}
 type=Enchantment
@@ -55528,7 +55528,7 @@ toughness=1
 name=Horizon Scholar
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Flying -- When Horizon Scholar enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={5}{U}
 type=Creature
@@ -59758,7 +59758,7 @@ toughness=1
 name=Jace's Sanctum
 auto=lord(*[instant;sorcery]|mycastingzone) altercost(colorless, -1)
 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(instant,sorcery|mystack):_SCRY_(1)
+auto=@movedTo(instant,sorcery|mystack):_SCRY1_
 text=Instant and sorcery spells you cast cost {1} less to cast. -- Whenever you cast an instant or sorcery spell, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{U}
 type=Enchantment
@@ -65515,7 +65515,7 @@ type=Artifact
 [card]
 name=Land Tax
 aicode=activate target(<upto:3>land[basic]|mylibrary) moveto(myhand)
-auto=@each my upkeep restriction{control less lands}:name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<upto:3>land[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=@each my upkeep restriction{control less lands}:may name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<upto:3>land[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
 text=At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, and put them into your hand. If you do, shuffle your library.
 mana={W}
 type=Enchantment
@@ -66899,7 +66899,7 @@ toughness=4
 [card]
 name=Lifecrafter's Bestiary
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@each my upkeep:_SCRY_(1)
+auto=@each my upkeep:_SCRY1_
 auto=@movedto(creature|mystack):pay({G}) draw:1 controller
 text=At the beginning of your upkeep, scry 1. -- Whenever you cast a creature spell, you may pay {G}. If you do, draw a card.
 mana={3}
@@ -67245,7 +67245,7 @@ name=Lightning Javelin
 target=creature,player
 auto=damage:3
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Lightning Javelin deals 3 damage to target creature or player. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{R}
 type=Sorcery
@@ -68131,7 +68131,7 @@ toughness=1
 [card]
 name=Lone Wolf of the Natterknolls
 backside=Hermit of the Natterknolls
-auto=@movedTo(*|opponentstack) restriction{during opponent turn}:name(Draw 2 cards) draw:2 controller
+auto=@movedTo(*|opponentstack) restriction{myturnonly}:name(Draw 2 cards) draw:2 controller
 auto=@each upkeep restriction{lastturn(*|mystack)~morethan~1,lastturn(*|opponentstack)~lessthan~2}:name(Transform Werewolf) flip(backside)
 auto=@each upkeep restriction{lastturn(*|opponentstack)~morethan~1}:name(Transform Werewolf) flip(backside)
 text=Whenever an opponent casts a spell during your turn, draw two cards. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Lone Wolf of the Natterknolls. // Hermit of the Natterknolls
@@ -68426,7 +68426,7 @@ name=Lose Hope
 target=creature
 auto=-1/-1
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Target creature gets -1/-1 until end of turn. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={B}
 type=Instant
@@ -68447,7 +68447,7 @@ name=Lost in a Labyrinth
 target=creature
 auto=-3/-0 ueot
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Target creature gets -3/-0 until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={U}
 type=Instant
@@ -69701,7 +69701,7 @@ toughness=5
 name=Magma Jet
 target=creature,player
 auto=damage:2
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Magma Jet deals 2 damage to target creature or player. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={1}{R}
 type=Instant
@@ -77973,7 +77973,7 @@ toughness=2
 name=Mystic Speculation
 buyback={u}{2}
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(3)
+auto=_SCRY3_
 text=Buyback {2} (You may pay an additional {2} as you cast this spell. If you do, put this card into your hand as it resolves.) -- Scry 3. (To scry 3, look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={U}
 type=Sorcery
@@ -79497,7 +79497,7 @@ name=New Benalia
 auto=tap(noevent)
 auto={T}:add{W}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=New Benalia enters the battlefield tapped. -- When New Benalia enters the battlefield, 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.) -- {T}: Add {W} to your mana pool.
 type=Land
 [/card]
@@ -82146,7 +82146,7 @@ type=Sorcery
 [card]
 name=Omenspeaker
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Omenspeaker enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={1}{U}
 type=Creature
@@ -87800,7 +87800,7 @@ name=Portent of Betrayal
 target=creature
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(previousbattlefield)],newability[untap],haste)) ueot)!
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{R}
 type=Sorcery
@@ -88236,7 +88236,7 @@ type=Sorcery
 name=Prescient Chimera
 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=@movedTo(instant,sorcery|mystack):_SCRY_(1)
+auto=@movedTo(instant,sorcery|mystack):_SCRY1_
 text=Flying -- Whenever you cast an instant or sorcery spell, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{U}{U}
 type=Creature
@@ -88757,7 +88757,7 @@ name=Prism Array
 auto=counter(0/0,converge,crystal)
 auto={c(0/0,-1,crystal)}:tap target(creature)
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={W}{U}{B}{R}{G}:_SCRY_(3)
+auto={W}{U}{B}{R}{G}:_SCRY3_
 text=Converge -- Prism Array enters the battlefield with a crystal counter on it for each color of mana spent to cast it. -- Remove a crystal counter from Prism Array: Tap target creature. -- {W}{U}{B}{R}{G}: Scry 3. (Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={4}{U}
 type=Enchantment
@@ -89113,7 +89113,7 @@ name=Prognostic Sphinx
 abilities=flying
 auto={D(*|myhand)}:opponentshroud && tap
 aicode=activate transforms((,newability[all(*[zpos<=3]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_ATTACKING__SCRY_(3)
+auto=_ATTACKING__SCRY3_
 text=Flying -- Discard a card: Prognostic Sphinx gains hexproof until end of turn. Tap it. -- Whenever Prognostic Sphinx attacks, scry 3. (Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}{U}{U}
 type=Creature
@@ -91062,7 +91062,7 @@ name=Rage of Purphoros
 target=creature
 auto=cantregen
 auto=damage:4
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Rage of Purphoros deals 4 damage to target creature. It can't be regenerated this turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={4}{R}
 type=Sorcery
@@ -92856,7 +92856,7 @@ toughness=5
 [card]
 name=Reaper of the Wilds
 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(graveyard) from(other creature|battlefield):_SCRY_(1)
+auto=@movedTo(graveyard) from(other creature|battlefield):_SCRY1_
 auto={B}:deathtouch ueot
 auto={1}{G}:opponentshroud ueot
 text=Whenever another creature dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {B}: Reaper of the Wilds gains deathtouch until end of turn. -- {1}{G}: Reaper of the Wilds gains hexproof until end of turn.
@@ -94625,7 +94625,7 @@ 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=_LANDFALL_name(Choose one) transforms((,newability[choice name(Scry 1) _SCRY_(1)],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) _SCRY1_],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
@@ -95770,7 +95770,7 @@ type=Sorcery
 name=Rise of Eagles
 auto=create(Bird:Creature Bird Enchantment:2/2:flying:blue)*2
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Put two 2/2 blue Bird enchantment creature tokens with flying onto the battlefield. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={4}{U}{U}
 type=Sorcery
@@ -100465,7 +100465,7 @@ type=Artifact
 name=Scouring Sands
 auto=damage:1 all(creature|opponentbattlefield)
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Scouring Sands deals 1 damage to each creature your opponents control. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{R}
 type=Sorcery
@@ -101821,7 +101821,7 @@ subtype=Aura
 name=Seer's Lantern
 auto={T}:add{C}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={2}{t}:name(Scry 1) _SCRY_(1)
+auto={2}{t}:name(Scry 1) _SCRY1_
 text={T}: Add {C} to your mana pool. ({C} represents colorless mana.) -- {2}, {T}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}
 type=Artifact
@@ -102032,7 +102032,7 @@ toughness=3
 name=Select for Inspection
 target=creature[tapped]
 auto=moveto(ownerhand)
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Return target tapped creature to its owner's hand. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={U}
 type=Instant
@@ -102869,7 +102869,7 @@ type=Artifact
 name=Serum Visions
 auto=draw:1
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 2) _SCRY_(2)
+auto=name(Scry 2) _SCRY2_
 text=Draw a card. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={U}
 type=Sorcery
@@ -103307,7 +103307,7 @@ toughness=3
 [card]
 name=Shadows of the Past
 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(creature|graveyard) from(battlefield):name(Scry 1) _SCRY_(1)
+auto=@movedTo(creature|graveyard) from(battlefield):name(Scry 1) _SCRY1_
 auto={4}{B}:life:-2 opponent && life:2 controller restriction{type(creature|mygraveyard)~morethan~3}
 text=Whenever a creature dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {4}{B}: Each opponent loses 2 life and you gain 2 life. Activate this ability only if there are four or more creature cards in your graveyard.
 mana={1}{B}
@@ -105339,7 +105339,7 @@ toughness=2
 [card]
 name=Sigiled Skink
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_ATTACKING__SCRY_(1)
+auto=_ATTACKING__SCRY1_
 text=Whenever Sigiled Skink attacks, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{R}
 type=Creature
@@ -105350,7 +105350,7 @@ toughness=1
 [card]
 name=Sigiled Starfish
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={T}:_SCRY_(1)
+auto={T}:_SCRY1_
 text={T}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{U}
 type=Creature
@@ -107634,7 +107634,7 @@ toughness=1
 name=Skywhaler's Shot
 target=creature[power>=3]
 auto=destroy
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Destroy target creature with power 3 or greater. Scry 1.
 mana={2}{W}
 type=Instant
@@ -110174,7 +110174,7 @@ name=Spark Jolt
 target=creature,player
 auto=damage:1
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Spark Jolt deals 1 damage to target creature or player. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={R}
 type=Instant
@@ -111686,7 +111686,7 @@ name=Spite of Mogis
 target=creature
 auto=damage:type:*[instant;sorcery]:mygraveyard
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Spite of Mogis deals damage to target creature equal to the number of instant and sorcery cards in your graveyard. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={R}
 type=Sorcery
@@ -112755,7 +112755,7 @@ name=Stand Firm
 target=creature
 auto=1/1
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Target creature gets +1/+1 until end of turn. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={W}
 type=Instant
@@ -114192,7 +114192,7 @@ toughness=4
 name=Stormcaller of Keranos
 abilities=haste
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={1}{u}:_SCRY_(1)
+auto={1}{u}:_SCRY1_
 text=Haste -- {1}{U}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={2}{R}
 type=Creature
@@ -115045,7 +115045,7 @@ name=Stymied Hopes
 target=*|stack
 auto=transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) forever
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(1)
+auto=_SCRY1_
 text=Counter target spell unless its controller pays {1}. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{U}
 type=Instant
@@ -118583,7 +118583,7 @@ toughness=1
 name=Tel-Jilad Justice
 target=artifact
 auto=destroy
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=Destroy target artifact. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={1}{G}
 type=Instant
@@ -118721,7 +118721,7 @@ auto=tap(noevent)
 auto={t}:add{r}
 auto={t}:add{g}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Abandon enters the battlefield tapped. -- When Temple of Abandon enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {R} or {G} to your mana pool.
 type=Land
 [/card]
@@ -118731,7 +118731,7 @@ auto=tap(noevent)
 auto={t}:add{u}
 auto={t}:add{b}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Deceit enters the battlefield tapped. -- When Temple of Deceit enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {U} or {B} to your mana pool.
 type=Land
 [/card]
@@ -118741,7 +118741,7 @@ auto=tap(noevent)
 auto={t}:add{w}
 auto={t}:add{u}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Enlightenment enters the battlefield tapped. -- When Temple of Enlightenment enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {W} or {U} to your mana pool.
 type=Land
 [/card]
@@ -118751,7 +118751,7 @@ auto=tap(noevent)
 auto={t}:add{u}
 auto={t}:add{r}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Epiphany enters the battlefield tapped. -- When Temple of Epiphany enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {U} or {R} to your mana pool.
 type=Land
 [/card]
@@ -118761,7 +118761,7 @@ auto=tap(noevent)
 auto={t}:add{b}
 auto={t}:add{g}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Malady enters the battlefield tapped. -- When Temple of Malady enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {B} or {G} to your mana pool.
 type=Land
 [/card]
@@ -118771,7 +118771,7 @@ auto=tap(noevent)
 auto={t}:add{b}
 auto={t}:add{r}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Malice enters the battlefield tapped. -- When Temple of Malice enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {B} or {R} to your mana pool.
 type=Land
 [/card]
@@ -118781,7 +118781,7 @@ auto=tap(noevent)
 auto={t}:add{g}
 auto={t}:add{u}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Mystery enters the battlefield tapped. -- When Temple of Mystery enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {G} or {U} to your mana pool.
 type=Land
 [/card]
@@ -118791,7 +118791,7 @@ auto=tap(noevent)
 auto={t}:add{g}
 auto={t}:add{w}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Plenty enters the battlefield tapped. -- When Temple of Plenty enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {G} or {W} to your mana pool.
 type=Land
 [/card]
@@ -118801,7 +118801,7 @@ auto=tap(noevent)
 auto={t}:add{w}
 auto={t}:add{b}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Silence enters the battlefield tapped. -- When Temple of Silence enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {W} or {B} to your mana pool.
 type=Land
 [/card]
@@ -118817,7 +118817,7 @@ auto=tap(noevent)
 auto={t}:add{r}
 auto={t}:add{w}
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Temple of Triumph enters the battlefield tapped. -- When Temple of Triumph enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {T}: Add {R} or {W} to your mana pool.
 type=Land
 [/card]
@@ -119699,7 +119699,7 @@ name=Thassa, God of the Sea
 abilities=Indestructible
 auto={1}{u}:target(creature|mybattlefield) unblockable ueot
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@each my upkeep:_SCRY_(1)
+auto=@each my upkeep:_SCRY1_
 auto=this(variable{type:manau}<5) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
 auto=this(variable{type:manau}>4) transforms((Legendary Enchantment Creature))
 text=Indestructible -- As long as your devotion to blue is less than five, Thassa isn't a creature. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.) -- At the beginning of your upkeep, scry 1. -- {1}{U}: Target creature you control can't be blocked this turn.
@@ -122102,7 +122102,7 @@ name=Titan's Strength
 target=creature
 auto=3/1
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Target creature gets +3/+1 until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={R}
 type=Instant
@@ -127400,7 +127400,7 @@ name=Vanquish the Foul
 target=creature[power>=4]
 auto=destroy
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Destroy target creature with power 4 or greater. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={5}{W}
 type=Sorcery
@@ -128441,7 +128441,7 @@ toughness=1
 name=Veteran Motorist
 crewbonus=1/1
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY_(2)
+auto=_SCRY2_
 text=When Veteran Motorist enters the battlefield, scry 2. -- Whenever Veteran Motorist crews a Vehicle, that Vehicle gets +1/+1 until end of turn.
 mana={R}{W}
 type=Creature
@@ -129541,7 +129541,7 @@ toughness=3
 [card]
 name=Viscera Seer
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={S(creature|myBattlefield)}:name(Scry 1) _SCRY_(1)
+auto={S(creature|myBattlefield)}:name(Scry 1) _SCRY1_
 text=Sacrifice a creature: 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={B}
 type=Creature
@@ -130662,7 +130662,7 @@ name=Voyage's End
 target=creature
 auto=moveto(ownerhand)
 aicode=activate target(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot
-auto=name(Scry 1) _SCRY_(1)
+auto=name(Scry 1) _SCRY1_
 text=Return target creature to its owner's hand. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={1}{U}
 type=Instant
@@ -132414,7 +132414,7 @@ toughness=2
 [card]
 name=Watchful Automaton
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={2}{U}:name(Scry 1) _SCRY_(1)
+auto={2}{U}:name(Scry 1) _SCRY1_
 text={2}{U}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}
 type=Artifact Creature
@@ -134472,7 +134472,7 @@ toughness=2
 name=Windrider Patrol
 abilities=flying
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@combatdamaged(player) from(this):name(Scry 2) _SCRY_(2)
+auto=@combatdamaged(player) from(this):name(Scry 2) _SCRY2_
 text=Flying -- Whenever Windrider Patrol deals combat damage to a player, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}{U}{U}
 type=Creature
@@ -134989,7 +134989,7 @@ type=Artifact
 name=Witches' Eye
 auto={1}:equip
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=teach(creature) {1}{t}:name(Scry 1) _SCRY_(1)
+auto=teach(creature) {1}{t}:name(Scry 1) _SCRY1_
 text=Equipped creature has "{1}, {T}: 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.) -- Equip {1}
 mana={1}
 type=Artifact
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index 35696357c..6d1dc4c6f 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -1235,7 +1235,7 @@ name=Inzerva, Master of Insights
 aicode=activate target(*[zpos<=2]|opponentLibrary) moveto(opponentreveal) and!( bottomoflibrary )!
 auto=counter(0/0,4,loyalty)
 auto={C(0/0,+2,Loyalty)}:name(+2: Draw 2 cards and discard) draw:2 && transforms((,newability[reject notatarget(*|myhand)])) oneshot
-auto={C(0/0,-2,Loyalty)}:name(-2: Look at opponent library and scry 2) reveal:2 revealzone(opponentlibrary) optionone name(Put on top) target(<upto:2>*|reveal) moveto(ownerlibrary) optiononeend optiontwo name(Put on bottom) target(<2>*|reveal) bottomoflibrary optiontwoend afterrevealed name(Scry 2) _SCRY_(2) afterrevealedend revealend
+auto={C(0/0,-2,Loyalty)}:name(-2: Look at opponent library and scry 2) reveal:2 revealzone(opponentlibrary) optionone name(Put on top) target(<upto:2>*|reveal) moveto(ownerlibrary) optiononeend optiontwo name(Put on bottom) target(<2>*|reveal) bottomoflibrary optiontwoend afterrevealed name(Scry 2) _SCRY2_ afterrevealedend revealend
 auto={C(0/0,-4,Loyalty)}:name(-4: Emblem: Draw to deal damage) emblem transforms((,newability[lord(*|opponentBattlefield) showcontrollerhand],newability[lord(*|myBattlefield) showopponenthand],newability[@drawfoeof(player):name(Damage opponent) damage:1 opponent] )) forever dontremove
 text=+2: Draw two cards, then discard a card. -- −2: Look at the top two cards of each other player's library, then put any number of them on the bottom of that library and the rest on top in any order. Scry 2. -- −4: You get an emblem with "Your opponents play with their hands revealed" and "Whenever an opponent draws a card, this emblem deals 1 damage to them."
 mana={1}{2U}{2R}
@@ -1319,7 +1319,7 @@ auto=counter(0/0,1,loyalty)
 auto=if paid(kicker) then clone options(nolegend)
 auto=if casted(this) then counter(0/0,3,loyalty)
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={C(0/0,1,Loyalty)}:name(+1: Scry 2) _SCRY_(2)
+auto={C(0/0,1,Loyalty)}:name(+1: Scry 2) _SCRY2_
 auto={C(0/0,0,Loyalty)}:name(+0: Draw 1 and remove Loyalty counters) draw:1 restriction{type(*[manacost=0;zpos=1]|mylibrary)~morethan~0}
 auto={C(0/0,0,Loyalty)}:name(+0: Draw 1 and remove Loyalty counters) draw:1 && counter(0/0,-1,loyalty) restriction{type(*[manacost=1;zpos=1]|mylibrary)~morethan~0}
 auto={C(0/0,0,Loyalty)}:name(+0: Draw 1 and remove Loyalty counters) draw:1 && counter(0/0,-2,loyalty) restriction{type(*[manacost=2;zpos=1]|mylibrary)~morethan~0}
@@ -1532,7 +1532,7 @@ subtype=Karn
 name=Kasmina, Enigma Sage
 auto=counter(0/0,2,Loyalty)
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={C(0/0.2.Loyalty)}:limit:1 name(+2: Scry 1) _SCRY_(1)
+auto={C(0/0.2.Loyalty)}:limit:1 name(+2: Scry 1) _SCRY1_
 auto={C(0/0.-1.Loyalty)}:limit:1 name(-1: Create fractal with 1 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1) )!
 auto={C(0/0.-2.Loyalty)}:limit:1 name(-2: Create fractal with 2 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1.2) )!
 auto={C(0/0.-3.Loyalty)}:limit:1 name(-3: Create fractal with 3 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1.3) )!
@@ -1554,7 +1554,7 @@ auto={C(0/0.-18.Loyalty)}:limit:1 name(-18: Create fractal with 18 counter) toke
 auto={C(0/0.-19.Loyalty)}:limit:1 name(-19: Create fractal with 19 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1.19) )!
 auto={C(0/0.-20.Loyalty)}:limit:1 name(-20: Create fractal with 20 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1.20) )!
 auto={C(0/0.-8.Loyalty)}:limit:1 name(-8: Search instant or sorcery) target(*[instant;sorcery;share!color!]|mylibrary) moveto(myexile) and!( transforms((,newability[canplayfromexile],newability[zerocast],newability[@each untap:canplayfromexile],newability[@each untap:zerocast])) forever )!
-auto=lord(other planeswalker|mybattlefield) transforms((,newability[{C(0/0.2.Loyalty)}:limit:1 name(+2: Scry 1) _SCRY_(1)]))
+auto=lord(other planeswalker|mybattlefield) transforms((,newability[{C(0/0.2.Loyalty)}:limit:1 name(+2: Scry 1) _SCRY1_]))
 auto=lord(other planeswalker|mybattlefield) transforms((,newability[{C(0/0.-1.Loyalty)}:limit:1 name(-1: Create fractal with 1 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1) )!]))
 auto=lord(other planeswalker|mybattlefield) transforms((,newability[{C(0/0.-2.Loyalty)}:limit:1 name(-2: Create fractal with 2 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1.2) )!]))
 auto=lord(other planeswalker|mybattlefield) transforms((,newability[{C(0/0.-3.Loyalty)}:limit:1 name(-3: Create fractal with 3 counter) token(Fractal^Creature Fractal^0/0^green^blue) and!( counter(1/1.3) )!]))
@@ -2173,7 +2173,7 @@ subtype=Nissa
 name=Nissa, Steward of Elements
 auto=counter(0/0,X,loyalty)
 aicode=activate transforms((,newability[if type(creature[manacost<=hascntloyalty;zpos=1]|mylibrary)~morethan~0 then all(*[zpos<=1]|mylibrary) name(Put on battlefield) moveto(mybattlefield)],newability[if type(land[zpos=1]|mylibrary)~morethan~0 then all(*[zpos<=1]|mylibrary) name(Put on battlefield) moveto(mybattlefield)])) oneshot
-auto={C(0/0,2,Loyalty)}:name(+2: Scry 2) _SCRY_(2)
+auto={C(0/0,2,Loyalty)}:name(+2: Scry 2) _SCRY2_
 auto={C(0/0,0,Loyalty)}: restriction{type(land[zpos=1]|mylibrary)~morethan~0} name(+0: Look top card) reveal:1 optionone name(Put on battlefield) target(<upto:1>land|reveal) moveto(mybattlefield) optiononeend optiontwo name(Put back) target(*|reveal) moveto(mylibrary) optiontwoend revealend
 auto={C(0/0,0,Loyalty)}: restriction{type(creature[zpos=1]|mylibrary)~morethan~0} name(+0: Look top card) reveal:1 optionone name(Put on battlefield) target(<upto:1>creature[manacost<=hascntloyalty]|reveal) moveto(mybattlefield) optiononeend optiontwo name(Put back) target(*|reveal) moveto(mylibrary) optiontwoend revealend
 auto={C(0/0,0,Loyalty)}: restriction{type(*[-creature;-land;zpos=1]|mylibrary)~morethan~0} name(+0: Look top card)) reveal:1 optionone name(Put back) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(Put back) all(*|reveal) moveto(mylibrary) optiontwoend revealend
@@ -2349,7 +2349,7 @@ name=Ral, Storm Conduit
 auto=counter(0/0,4,loyalty)
 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(*[instant;sorcery]|myStack):ability$!name(Choose one) choice name(Damage opponent) damage:1 target(opponent) _ choice name(Damage Planeswalker) damage:1 target(planeswalker)!$ controller
-auto={C(0/0,2,Loyalty)}:name(+2: Scry: 1) _SCRY_(1)
+auto={C(0/0,2,Loyalty)}:name(+2: Scry: 1) _SCRY1_
 auto={C(0/0,-2,Loyalty)}:name(-2: Whenever cast instant or sorcery copy spell) emblem transforms((,newability[@movedto(*[instant;sorcery]|myStack) turnlimited:all(trigger[to]) activate castcard(copied noevent)])) ueot
 text=Whenever you cast or copy an instant or sorcery spell, Ral, Storm Conduit deals 1 damage to target opponent or planeswalker. -- +2: Scry 1. -- −2: When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.
 mana={3}{U}{R}
@@ -2398,7 +2398,7 @@ subtype=Rowan
 name=Saheeli Rai
 auto=counter(0/0,3,loyalty)
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={C(0/0,1,Loyalty)}:name(+1: Scry and deals 1 damage) _SCRY_(1) && damage:1 opponent
+auto={C(0/0,1,Loyalty)}:name(+1: Scry and deals 1 damage) _SCRY1_ && damage:1 opponent
 auto={C(0/0,-2,Loyalty)}:name(-2: Create a copy of artifact or creature) target(*[creature;artifact]|myBattlefield) clone with(treason,haste) addtype(artifact)
 auto={C(0/0,-7,Loyalty)}:name(-7: Search three different artifacts) reveal:plibrarycount optionone name(choose cards) target(<upto:3>artifact|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))! afterrevealedend revealend
 text=+1: Scry 1. Saheeli Rai deals 1 damage to each opponent. -- −2: Create a token that's a copy of target artifact or creature you control, except it's an artifact in addition to its other types. That token gains haste. Exile it at the beginning of the next end step. -- −7: Search your library for up to three artifact cards with different names, put them onto the battlefield, then shuffle your library.
@@ -2445,7 +2445,7 @@ name=Samut, Tyrant Smasher
 auto=counter(0/0,5,loyalty)
 auto=lord(other creature|myBattlefield) haste
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto={C(0/0,-1,Loyalty)}:name(-1: Creature gains +2/+1, haste and scry 1) target(creature) transforms((,newability[2/1],newability[haste])) ueot && _SCRY_(1)
+auto={C(0/0,-1,Loyalty)}:name(-1: Creature gains +2/+1, haste and scry 1) target(creature) transforms((,newability[2/1],newability[haste])) ueot && _SCRY1_
 text=Creatures you control have haste. -- -1: Target creature gets +2/+1 and gains haste until end of turn. Scry 1.
 mana={2}{RG}{RG}
 type=Legendary Planeswalker