From f792729f8094439cfe30494afaa232e476463ba5 Mon Sep 17 00:00:00 2001
From: Eduardo <punkeduard@gmail.com>
Date: Wed, 4 Aug 2021 19:57:55 -0500
Subject: [PATCH] Primitive fiexes and macros replacements

Removing typos in firststrike, @@ and ==.
death's-head buzzard didn't gave creatures -1/-1
ponyback brigade morphed created 6 tokens
Cavalier of Flame wasn't working
Duplicate ability in Lone Revenant
Macros for:
_ADDENDUM_
CONSTELLATION_
_FEROCIOUS_
_POPULATE_
_RALLY_
---
 .../mtg/bin/Res/sets/primitives/_macros.txt   |   2 +-
 .../bin/Res/sets/primitives/borderline.txt    |  66 ++++----
 projects/mtg/bin/Res/sets/primitives/mtg.txt  | 160 +++++++++---------
 3 files changed, 113 insertions(+), 115 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index 70d3996ce..cbc785852 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -86,7 +86,7 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 #AUTO_DEFINE _FEROCIOUS_ if type(creature[power>=4]|myBattlefield)~morethan~0 then
 
 # Rally
-#AUTO_DEFINE _RALLY_ @movedTo(other creature[Ally]|myBattlefield):
+#AUTO_DEFINE _RALLY_ @movedTo(other ally|myBattlefield):
 
 # Landfall
 #AUTO_DEFINE _LANDFALL_ @movedTo(land|myBattlefield):
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 2210f6bed..c08fc6a81 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -904,7 +904,7 @@ type=Enchantment
 [card]
 name=Ajani's Chosen
 auto=@movedTo(enchantment[aura]|myBattlefield):all(trigger[to]) transforms((,newability[may name(Attach aura to cat) rehook target(cat[token;fresh]|mybattlefield)])) oneshot
-auto=@movedTo(enchantment|myBattlefield):token(Cat,Creature Cat,2/2,white)
+auto=_CONSTELLATION_token(Cat,Creature Cat,2/2,white)
 text=Whenever an enchantment enters the battlefield under your control, put a 2/2 white Cat creature token onto the battlefield. If that enchantment is an Aura, you may attach it to the token.
 mana={2}{W}{W}
 type=Creature
@@ -2818,7 +2818,7 @@ toughness=4
 name=Archon of Sun's Grace
 abilities=flying,lifelink
 auto=lord(creature[Pegasus]|myBattlefield) lifelink
-auto=@movedTo(enchantment|myBattlefield):token(Pegasus,creature Pegasus,2/2,white,flying)
+auto=_CONSTELLATION_token(Pegasus,creature Pegasus,2/2,white,flying)
 text=Flying, lifelink -- Pegasus creatures you control have lifelink. -- Constellation -- Whenever an enchantment enters the battlefield under your control, create a 2/2 white Pegasus creature token with flying.
 mana={2}{W}{W}
 type=Creature
@@ -3148,7 +3148,7 @@ subtype=Saga
 name=Arrester's Admonition
 target=creature
 auto=moveTo(ownerHand)
-auto=if compare(restriction{assorcery}~morethan~0) then draw:1 else
+auto=_ADDENDUM_ draw:1 else
 text=Return target creature to its owner's hand. -- Addendum — If you cast this spell during your main phase, draw a card.
 mana={2}{U}
 type=Instant
@@ -3157,7 +3157,7 @@ type=Instant
 name=Arrester's Zeal
 target=creature
 auto=+2/+2
-auto=if compare(restriction{assorcery}~morethan~0) then flying else
+auto=_ADDENDUM_ flying else
 text=Target creature gets +2/+2 until end of turn. -- Addendum — If you cast this spell during your main phase, that creature gains flying until end of turn.
 mana={W}
 type=Instant
@@ -8719,7 +8719,7 @@ type=Sorcery
 [/card]
 [card]
 name=Captivating Unicorn
-auto=@movedTo(enchantment|myBattlefield):tap target(creature|opponentBattlefield)
+auto=_CONSTELLATION_tap target(creature|opponentBattlefield)
 text=Constellation -- Whenever an enchantment enters the battlefield under your control, tap target creature an opponent controls.
 mana={4}{W}
 type=Creature
@@ -9253,8 +9253,8 @@ toughness=6
 [/card]
 [card]
 name=Cavalier of Flame
-auto={1}{R}:all(creature|myBattlefield)) 1/0 && haste ueot
-auto=target(<anyamount>*|myhand) reject && teach(*) draw:1 controller assorcery
+auto={1}{R}:all(creature|myBattlefield)) transforms((,newability[1/0],newability[haste])) ueot
+auto=may target(<anyamount>*|myhand) reject && draw:1
 auto=_DIES_damage:type:land:mygraveyard opponent
 auto=_DIES_damage:type:land:mygraveyard all(planeswalker|opponentbattlefield)
 text={1}{R}: Creatures you control get +1/+0 and gain haste until end of turn. -- When Cavalier of Flame enters the battlefield, discard any number of cards, then draw that many cards. -- When Cavalier of Flame dies, it deals X damage to each opponent and each planeswalker they control, where X is the number of land cards in your graveyard.
@@ -11141,7 +11141,7 @@ type=Sorcery
 name=Code of Constraint
 target=creature
 auto=-4/-0
-auto=if compare(restriction{assorcery}~morethan~0) then freeze else
+auto=_ADDENDUM_ freeze else
 auto=draw:1 controller
 text=Target creature gets -4/-0 until end of turn. -- Draw a card. -- Addendum — If you cast this spell during your main phase, tap that creature and it doesn't untap during its controller's next untap step.
 mana={2}{U}
@@ -18769,7 +18769,7 @@ auto=draw:7 opponent
 auto=moveto(mylibrary) all(*|myhand)
 auto=moveto(mylibrary) all(*|mygraveyard) && shuffle
 auto=draw:7 controller
-auto=if compare(restriction{assorcery}~morethan~0) then auto=castcard(normal) notatarget(*[-instant;-sorcery;manacost<=7]|myhand) else
+auto=_ADDENDUM_ auto=castcard(normal) notatarget(*[-instant;-sorcery;manacost<=7]|myhand) else
 text=Each player shuffles their hand and graveyard into their library, then draws seven cards. Exile Emergency Powers. -- Addendum — If you cast this spell during your main phase, you may put a permanent card with converted mana cost 7 or less from your hand onto the battlefield.
 mana={5}{W}{U}
 type=Instant
@@ -19728,7 +19728,7 @@ type=Instant
 [/card]
 [card]
 name=Eutropia the Twice-Favored
-auto=@movedTo(enchantment|myBattlefield):counter(1/1,1) target(creature) && flying target(creature) ueot
+auto=_CONSTELLATION_counter(1/1,1) target(creature) && flying target(creature) ueot
 text=Constellation — Whenever an enchantment enters the battlefield under your control, put a +1/+1 counter on target creature. That creature gains flying until end of turn.
 mana={1}{G}{U}
 type=Legendary Creature
@@ -20916,7 +20916,7 @@ subtype=Giant
 [/card]
 [card]
 name=Favored of Iroas
-auto=@movedTo(enchantment|myBattlefield):double strike ueot
+auto=_CONSTELLATION_double strike ueot
 text=Constellation -- Whenever an enchantment enters the battlefield under your control, Favored of Iroas gains double strike until end of turn.
 mana={2}{W}
 type=Creature
@@ -24455,7 +24455,7 @@ type=Sorcery
 [card]
 name=Ghired, Conclave Exile
 auto=token(Rhino,Creature Rhino,4/4,green,trample)
-auto=@combat(attacking) restriction{type(creature[token]|mybattlefield)~morethan~0}:ability$! name(populate) clone notatarget(creature[token]|mybattlefield) ninjutsu !$ controller
+auto=@combat(attacking) restriction{type(creature[token]|mybattlefield)~morethan~0}:ability$! _POPULATE_ ninjutsu !$ controller
 text=When Ghired, Conclave Exile enters the battlefield, create a 4/4 green Rhino creature token with trample. -- Whenever Ghired attacks, populate. The token enters the battlefield tapped and attacking. (To populate, create a token that's a copy of a creature token you control.)
 mana={2}{R}{G}{W}
 type=Legendary Creature
@@ -41840,7 +41840,7 @@ toughness=2
 [card]
 name=Nessian Wanderer
 aicode=activate target(land[zpos<=3]|mylibrary) moveto(myhand)
-auto=@movedTo(enchantment|myBattlefield):name(look three) reveal:3 optionone name(Get a land) target(<upto:1>land|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<2>*|reveal) bottomoflibrary optiontwoend revealend
+auto=_CONSTELLATION_name(look three) reveal:3 optionone name(Get a land) target(<upto:1>land|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<2>*|reveal) bottomoflibrary optiontwoend revealend
 text=Constellation — Whenever an enchantment enters the battlefield under your control, look at the top three cards of your library. You may reveal a land card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.
 mana={1}{G}
 type=Creature
@@ -42061,7 +42061,7 @@ type=Enchantment
 [card]
 name=Nexus Wardens
 abilities=reach
-auto=@movedTo(enchantment|myBattlefield):life:2 controller
+auto=_CONSTELLATION_life:2 controller
 text=Reach -- Constellation — Whenever an enchantment enters the battlefield under your control, you gain 2 life.
 mana={2}{G}
 type=Creature
@@ -45804,7 +45804,7 @@ subtype=Aura
 [/card]
 [card]
 name=Pious Wayfarer
-auto=@movedTo(enchantment|myBattlefield):target(creature|myBattlefield) 1/1 ueot
+auto=_CONSTELLATION_target(creature|myBattlefield) 1/1 ueot
 text=Constellation -- Whenever an enchantment enters the battlefield under your control, target creature gets +1/+1 until end of turn.
 mana={W}
 type=Creature
@@ -46585,7 +46585,7 @@ type=Enchantment
 [card]
 name=Precognitive Perception
 aicode=activate transforms((,newability[draw:3 controller])) oneshot
-auto=if compare(restriction{assorcery}~morethan~0) then scry:3 scrycore delayed draw:3 controller scrycoreend scryend else draw:3 controller
+auto=_ADDENDUM_ scry:3 scrycore delayed draw:3 controller scrycoreend scryend else draw:3 controller
 text=Draw three cards. -- Addendum — If you cast this spell during your main phase, instead scry 3, then draw three cards.
 mana={3}{U}{U}
 type=Instant
@@ -50271,7 +50271,7 @@ toughness=0
 [/card]
 [card]
 name=Rhet-Crop Spearmaster
-auto=@exerted(this):transforms((,newability[1/0],newability[firststrike])) ueot
+auto=@exerted(this):transforms((,newability[1/0],newability[first strike])) ueot
 auto=_ATTACKING_may exert
 text=You may exert Rhet-Crop Spearmaster as it attacks. When you do, it gets +1/+0 and gains first strike until end of turn. (An exerted creature won't untap during your next untap step.)
 mana={2}{W}
@@ -52261,7 +52261,7 @@ toughness=1
 [/card]
 [card]
 name=Sage of Mysteries
-auto=@movedTo(enchantment|myBattlefield):deplete:2 target(player)
+auto=_CONSTELLATION_deplete:2 target(player)
 text=Constellation -- Whenever an enchantment enters the battlefield under your control, target player puts the top two cards of their library into their graveyard.
 mana={U}
 type=Creature
@@ -53096,7 +53096,7 @@ type=Sorcery
 [/card]
 [card]
 name=Savage Swipe
-target=creature[power==2]|myBattlefield
+target=creature[power=2]|myBattlefield
 auto=2/2 ueot
 auto=transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>])) ueot
 text=Target creature you control gets +2/+2 until end of turn if its power is 2. Then it fights target creature you don't control. (Each deals damage equal to its power to the other.)
@@ -54280,7 +54280,7 @@ type=Sorcery
 [/card]
 [card]
 name=Selesnya Eulogist
-auto={2}{G}:target(creature|graveyard) moveto(exile) && ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto={2}{G}:target(creature|graveyard) moveto(exile) && ability$! _POPULATE_ !$ controller
 text={2}{G}: Exile target creature card from a graveyard, then populate. (Create a token that's a copy of a creature token you control.)
 mana={2}{G}
 type=Creature
@@ -54479,7 +54479,7 @@ abilities=flash
 target=creature
 auto=1/2
 auto=vigilance
-auto=if compare(restriction{assorcery}~morethan~0) then lifelink ueot else
+auto=_ADDENDUM_ lifelink ueot else
 text=Flash -- Enchant creature -- Enchanted creature gets +1/+2 and has vigilance. -- Addendum — When Sentinel's Mark enters the battlefield, if you cast it during your main phase, enchanted creature gains lifelink until end of turn.
 mana={1}{W}
 type=Enchantment
@@ -54656,7 +54656,7 @@ toughness=2
 [/card]
 [card]
 name=Setessan Champion
-auto=@movedTo(enchantment|myBattlefield):all(this) counter(1/1,1) && draw:1 controller
+auto=_CONSTELLATION_all(this) counter(1/1,1) && draw:1 controller
 text=Constellation — Whenever an enchantment enters the battlefield under your control, put a +1/+1 counter on Setessan Champion and draw a card.
 mana={2}{G}
 type=Creature
@@ -54676,7 +54676,7 @@ toughness=2
 [/card]
 [card]
 name=Setessan Skirmisher
-auto=@movedTo(enchantment|myBattlefield):1/1 ueot
+auto=_CONSTELLATION_1/1 ueot
 text=Constellation — Whenever an enchantment enters the battlefield under your control, Setessan Skirmisher gets +1/+1 until end of turn.
 mana={1}{G}
 type=Creature
@@ -55611,7 +55611,7 @@ toughness=6
 [/card]
 [card]
 name=Shoal Kraken
-auto=@movedTo(enchantment|myBattlefield):may draw:1 controller && reject target(*|myhand) controller
+auto=_CONSTELLATION_may draw:1 controller && reject target(*|myhand) controller
 text=Constellation -- Whenever an enchantment enters the battlefield under your control, you may draw a card. If you do, discard a card.
 mana={4}{U}
 type=Creature
@@ -57998,7 +57998,7 @@ subtype=Aura
 [/card]
 [card]
 name=Song of the Worldsoul
-auto=@movedTo(*|mystack):ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=@movedTo(*|mystack):ability$! _POPULATE_ !$ controller
 text=Whenever you cast a spell, populate. (Create a token that's a copy of a creature token you control.)
 mana={4}{W}{W}
 type=Enchantment
@@ -59034,7 +59034,7 @@ type=Sorcery
 [/card]
 [card]
 name=Sphinx's Insight
-auto=if compare(restriction{assorcery}~morethan~0) then life:2
+auto=_ADDENDUM_ life:2
 auto=draw:2
 text=Draw two cards. -- Addendum — If you cast this spell during your main phase, you gain 2 life.
 mana={2}{W}{U}
@@ -61234,7 +61234,7 @@ type=Instant
 [card]
 name=Summary Judgment
 target=creature[tapped]
-auto=if compare(restriction{assorcery}~morethan~0) then damage:5 else damage:3
+auto=_ADDENDUM_ damage:5 else damage:3
 text=Summary Judgment deals 3 damage to target tapped creature. -- Addendum — If you cast this spell during your main phase, it deals 5 damage to that creature instead.
 mana={1}{W}
 type=Instant
@@ -66143,8 +66143,8 @@ type=Enchantment
 [/card]
 [card]
 name=Tribute Mage
-aicode=activate target(artifact[manacost==2]|mylibrary) moveto(myhand)
-auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>artifact[manacost==2]|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
+aicode=activate target(artifact[manacost=2]|mylibrary) moveto(myhand)
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>artifact[manacost=2]|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=When Tribute Mage enters the battlefield, you may search your library for an artifact card with converted mana cost 2, reveal that card, put it into your hand, then shuffle your library.
 mana={2}{U}
 type=Creature
@@ -66184,7 +66184,7 @@ toughness=9
 [/card]
 [card]
 name=Triton Waverider
-auto=@movedTo(enchantment|myBattlefield):flying ueot
+auto=_CONSTELLATION_flying ueot
 text=Constellation -- Whenever an enchantment enters the battlefield under your control, Triton Waverider gains flying until end of turn.
 mana={3}{U}
 type=Creature
@@ -66566,7 +66566,7 @@ toughness=4
 [/card]
 [card]
 name=Turntimber Sower
-auto=@@movedto(land|mygraveyard):create(plant:creature plant:0/1:green:)
+auto=@movedto(land|mygraveyard):create(plant:creature plant:0/1:green:)
 auto={G}{S(creature|myBattlefield)}{S(creature|myBattlefield)}{S(creature|myBattlefield)}:target(land|mygraveyard) moveto(ownerhand)
 text=Whenever one or more land cards are put into your graveyard from anywhere, create a 0/1 green Plant creature token. -- {G}, Sacrifice three creatures: Return target land card from your graveyard to your hand.
 mana={2}{G}
@@ -66997,8 +66997,8 @@ type=Sorcery
 [/card]
 [card]
 name=Unbreakable Formation
-auto=if compare(restriction{assorcery}~morethan~0) then all(creature|myBattlefield) counter(1/1)
-auto=if compare(restriction{assorcery}~morethan~0) then all(creature|myBattlefield) vigilance
+auto=_ADDENDUM_ all(creature|myBattlefield) counter(1/1)
+auto=_ADDENDUM_ all(creature|myBattlefield) vigilance
 auto=all(creature|myBattlefield) indestructible ueot
 text=Creatures you control gain indestructible until end of turn. -- Addendum — If you cast this spell during your main phase, put a +1/+1 counter on each of those creatures and they gain vigilance until end of turn.
 mana={2}{W}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 2cc29cd8a..d0bafacba 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1669,7 +1669,7 @@ toughness=4
 [card]
 name=Agent of Erebos
 auto=choice target(player) moveTo(exile) all(*|targetedpersonsgraveyard)
-auto=@movedto(enchantment|mybattlefield):choice target(player) moveTo(exile) all(*|targetedpersonsgraveyard)
+auto=_CONSTELLATION_choice target(player) moveTo(exile) all(*|targetedpersonsgraveyard)
 text=Constellation -- Whenever Agent of Erebos or another enchantment enters the battlefield under your control, exile all cards from target player's graveyard.
 mana={3}{B}
 type=Enchantment Creature
@@ -2085,7 +2085,7 @@ toughness=1
 name=Akoum Battlesinger
 abilities=haste
 auto=may all(ally|myBattlefield) 1/0 ueot
-auto=@movedTo(other ally|myBattlefield):may all(ally|myBattlefield) 1/0 ueot
+auto=_RALLY_may all(ally|myBattlefield) 1/0 ueot
 text=Haste -- Whenever Akoum Battlesinger or another Ally enters the battlefield under your control, you may have Ally creatures you control get +1/+0 until end of turn.
 mana={1}{R}
 type=Creature
@@ -8319,7 +8319,7 @@ toughness=3
 [card]
 name=Bala Ged Thief
 auto=target(player) Reveal:type:ally:mybattlefield revealzone(targetedpersonshand) optionone target(*|reveal) reject optiononeend optiontwo all(*|reveal) moveto(ownerhand) optiontwoend revealend
-auto=@movedTo(other ally|myBattlefield):target(player) Reveal:type:ally:mybattlefield revealzone(targetedpersonshand) optionone target(*|reveal) reject optiononeend optiontwo all(*|reveal) moveto(ownerhand) optiontwoend revealend
+auto=_RALLY_target(player) Reveal:type:ally:mybattlefield revealzone(targetedpersonshand) optionone target(*|reveal) reject optiononeend optiontwo all(*|reveal) moveto(ownerhand) optiontwoend revealend
 text=Whenever Bala Ged Thief or another Ally enters the battlefield under your control, target player reveals a number of cards from his or her hand equal to the number of Allies you control. You choose one of them. That player discards that card.
 mana={3}{B}
 type=Creature
@@ -9194,7 +9194,7 @@ toughness=2
 [card]
 name=Barrage of Boulders
 auto=damage:1 all(creature|opponentbattlefield)
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then all(creature|battlefield) cantblock ueot
+auto=_FEROCIOUS_ all(creature|battlefield) cantblock ueot
 text=Barrage of Boulders deals 1 damage to each creature you don't control. -- Ferocious If you control a creature with power 4 or greater, creatures can't block this turn.
 mana={2}{R}
 type=Sorcery
@@ -13355,7 +13355,7 @@ type=Land
 name=Bojuka Brigand
 abilities=cantblock
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=Bojuka Brigand can't block. -- Whenever Bojuka Brigand or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Bojuka Brigand.
 mana={1}{B}
 type=Creature
@@ -19110,7 +19110,7 @@ toughness=3
 [card]
 name=Chasm Guide
 auto=choice all(creature|mybattlefield) haste ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) haste ueot
+auto=_RALLY_all(creature|mybattlefield) haste ueot
 text=Rally -- Whenever Chasm Guide or another Ally enters the battlefield under your control, creatures you control gain haste until end of turn.
 mana={3}{R}
 type=Creature
@@ -23007,7 +23007,7 @@ toughness=4
 [/card]
 [card]
 name=Coursers' Accord
-auto=token(Centaur,Creature Centaur,3/3,green) && ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=token(Centaur,Creature Centaur,3/3,green) && ability$! _POPULATE_ !$ controller
 text=Put a 3/3 green Centaur creature token onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={4}{G}{W}
 type=Sorcery
@@ -23369,7 +23369,7 @@ type=Sorcery
 name=Crater's Claws
 target=creature,player
 auto=damage:X
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then damage:2
+auto=_FEROCIOUS_ damage:2
 text=Crater's Claws deals X damage to target creature or player. -- Ferocious -- Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater.
 mana={R}{X}
 type=Sorcery
@@ -26579,7 +26579,7 @@ toughness=2
 [card]
 name=Daxos's Torment
 auto=transforms((Demon Creature,setpower=5,settoughness=5,flying,haste)) ueot
-auto=@movedTo(enchantment|myBattlefield):transforms((Demon Creature,setpower=5,settoughness=5,flying,haste)) ueot
+auto=_CONSTELLATION_transforms((Demon Creature,setpower=5,settoughness=5,flying,haste)) ueot
 text=Constellation -- Whenever Daxos's Torment or another enchantment enters the battlefield under your control, Daxos's Torment becomes a 5/5 Demon creature with flying and haste in addition to its other types until end of turn.
 mana={3}{B}
 type=Enchantment
@@ -27372,7 +27372,7 @@ toughness=13
 [card]
 name=Death's-Head Buzzard
 abilities=flying
-auto=_DIES_-1/-1 all(creature|Battlefield) ueot
+auto=_DIES_all(creature|Battlefield) -1/-1 ueot
 text=Flying -- When Death's-Head Buzzard dies, all creatures get -1/-1 until end of turn.
 mana={1}{B}{B}
 type=Creature
@@ -30646,7 +30646,7 @@ toughness=3
 [card]
 name=Doomwake Giant
 auto=all(creature|opponentbattlefield) -1/-1 ueot
-auto=@movedTo(enchantment|myBattlefield):all(creature|opponentbattlefield) -1/-1 ueot
+auto=_CONSTELLATION_all(creature|opponentbattlefield) -1/-1 ueot
 text=Constellation -- Whenever Doomwake Giant or another enchantment enters the battlefield under your control, creatures your opponents control get -1/-1 until end of turn.
 mana={4}{B}
 type=Enchantment Creature
@@ -31713,7 +31713,7 @@ type=Sorcery
 [card]
 name=Dreadbringer Lampads
 auto=name(intimidate) target(creature) transforms((,newability[intimidate])) ueot
-auto=@movedTo(enchantment|myBattlefield):name(intimidate) target(creature) transforms((,newability[intimidate])) ueot
+auto=_CONSTELLATION_name(intimidate) target(creature) transforms((,newability[intimidate])) ueot
 text=Constellation -- Whenever Dreadbringer Lampads or another enchantment enters the battlefield under your control, target creature gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
 mana={4}{B}
 type=Enchantment Creature
@@ -32612,7 +32612,7 @@ subtype=Aura
 [card]
 name=Druid's Deliverance
 auto=preventAllCombatDamage to(controller) ueot
-auto=name(populate) clone notatarget(creature[token]|mybattlefield)
+auto=_POPULATE_
 text=Prevent all combat damage that would be dealt to you this turn. Populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={1}{G}
 type=Instant
@@ -34019,7 +34019,7 @@ subtype=Shapeshifter
 [card]
 name=Eidolon of Blossoms
 auto=draw:1
-auto=@movedTo(enchantment|myBattlefield):draw:1
+auto=_CONSTELLATION_draw:1
 text=Constellation -- Whenever Eidolon of Blossoms or another enchantment enters the battlefield under your control, draw a card.
 mana={2}{G}{G}
 type=Enchantment Creature
@@ -38192,7 +38192,7 @@ toughness=1
 [/card]
 [card]
 name=Eyes in the Skies
-auto=token(Bird,Creature Bird,1/1,flying,white) && ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=token(Bird,Creature Bird,1/1,flying,white) && ability$! _POPULATE_ !$ controller
 text=Put a 1/1 white Bird creature token with flying onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={3}{W}
 type=Instant
@@ -39464,7 +39464,7 @@ subtype=Aura
 [/card]
 [card]
 name=Feed the Clan
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then life:10 controller else life:5 controller
+auto=_FEROCIOUS_ life:10 controller else life:5 controller
 text=You gain 5 life. -- Ferocious - You gain 10 life instead if you control a creature with power 4 or greater. 
 mana={1}{G}
 type=Instant
@@ -40814,7 +40814,7 @@ toughness=3
 [card]
 name=Firemantle Mage
 auto=all(ally|mybattlefield) menace ueot
-auto=@movedTo(other ally|myBattlefield):may all(ally|mybattlefield) menace ueot
+auto=_RALLY_may all(ally|mybattlefield) menace ueot
 text=Rally -- Whenever Firemantle Mage or another Ally enters the battlefield under your control, creatures you control gain menace until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
 mana={2}{R}
 type=Creature
@@ -42627,7 +42627,7 @@ type=Instant
 name=Force Away
 target=creature
 auto=moveTo(ownerhand)
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then may draw:1 controller && ability$!reject notatarget(*|myhand)!$ controller
+auto=_FEROCIOUS_ may draw:1 controller && ability$!reject notatarget(*|myhand)!$ controller
 text=Return target creature to its owner's hand. Ferocious - If you control a creature with power 4 or greater, you may draw a card. If you do, discard a card. 
 mana={1}{U}
 type=Instant
@@ -42810,7 +42810,7 @@ toughness=1
 [card]
 name=Forgeborn Oreads
 auto=damage:1 target(creature,player)
-auto=@movedTo(enchantment|myBattlefield):damage:1 target(creature,player)
+auto=_CONSTELLATION_damage:1 target(creature,player)
 text=Constellation -- Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player.
 mana={2}{R}{R}
 type=Enchantment Creature
@@ -43617,7 +43617,7 @@ toughness=1
 [/card]
 [card]
 name=Frontier Mastodon
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then counter(1/1,1)
+auto=_FEROCIOUS_ counter(1/1,1)
 text=Ferocious - Frontier Mastodon enters the battlefield with a +1/+1 counter on it if you control a creature with power 4 or greater.
 mana={2}{G}
 type=Creature
@@ -49765,7 +49765,7 @@ toughness=2
 name=Graypelt Hunter
 abilities=trample
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=Trample -- Whenever Graypelt Hunter or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Graypelt Hunter.
 mana={3}{G}
 type=Creature
@@ -50320,7 +50320,7 @@ type=Sorcery
 [card]
 name=Grim Guardian
 auto=life:-1 opponent
-auto=@movedTo(enchantment|myBattlefield):life:-1 opponent
+auto=_CONSTELLATION_life:-1 opponent
 text=Constellation -- Whenever Grim Guardian or another enchantment enters the battlefield under your control, each opponent loses 1 life.
 mana={2}{B}
 type=Enchantment Creature
@@ -50895,7 +50895,7 @@ toughness=3
 [card]
 name=Grovetender Druids
 auto=pay({1}) token(Plant,Creature Plant,1/1,green)
-auto=@movedTo(other ally|myBattlefield):pay({1}) token(Plant,Creature Plant,1/1,green)
+auto=_RALLY_pay({1}) token(Plant,Creature Plant,1/1,green)
 text=Rally -- Whenever Grovetender Druids or another Ally enters the battlefield under your control, you may pay {1}. If you do, put a 1/1 green Plant creature token onto the battlefield.
 mana={2}{G}{W}
 type=Creature
@@ -50905,7 +50905,7 @@ toughness=3
 [/card]
 [card]
 name=Growing Ranks
-auto=@each my upkeep restriction{type(creature[token]|mybattlefield)~morethan~0}:ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=@each my upkeep restriction{type(creature[token]|mybattlefield)~morethan~0}:ability$! _POPULATE_ !$ controller
 text=At the beginning of your upkeep, populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={2}{GW}{GW}
 type=Enchantment
@@ -51728,7 +51728,7 @@ toughness=4
 [card]
 name=Hada Freeblade
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=Whenever Hada Freeblade or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Hada Freeblade.
 mana={W}
 type=Creature
@@ -51776,7 +51776,7 @@ toughness=1
 [card]
 name=Hagra Diabolist
 auto=may life:-type:ally:mybattlefield target(player)
-auto=@movedTo(other ally|myBattlefield):may life:-type:ally:mybattlefield target(player)
+auto=_RALLY_may life:-type:ally:mybattlefield target(player)
 text=Whenever Hagra Diabolist or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
 mana={4}{B}
 type=Creature
@@ -51850,7 +51850,7 @@ type=Land
 [card]
 name=Halimar Excavator
 auto=deplete:type:ally target(player)
-auto=@movedTo(other ally|myBattlefield):deplete:type:ally target(player)
+auto=_RALLY_deplete:type:ally target(player)
 text=Whenever Halimar Excavator or another Ally enters the battlefield under your control, target player puts the top X cards of his or her library into his or her graveyard, where X is the number of Allies you control.
 mana={1}{U}
 type=Creature
@@ -52595,7 +52595,7 @@ toughness=3
 [card]
 name=Harvestguard Alseids
 auto=name(prevent all damage) target(creature) transforms((,newability[preventalldamage to(this)])) ueot
-auto=@movedto(enchantment|mybattlefield):name(prevent all damage) target(creature) transforms((,newability[preventalldamage to(this)])) ueot
+auto=_CONSTELLATION_name(prevent all damage) target(creature) transforms((,newability[preventalldamage to(this)])) ueot
 text=Constellation -- Whenever Harvestguard Alseids or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn.
 mana={2}{W}
 type=Enchantment Creature
@@ -54151,7 +54151,7 @@ toughness=4
 [card]
 name=Hero of Goma Fada
 auto=choice all(creature|mybattlefield) indestructible ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) indestructible ueot
+auto=_RALLY_all(creature|mybattlefield) indestructible ueot
 text=Rally -- Whenever Hero of Goma Fada or another Ally enters the battlefield under your control, creatures you control gain indestructible until end of turn.
 mana={4}{W}
 type=Creature
@@ -54502,7 +54502,7 @@ toughness=1
 [card]
 name=Highland Berserker
 auto=may all(ally|myBattlefield) first strike ueot
-auto=@movedTo(other ally|myBattlefield):may all(ally|myBattlefield) first strike ueot
+auto=_RALLY_may all(ally|myBattlefield) first strike ueot
 text=Whenever Highland Berserker or another Ally enters the battlefield under your control, you may have Ally creatures you control gain first strike until end of turn.
 mana={1}{R}
 type=Creature
@@ -55509,7 +55509,7 @@ type=Artifact
 [/card]
 [card]
 name=Horncaller's Chant
-auto=token(Rhino,Creature Rhino,4/4,green,trample) && ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=token(Rhino,Creature Rhino,4/4,green,trample) && ability$! _POPULATE_ !$ controller
 text=Put a 4/4 green Rhino creature token with trample onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={7}{G}
 type=Sorcery
@@ -56065,7 +56065,7 @@ type=Instant
 [card]
 name=Humbler of Mortals
 auto=all(creature|myBattlefield) trample ueot
-auto=@movedTo(enchantment|myBattlefield):all(creature|myBattlefield) trample ueot
+auto=_CONSTELLATION_all(creature|myBattlefield) trample ueot
 text=Constellation -- Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn.
 mana={4}{G}{G}
 type=Enchantment Creature
@@ -56934,7 +56934,7 @@ toughness=1
 name=Icy Blast
 target=<prex>creature|battlefield
 auto=tap
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then frozen
+auto=_FEROCIOUS_ frozen
 text=Tap X target creatures. -- Ferocious -- If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps.
 mana={X}{U}
 type=Instant
@@ -60514,7 +60514,7 @@ toughness=3
 [card]
 name=Joraga Bard
 auto=may all(ally|myBattlefield) vigilance ueot
-auto=@movedTo(other ally|myBattlefield):may all(ally|myBattlefield) vigilance ueot
+auto=_RALLY_may all(ally|myBattlefield) vigilance ueot
 text=Whenever Joraga Bard or another Ally enters the battlefield under your control, you may have Ally creatures you control gain vigilance until end of turn.
 mana={3}{G}
 type=Creature
@@ -61085,7 +61085,7 @@ type=Land
 [card]
 name=Kabira Evangel
 auto=may chooseacolor all(ally|mybattlefield) protection from(*[chosencolor]) ueot chooseend
-auto=@movedTo(other ally|myBattlefield):may chooseacolor all(ally|mybattlefield) protection from(*[chosencolor]) ueot chooseend
+auto=_RALLY_may chooseacolor all(ally|mybattlefield) protection from(*[chosencolor]) ueot chooseend
 text=Whenever Kabira Evangel or another Ally enters the battlefield under your control, you may choose a color. If you do, Allies you control gain protection from the chosen color until end of turn.
 mana={2}{W}
 type=Creature
@@ -61205,7 +61205,7 @@ toughness=4
 [card]
 name=Kalastria Healer
 auto=choice life:-1 all(opponent) && life:1 controller
-auto=@movedTo(other ally|myBattlefield):life:-1 all(opponent) && life:1 controller
+auto=_RALLY_life:-1 all(opponent) && life:1 controller
 text=Rally -- Whenever Kalastria Healer or another Ally enters the battlefield under your control, each opponent loses 1 life and you gain 1 life.
 mana={1}{B}
 type=Creature
@@ -62033,7 +62033,7 @@ toughness=3
 name=Kazandu Blademaster
 abilities=first strike,vigilance
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=First strike, vigilance -- Whenever Kazandu Blademaster or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Kazandu Blademaster.
 mana={W}{W}
 type=Creature
@@ -62066,7 +62066,7 @@ toughness=1
 [card]
 name=Kazuul Warlord
 auto=may all(ally|myBattlefield) counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may all(ally|myBattlefield) counter(1/1,1)
+auto=_RALLY_may all(ally|myBattlefield) counter(1/1,1)
 text=Whenever Kazuul Warlord or another Ally enters the battlefield under your control, you may put a +1/+1 counter on each Ally creature you control.
 mana={4}{R}
 type=Creature
@@ -63965,7 +63965,7 @@ toughness=1
 [card]
 name=Kor Bladewhirl
 auto=choice all(creature|mybattlefield) first strike ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) first strike ueot
+auto=_RALLY_all(creature|mybattlefield) first strike ueot
 text=Rally -- Whenever Kor Bladewhirl or another Ally enters the battlefield under your control, creatures you control gain first strike until end of turn.
 mana={1}{W}
 type=Creature
@@ -64007,7 +64007,7 @@ toughness=1
 [card]
 name=Kor Entanglers
 auto=tap target(creature|opponentbattlefield)
-auto=@movedTo(other ally|myBattlefield):tap target(creature|opponentbattlefield)
+auto=_RALLY_tap target(creature|opponentbattlefield)
 text=Rally -- Whenever Kor Entanglers or another Ally enters the battlefield under your control, tap target creature an opponent controls.
 mana={4}{W}
 type=Creature
@@ -65468,7 +65468,7 @@ type=Artifact
 [card]
 name=Lantern Scout
 auto=choice all(creature|mybattlefield) lifelink ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) lifelink ueot
+auto=_RALLY_all(creature|mybattlefield) lifelink ueot
 text=Rally -- Whenever Lantern Scout or another Ally enters the battlefield under your control, creatures you control gain lifelink until end of turn.
 mana={2}{W}
 type=Creature
@@ -68016,7 +68016,6 @@ aicode=activate target(*[zpos<=4]|mylibrary) moveto(myhand)
 auto=@combatdamagefoeof(player) from(this) restriction{type(other creature|myBattlefield)~lessthan~1}:name(look) reveal:4 optionone name(Get a card) target(<1>*|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
 text=Hexproof (This creature can't be the target of spells or abilities your opponents control.) -- Whenever Lone Revenant deals combat damage to a player, if you control no other creatures, look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
 mana={3}{U}{U}
-abilities=opponentshroud
 type=Creature
 subtype=Spirit
 power=4
@@ -70063,7 +70062,7 @@ toughness=4
 [card]
 name=Makindi Patrol
 auto=choice all(creature|mybattlefield) vigilance ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) vigilance ueot
+auto=_RALLY_all(creature|mybattlefield) vigilance ueot
 text=Rally -- Whenever Makindi Patrol or another Ally enters the battlefield under your control, creatures you control gain vigilance until end of turn.
 mana={2}{W}
 type=Creature
@@ -70075,7 +70074,7 @@ toughness=3
 name=Makindi Shieldmate
 abilities=defender
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=Defender -- Whenever Makindi Shieldmate or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Makindi Shieldmate.
 mana={2}{W}
 type=Creature
@@ -77075,7 +77074,7 @@ name=Munda, Ambush Leader
 abilities=haste
 aicode=activate target(<4>ally[zpos<=4]|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
 auto=may name(look) reveal:4 optionone choice name(put on top) target(<anyamount>ally|reveal) moveto(ownerlibrary) optiononeend optiontwo choice name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
-auto=@movedTo(other ally|myBattlefield):may name(look) reveal:4 optionone choice name(put on top) target(<anyamount>ally|reveal) moveto(ownerlibrary) optiononeend optiontwo choice name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
+auto=_RALLY_may name(look) reveal:4 optionone choice name(put on top) target(<anyamount>ally|reveal) moveto(ownerlibrary) optiononeend optiontwo choice name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
 text=Haste -- Rally -- Whenever Munda, Ambush Leader or another Ally enters the battlefield under your control, you may look at the top four cards of your library. If you do, reveal any number of Ally cards from among them, then put those cards on top of your library in any order and the rest on the bottom in any order.
 mana={2}{R}{W}
 type=Legendary Creature
@@ -77106,7 +77105,7 @@ toughness=1
 [card]
 name=Murasa Pyromancer
 auto=may damage:type:ally:mybattlefield target(creature)
-auto=@movedTo(other ally|mybattlefield):may damage:type:ally:mybattlefield target(creature)
+auto=_RALLY_may damage:type:ally:mybattlefield target(creature)
 text=Whenever Murasa Pyromancer or another Ally enters the battlefield under your control, you may have Murasa Pyromancer deal damage to target creature equal to the number of Allies you control.
 mana={4}{R}{R}
 type=Creature
@@ -80001,7 +80000,7 @@ toughness=1
 [card]
 name=Nimana Sell-Sword
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=Whenever Nimana Sell-Sword or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Nimana Sell-Sword.
 mana={3}{B}
 type=Creature
@@ -81165,7 +81164,7 @@ toughness=7
 [card]
 name=Oakheart Dryads
 auto=1/1 target(creature) ueot
-auto=@movedTo(enchantment|myBattlefield):1/1 target(creature) ueot
+auto=_CONSTELLATION_1/1 target(creature) ueot
 text=Constellation -- Whenever Oakheart Dryads or another enchantment enters the battlefield under your control, target creature gets +1/+1 until end of turn.
 mana={2}{G}
 type=Enchantment Creature
@@ -82085,7 +82084,7 @@ subtype=Equipment
 [card]
 name=Ondu Champion
 auto=choice all(creature|mybattlefield) trample ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) trample ueot
+auto=_RALLY_all(creature|mybattlefield) trample ueot
 text=Rally -- Whenever Ondu Champion or another Ally enters the battlefield under your control, creatures you control gain trample until end of turn.
 mana={2}{R}{R}
 type=Creature
@@ -82096,7 +82095,7 @@ toughness=3
 [card]
 name=Ondu Cleric
 auto=may life:type:ally:mybattlefield controller
-auto=@movedTo(other ally|myBattlefield):may life:type:ally:mybattlefield controller
+auto=_RALLY_may life:type:ally:mybattlefield controller
 text=Whenever Ondu Cleric or another Ally enters the battlefield under your control, you may gain life equal to the number of Allies you control.
 mana={1}{W}
 type=Creature
@@ -82619,7 +82618,7 @@ toughness=3
 [card]
 name=Oran-Rief Survivalist
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=Whenever Oran-Rief Survivalist or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Oran-Rief Survivalist.
 mana={1}{G}
 type=Creature
@@ -87594,7 +87593,6 @@ name=Ponyback Brigade
 auto=token(Goblin,Creature Goblin,1/1,red) *3
 facedown={3}
 autofacedown={2}{R}{W}{B}:morph
-autofaceup=token(Goblin,Creature Goblin,1/1,red) *3
 text=When Ponyback Brigade enters the battlefield or is turned face up, put three 1/1 red Goblin creature tokens onto the battlefield. -- Morph {2}{R}{W}{B}: (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
 mana={3}{R}{W}{B}
 type=Creature
@@ -94207,7 +94205,7 @@ toughness=4
 [card]
 name=Resolute Blademaster
 auto=choice all(creature|mybattlefield) double strike ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) double strike ueot
+auto=_RALLY_all(creature|mybattlefield) double strike ueot
 text=Rally -- Whenever Resolute Blademaster or another Ally enters the battlefield under your control, creatures you control gain double strike until end of turn.
 mana={3}{R}{W}
 type=Creature
@@ -96017,7 +96015,7 @@ type=Land
 name=Roar of Challenge
 target=creature
 auto=lure ueot
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0  then indestructible ueot
+auto=_FEROCIOUS_ indestructible ueot
 text=All creatures able to block target creature this turn do so. -- Ferocious - That creature gains indestructible until end of turn if you control a creature with power 4 or greater. 
 mana={2}{G}
 type=Sorcery
@@ -96584,7 +96582,7 @@ toughness=2
 [/card]
 [card]
 name=Rootborn Defenses
-auto=ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=ability$! _POPULATE_ !$ controller
 auto=all(creature|myBattlefield) indestructible ueot
 text=Populate. Creatures you control are indestructible this turn. (To populate, put a token onto the battlefield that's a copy of a creature token you control. Damage and effects that say "destroy" don't destroy indestructible creatures.)
 mana={2}{W}
@@ -99341,7 +99339,7 @@ name=Savage Punch
 target=creature|mybattlefield
 auto=transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>])) ueot
 restriction=type(creature|opponentbattlefield)~morethan~0
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then 2/2 ueot
+auto=_FEROCIOUS_ 2/2 ueot
 text=Target creature you control fights target creature you don't control. -- Ferocious - The creature you control gets +2/+2 until end of turn before it fights if you control a creature with power 4 or greater. 
 mana={1}{G}
 type=Sorcery
@@ -100007,7 +100005,7 @@ toughness=4
 [card]
 name=Scion of Vitu-Ghazi
 auto=if casted(this) then token(Bird,Creature Bird,1/1,flying,white) 
-auto=if casted(this) then ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=if casted(this) then ability$! _POPULATE_ !$ controller
 text=When Scion of Vitu-Ghazi enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate.
 mana={3}{W}{W}
 type=Creature
@@ -101291,7 +101289,7 @@ subtype=Aura
 [card]
 name=Seascape Aerialist
 auto=may all(ally|myBattlefield) flying ueot
-auto=@movedTo(other ally|myBattlefield):may all(ally|myBattlefield) flying ueot
+auto=_RALLY_may all(ally|myBattlefield) flying ueot
 text=Whenever Seascape Aerialist or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
 mana={4}{U}
 type=Creature
@@ -101545,7 +101543,7 @@ type=Sorcery
 [/card]
 [card]
 name=See the Unwritten
-auto=if type(creature[power>3]|mybattlefield)~morethan~0 then reveal:8 revealzone(mylibrary) optionone target(<2>creature|reveal) moveto(mybattlefield) and!( all(*|reveal) moveto(ownergraveyard) )! optiononeend optiontwo all(*|reveal) moveto(ownergraveyard) optiontwoend revealend
+auto=_FEROCIOUS_ reveal:8 revealzone(mylibrary) optionone target(<2>creature|reveal) moveto(mybattlefield) and!( all(*|reveal) moveto(ownergraveyard) )! optiononeend optiontwo all(*|reveal) moveto(ownergraveyard) optiontwoend revealend
 auto=if type(creature[power>3]|mybattlefield)~lessthan~1 then reveal:8 revealzone(mylibrary) optionone target(<1>creature|reveal) moveto(mybattlefield) and!( all(*|reveal) moveto(ownergraveyard) )! optiononeend optiontwo all(*|reveal) moveto(ownergraveyard) optiontwoend revealend
 text=Reveal the top eight cards of your library. You may put a creature card from among them onto the battlefield. Put the rest into your graveyard. -- Ferocious -- If you control a creature with power 4 or greater, you may put two creature cards onto the battlefield instead of one.
 mana={4}{G}{G}
@@ -106965,7 +106963,7 @@ toughness=1
 [card]
 name=Skybind
 auto=(blink) target(*[-enchantment]) ueot
-auto=@movedTo(enchantment|myBattlefield):(blink) target(*[-enchantment]) ueot
+auto=_CONSTELLATION_(blink) target(*[-enchantment]) ueot
 text=Constellation -- Whenever Skybind or another enchantment enters the battlefield under your control, exile target nonenchantment permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step.
 mana={3}{W}{W}
 type=Enchantment
@@ -114486,7 +114484,7 @@ toughness=4
 [card]
 name=Strength from the Fallen
 auto=target(creature) type:creature:mygraveyard/type:creature:mygraveyard ueot
-auto=@movedTo(enchantment|myBattlefield):target(creature) type:creature:mygraveyard/type:creature:mygraveyard ueot
+auto=_CONSTELLATION_target(creature) type:creature:mygraveyard/type:creature:mygraveyard ueot
 text=Constellation -- Whenever Strength from the Fallen or another enchantment enters the battlefield under your control, target creature gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
 mana={1}{G}
 type=Enchantment
@@ -114803,7 +114801,7 @@ type=Sorcery
 [card]
 name=Stubborn Denial
 target=*[-creature]|stack
-auto=if type(creature[power>=4]|mybattlefield) then fizzle else transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) forever
+auto=_FEROCIOUS_ fizzle else transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) forever
 text=Counter target noncreature spell unless its controller pays {1}. -- Ferocious -- If you control a creature with power 4 or greater, counter that spell instead.
 mana={U}
 type=Instant
@@ -115506,7 +115504,7 @@ type=Instant
 [card]
 name=Sundering Growth
 target=artifact,enchantment
-auto=destroy && ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=destroy && ability$! _POPULATE_ !$ controller
 text=Destroy target artifact or enchantment, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={GW}{GW}
 type=Instant
@@ -117279,7 +117277,7 @@ toughness=2
 [card]
 name=Tajuru Archer
 auto=may damage:type:ally:mybattlefield target(creature[flying])
-auto=@movedTo(other ally|mybattlefield):may damage:type:ally:mybattlefield target(creature[flying])text=Whenever Tajuru Archer or another Ally enters the battlefield under your control, you may have Tajuru Archer deal damage to target creature with flying equal to the number of Allies you control.
+auto=_RALLY_may damage:type:ally:mybattlefield target(creature[flying])text=Whenever Tajuru Archer or another Ally enters the battlefield under your control, you may have Tajuru Archer deal damage to target creature with flying equal to the number of Allies you control.
 mana={2}{G}
 type=Creature
 subtype=Elf Archer Ally
@@ -117289,7 +117287,7 @@ toughness=2
 [card]
 name=Tajuru Beastmaster
 auto=choice all(creature|mybattlefield) 1/1 ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) 1/1 ueot
+auto=_RALLY_all(creature|mybattlefield) 1/1 ueot
 text=Rally -- Whenever Tajuru Beastmaster or another Ally enters the battlefield under your control, creatures you control get +1/+1 until end of turn.
 mana={5}{G}
 type=Creature
@@ -117320,7 +117318,7 @@ toughness=1
 [card]
 name=Tajuru Warcaller
 auto=choice all(creature|mybattlefield) 2/2 ueot
-auto=@movedTo(other ally|myBattlefield):all(creature|mybattlefield) 2/2 ueot
+auto=_RALLY_all(creature|mybattlefield) 2/2 ueot
 text=Rally -- Whenever Tajuru Warcaller or another Ally enters the battlefield under your control, creatures you control get +2/+2 until end of turn.
 mana={3}{G}{G}
 type=Creature
@@ -117639,7 +117637,7 @@ toughness=3
 [card]
 name=Talus Paladin
 auto=may counter(1/1,1) all(this) && all(ally|myBattlefield) lifelink ueot
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1) all(this) && all(ally|myBattlefield) lifelink ueot
+auto=_RALLY_may counter(1/1,1) all(this) && all(ally|myBattlefield) lifelink ueot
 text=Whenever Talus Paladin or another Ally enters the battlefield under your control, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on Talus Paladin.
 mana={3}{W}
 type=Creature
@@ -118868,7 +118866,7 @@ type=Artifact
 name=Temur Battle Rage
 target=creature
 auto=double strike ueot
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then trample ueot
+auto=_FEROCIOUS_ trample ueot
 text=Target creature gains double strike until end of turn. (It deals both first-strike and regular combat damage.) -- Ferocious - That creature also gains trample until end of turn if you control a creature with power 4 or greater.
 mana={1}{R}
 type=Instant
@@ -119621,7 +119619,7 @@ type=Sorcery
 [card]
 name=Thassa's Devourer
 auto=deplete:2 target(player)
-auto=@movedTo(enchantment|myBattlefield):deplete:2 target(player)
+auto=_CONSTELLATION_deplete:2 target(player)
 text=Constellation -- Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard.
 mana={4}{U}
 type=Enchantment Creature
@@ -120481,7 +120479,7 @@ toughness=1
 [card]
 name=Thoughtrender Lamia
 auto=ability$!name(discard) target(*|myhand) reject!$ opponent
-auto=@movedTo(enchantment|myBattlefield):ability$!name(discard) target(*|myhand) reject!$ opponent
+auto=_CONSTELLATION_ability$!name(discard) target(*|myhand) reject!$ opponent
 text=Constellation -- Whenever Thoughtrender Lamia or another enchantment enters the battlefield under your control, each opponent discards a card.
 mana={4}{B}{B}
 type=Enchantment Creature
@@ -124408,7 +124406,7 @@ abilities=trample
 [card]
 name=Trostani, Selesnya's Voice
 auto=@movedto(other creature|mybattlefield):all(trigger[to]) dynamicability<!mytgt toughnesslifegain srccontroller!>
-auto={1}{G}{W}{T}:name(populate) clone notatarget(creature[token]|mybattlefield)
+auto={1}{G}{W}{T}:_POPULATE_
 text=Whenever another creature enters the battlefield under your control, you gain life equal to that creature's toughness. -- {1}{G}{W}, {T}: Populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={G}{G}{W}{W}
 type=Legendary Creature
@@ -124419,7 +124417,7 @@ toughness=5
 [card]
 name=Trostani's Judgment
 target=creature
-auto=moveto(exile) && ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=moveto(exile) && ability$! _POPULATE_ !$ controller
 text=Exile target creature, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={5}{W}
 type=Instant
@@ -124628,7 +124626,7 @@ toughness=2
 name=Tuktuk Grunts
 abilities=haste
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1)
+auto=_RALLY_may counter(1/1,1)
 text=Haste -- Whenever Tuktuk Grunts or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Tuktuk Grunts.
 mana={4}{R}
 type=Creature
@@ -124815,7 +124813,7 @@ type=Land
 name=Turntimber Ranger
 auto=counter(1/1,1)
 auto=may token(Wolf,Creature Wolf,2/2,green)
-auto=@movedTo(other ally|myBattlefield):may token(Wolf,Creature Wolf,2/2,green) && counter(1/1,1)
+auto=_RALLY_may token(Wolf,Creature Wolf,2/2,green) && counter(1/1,1)
 text=Whenever Turntimber Ranger or another Ally enters the battlefield under your control, you may put a 2/2 green Wolf creature token onto the battlefield. If you do, put a +1/+1 counter on Turntimber Ranger.
 mana={3}{G}{G}
 type=Creature
@@ -125402,7 +125400,7 @@ toughness=1
 name=Umara Raptor
 abilities=flying
 auto=may counter(1/1,1)
-auto=@movedTo(other ally|myBattlefield):may counter(1/1,1) all(this)
+auto=_RALLY_may counter(1/1,1) all(this)
 text=Flying -- Whenever Umara Raptor or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Umara Raptor.
 mana={2}{U}
 type=Creature
@@ -125765,7 +125763,7 @@ type=Enchantment
 [card]
 name=Underworld Coinsmith
 auto=life:1
-auto=@movedTo(enchantment|myBattlefield):life:1
+auto=_CONSTELLATION_life:1
 auto={W}{B}{L:1}:life:-1 opponent
 text=Constellation -- Whenever Underworld Coinsmith or another enchantment enters the battlefield under your control, you gain 1 life. -- {W}{B}, Pay 1 life: Each opponent loses 1 life.
 mana={W}{B}
@@ -129614,7 +129612,7 @@ toughness=1
 [card]
 name=Vitu-Ghazi Guildmage
 auto={4}{G}{W}:token(Centaur,Creature Centaur,3/3,green)
-auto={2}{G}{W}:name(populate) clone notatarget(creature[token]|mybattlefield)
+auto={2}{G}{W}:_POPULATE_
 text={4}{G}{W}: Put a 3/3 green Centaur creature token onto the battlefield. -- {2}{G}{W}: Populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={G}{W}
 type=Creature
@@ -130779,7 +130777,7 @@ type=Instant
 [/card]
 [card]
 name=Wake the Reflections
-auto=ability$! name(populate) clone notatarget(creature[token]|mybattlefield) !$ controller
+auto=ability$! _POPULATE_ !$ controller
 text=Populate. 
 mana={W}
 type=Sorcery
@@ -132572,7 +132570,7 @@ toughness=3
 [card]
 name=Wayfaring Temple
 anyzone=type:creature:mybattlefield/type:creature:mybattlefield cdaactive
-auto=@combatdamaged(player) from(this) restriction{type(creature[token]|mybattlefield)~morethan~0}:name(populate) clone notatarget(creature[token]|mybattlefield)
+auto=@combatdamaged(player) from(this) restriction{type(creature[token]|mybattlefield)~morethan~0}:_POPULATE_
 text=Wayfaring Temple's power and toughness are each equal to the number of creatures you control. -- Whenever Wayfaring Temple deals combat damage to a player, populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 mana={1}{G}{W}
 type=Creature
@@ -133608,7 +133606,7 @@ type=Instant
 [card]
 name=Whitewater Naiads
 auto=unblockable target(creature) ueot
-auto=@movedTo(enchantment|myBattlefield):unblockable target(creature) ueot
+auto=_CONSTELLATION_unblockable target(creature) ueot
 text=Constellation -- Whenever Whitewater Naiads or another enchantment enters the battlefield under your control, target creature can't be blocked this turn.
 mana={3}{U}{U}
 type=Enchantment Creature
@@ -134370,7 +134368,7 @@ type=Sorcery
 [/card]
 [card]
 name=Winds of Qal Sisma
-auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then preventAllCombatDamage from(creature|opponentbattlefield) ueot else preventAllcombatDamage ueot
+auto=_FEROCIOUS_ preventAllCombatDamage from(creature|opponentbattlefield) ueot else preventAllcombatDamage ueot
 text=Prevent all combat damage that would be dealt this turn. -- Ferocious - If you control a creature with power 4 or greater, instead prevent all combat damage that would be dealt this turn by creatures your opponents control.
 mana={1}{G}
 type=Instant