Bug fixes and new macros for tokens

Pithing Needle and similar cards
Chicken Egg
Metalworker
Smothering Tithe
changed donothing' to donothing?
Aetherstorm Roc
Stomp and Howl
Sword of Sinew and Steel
Midnight Clock
Vulshok War Boar
Fendeep Summoner
Dread Summons
Kefnet's Last Word
Crushing Canopy
Genesis Hydra
Pondering Mage
Smell Fear
Tsabo Tavoc
Lithoform Engine
Team Pennant

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

@@ -2013,7 +2013,7 @@ toughness=1
 [card]
 name=Akki Blizzard-Herder
 auto=_DIES_ability$!sacrifice notatarget(land|mybattlefield)!$ controller && ability$!sacrifice notatarget(land|mybattlefield)!$ opponent
-text=When Akki Blizzard-Herder is put into a graveyard from the battlefield, each player sacrifices a land.
+text=When Akki Blizzard-Herder dies, each player sacrifices a land.
 mana={1}{R}
 type=Creature
 subtype=Goblin Shaman
@@ -11105,7 +11105,7 @@ type=Sorcery
 name=Blade of the Bloodchief
 auto={1}:equip
 auto=@movedto(creature|graveyard) from(creature|battlefield):counter(1/1) && if cantargetcard(vampire) then counter(1/1)
-text=Whenever a creature is put into a graveyard from the battlefield, put a +1/+1 counter on equipped creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead. -- Equip {1}
+text=Whenever a creature dies, put a +1/+1 counter on equipped creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead. -- Equip {1}
 mana={1}
 type=Artifact
 subtype=Equipment
@@ -15850,7 +15850,7 @@ toughness=2
 [card]
 name=Burning Sands
 auto=lord(creature) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(land|mybattlefield) sacrifice]))
-text=Whenever a creature is put into a graveyard from the battlefield, that creature's controller sacrifices a land.
+text=Whenever a creature dies, that creature's controller sacrifices a land.
 mana={3}{R}{R}
 type=Enchantment
 [/card]
@@ -16388,8 +16388,8 @@ toughness=4
 [/card]
 [card]
 name=Caldera Hellion
-auto=may target(<anyamount>other creature|mybattlefield) sacrifice && counter(1/1) all(this)
 auto=all(creature) damage:3
+auto=may target(<anyamount>other creature|mybattlefield) sacrifice && counter(1/1) all(this)
 text=Devour 1 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with that many +1/+1 counters on it.) -- When Caldera Hellion enters the battlefield, it deals 3 damage to each creature.
 mana={3}{R}{R}
 type=Creature
@@ -18045,7 +18045,7 @@ toughness=5
 [card]
 name=Cemetery Puca
 auto=@movedto(creature|graveyard) from(battlefield):all(trigger[from]) pay[[{1}]] copy
-text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
+text=Whenever a creature dies, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
 mana={1}{UB}{UB}
 type=Creature
 subtype=Shapeshifter
@@ -26649,7 +26649,7 @@ type=Sorcery
 [/card]
 [card]
 name=Day of the Dragons
-auto=all(creature|mybattlefield) (blink)forsrc && foreach(creature|mybattlefield) token(Dragon,creature dragon, 5/5,flying red)*1
+auto=all(creature|mybattlefield) (blink)forsrc && foreach(creature|mybattlefield) _DRAGONTOKEN_
 auto=@movedto(this|nonbattlezone):sacrifice all(creature[dragon]|mybattlefield)
 text=When Day of the Dragons enters the battlefield, exile all creatures you control. Then put that many 5/5 red Dragon creature tokens with flying onto the battlefield. -- When Day of the Dragons leaves the battlefield, sacrifice all Dragons you control. Then return the exiled cards to the battlefield under your control.
 mana={4}{U}{U}{U}
@@ -26927,8 +26927,8 @@ type=Instant
 [/card]
 [card]
 name=Death by Dragons
-auto=choice name(you get a Dragon) token(Dragon,Creature Dragon,5/5,red,flying)
-auto=choice name(opponent gets a Dragon) token(Dragon,Creature Dragon,5/5,red,flying) opponent
+auto=choice name(you get a Dragon) _DRAGONTOKEN_
+auto=choice name(opponent gets a Dragon) _DRAGONTOKEN_ opponent
 text=Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield.
 mana={4}{R}{R}
 type=Sorcery
@@ -33691,7 +33691,7 @@ toughness=2
 name=Earthlink
 auto=upcost[{2}] sacrifice
 auto=lord(creature) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(land|mybattlefield) sacrifice]))
-text=At the beginning of your upkeep, sacrifice Earthlink unless you pay {2}. -- Whenever a creature is put into a graveyard from the battlefield, that creature's controller sacrifices a land.
+text=At the beginning of your upkeep, sacrifice Earthlink unless you pay {2}. -- Whenever a creature dies, that creature's controller sacrifices a land.
 mana={3}{B}{R}{G}
 type=Enchantment
 [/card]
@@ -34044,7 +34044,7 @@ subtype=Arcane
 [/card]
 [card]
 name=Efficient Construction
-auto=@movedto(artifact|mystack):create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto=@movedto(artifact|mystack):_THOPTERTOKEN_
 text=Whenever you cast an artifact spell, create a 1/1 colorless Thopter artifact creature token with flying.
 mana={3}{U}
 type=Enchantment
@@ -37876,7 +37876,7 @@ toughness=1
 [card]
 name=Experimental Aviator
 abilities=flying
-auto=create(Thopter:Artifact Creature Thopter:1/1:flying)*2
+auto=_THOPTERTOKEN_*2
 text=Flying -- When Experimental Aviator enters the battlefield, create two 1/1 colorless Thopter artifact creature tokens with flying.
 mana={3}{U}{U}
 type=Creature
@@ -39792,7 +39792,7 @@ type=Instant
 [/card]
 [card]
 name=Fendeep Summoner
-auto={T}:target(<upto:2>swamp) becomes(Treefolk Warrior,3/5) ueot
+auto={T}:target(<upto:2>swamp) transforms((Treefolk Warrior Creature,setpower=3,settoughness=5)) ueot
 text={T}: Up to two target Swamps each become 3/5 Treefolk Warrior creatures in addition to their other types until end of turn.
 mana={4}{B}
 type=Creature
@@ -40431,7 +40431,7 @@ toughness=4
 [/card]
 [card]
 name=Filigree Crawler
-auto=_DIES_create(Thopter:Artifact Creature Thopter:1/1:flying) controller
+auto=_DIES__THOPTERTOKEN_ controller
 text=When Filigree Crawler dies, create a 1/1 colorless Thopter artifact creature token with flying.
 mana={4}
 type=Artifact Creature
@@ -45266,7 +45266,7 @@ type=Artifact
 [/card]
 [card]
 name=Genesis Hydra
-aicode=activate target(<castx>*[-land;-instant;-sorcery;zpos<=castx]|mylibrary) moveto(mybattlefield)
+aicode=activate target(*[-land;-instant;-sorcery;zpos<=castx]|mylibrary) moveto(mybattlefield)
 autostack=if casted(this) then reveal:x optionone target(*[-land;-instant;-sorcery;manacost<=x]|reveal) moveto(mybattlefield) and!( all(*|reveal) moveto(mylibrary) and!(shuffle)! )! optiononeend optiontwo all(*|reveal) moveto(mylibrary) and!(shuffle)! optiontwoend revealend
 auto=counter(1/1,x)
 text=When you cast Genesis Hydra, reveal the top X cards of your library. You may put a nonland permanent card with mana value X or less from among them onto the battlefield. Then shuffle the rest into your library. -- Genesis Hydra enters the battlefield with X +1/+1 counters on it.
@@ -49872,7 +49872,7 @@ toughness=2
 name=Grazing Kelpie
 abilities=persist
 auto={GU}{S}:bottomoflibrary target(other *|graveyard)
-text={(g/u)}, Sacrifice Grazing Kelpie: Put target card in a graveyard on the bottom of its owner's library. -- Persist (When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
+text={(g/u)}, Sacrifice Grazing Kelpie: Put target card in a graveyard on the bottom of its owner's library. -- Persist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
 mana={3}{GU}
 type=Creature
 subtype=Beast
@@ -58319,7 +58319,7 @@ toughness=3
 [card]
 name=Inheritance
 auto=@movedTo(creature|graveyard) from(battlefield):pay({3}) draw:1
-text=Whenever a creature is put into a graveyard from the battlefield, you may pay {3}. If you do, draw a card.
+text=Whenever a creature dies, you may pay {3}. If you do, draw a card.
 mana={W}
 type=Enchantment
 [/card]
@@ -66944,7 +66944,7 @@ type=Instant
 [card]
 name=Lifeline
 auto=lord(creature) transforms((,newability[@movedTo(graveyard) from(this|battlefield) restriction{type(creature|battlefield)~morethan~0}:all(trigger[to]) [phaseaction[endofturn once] moveTo(mybattlefield)])) forever
-text=Whenever a creature is put into a graveyard from the battlefield, if another creature is on the battlefield, return the first card to the battlefield under its owner's control at the beginning of the next end step.
+text=Whenever a creature dies, if another creature is on the battlefield, return the first card to the battlefield under its owner's control at the beginning of the next end step.
 mana={5}
 type=Artifact
 [/card]
@@ -68256,7 +68256,7 @@ type=Land
 [card]
 name=Looter il-Kor
 abilities=shadow
-auto=@damagefoeof(player) from(this):_LOOT_ ueot
+auto=@damagefoeof(player) from(this):_LOOT_
 text=Shadow (This creature can block or be blocked by only creatures with shadow.) -- Whenever Looter il-Kor deals damage to an opponent, draw a card, then discard a card.
 mana={1}{U}
 type=Creature
@@ -72149,7 +72149,7 @@ toughness=1
 [card]
 name=Maverick Thopterist
 other={improvise} name(Improvise)
-auto=create(Thopter:Artifact Creature Thopter:1/1:flying)*2
+auto=_THOPTERTOKEN_*2
 text=Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.) -- When Maverick Thopterist enters the battlefield, create two 1/1 colorless Thopter artifact creature tokens with flying.
 mana={3}{U}{R}
 type=Creature
@@ -86642,7 +86642,7 @@ toughness=2
 [/card]
 [card]
 name=Pia Nalaar
-auto=create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto=_THOPTERTOKEN_
 auto={1}{R}:target(creature[artifact]) 1/0
 auto={1}{S(artifact|mybattlefield)}:target(creature) cantblock
 text=When Pia Nalaar enters the battlefield, create a 1/1 colorless Thopter artifact creature token with flying. -- {1}{R}: Target artifact creature gets +1/+0 until end of turn. -- {1}, Sacrifice an artifact: Target creature can't block this turn.
@@ -89785,7 +89785,7 @@ type=Artifact
 name=Puppeteer Clique
 abilities=flying,persist
 auto=moveto(mybattlefield) and!(transforms((,haste,newability[@my next endofturn:moveTo(exile)])) forever)! target(creature|opponentgraveyard)
-text=Flying -- When Puppeteer Clique enters the battlefield, put target creature card in an opponent's graveyard onto the battlefield under your control. It has haste. At the beginning of your next end step, exile it. -- Persist (When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
+text=Flying -- When Puppeteer Clique enters the battlefield, put target creature card in an opponent's graveyard onto the battlefield under your control. It has haste. At the beginning of your next end step, exile it. -- Persist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
 mana={3}{B}{B}
 type=Creature
 subtype=Faerie Wizard
@@ -109683,7 +109683,7 @@ subtype=Aura
 [card]
 name=Soul Net
 auto=@movedTo(creature|graveyard) from(battlefield):pay({1}) life:1
-text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, you gain 1 life.
+text=Whenever a creature dies, you may pay {1}. If you do, you gain 1 life.
 mana={1}
 type=Artifact
 [/card]
@@ -113690,7 +113690,7 @@ name=Stomp and Howl
 target=artifact
 auto=destroy
 auto=destroy target(enchantment)
-restriction=type(artifact|mybattlefield)~morethan~0,type(enchantment|mybattlefield)~morethan~0
+restriction=type(artifact|battlefield)~morethan~0,type(enchantment|battlefield)~morethan~0
 text=Destroy target artifact and target enchantment.
 mana={2}{G}
 type=Sorcery
@@ -124713,7 +124713,7 @@ toughness=3
 name=Tsabo Tavoc
 abilities=first strike
 auto=protection from(creature[legendary])
-auto={B}{B}:bury target(creature[legendary])
+auto={B}{B}{T}:bury target(creature[legendary])
 text=First strike, protection from legendary creatures -- {B}{B}, {T}: Destroy target legendary creature. It can't be regenerated.
 mana={5}{B}{R}
 type=Legendary Creature
@@ -126030,7 +126030,7 @@ type=Instant
 [/card]
 [card]
 name=Unfulfilled Desires
-auto={1}{L:1}:_LOOT_ ueot
+auto={1}{L:1}:_LOOT_
 text={1}, Pay 1 life: Draw a card, then discard a card.
 mana={1}{U}{B}
 type=Enchantment
@@ -128221,7 +128221,7 @@ subtype=Aura
 [card]
 name=Verdant Succession
 auto=lord(creature[green,-token]) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(creature[share!name!]|mylibrary) moveTo(mybattlefield)]))
-text=Whenever a green nontoken creature is put into a graveyard from the battlefield, that creature's controller may search his or her library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she then shuffles his or her library.
+text=Whenever a green nontoken creature dies, that creature's controller may search his or her library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she then shuffles his or her library.
 mana={4}{G}
 type=Enchantment
 [/card]
@@ -130835,7 +130835,7 @@ toughness=1
 [card]
 name=Vulshok War Boar
 auto=aslongas(artifact|myBattlefield) moveTo(graveyard) notatarget(artifact|myBattlefield) oneshot
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=name(sacrifice Vulshok War Boar) moveTo(graveyard) notatarget(this|myBattlefield)
 text=When Vulshok War Boar enters the battlefield, sacrifice it unless you sacrifice an artifact.
 mana={2}{R}{R}
 type=Creature
@@ -133511,7 +133511,7 @@ toughness=2
 [card]
 name=Whirler Virtuoso
 auto=alterenergy:3 controller
-auto={e:3}:create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto={e:3}:_THOPTERTOKEN_
 text=When Whirler Virtuoso enters the battlefield, you get {E}{E}{E} (three energy counters). -- Pay {E}{E}{E}: Create a 1/1 colorless Thopter artifact creature token with flying.
 mana={1}{U}{R}
 type=Creature
@@ -133521,7 +133521,7 @@ toughness=3
 [/card]
 [card]
 name=Whirlermaker
-auto={4}{T}:create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto={4}{T}:_THOPTERTOKEN_
 text={4}, {T}: Create a 1/1 colorless Thopter artifact creature token with flying.
 mana={3}
 type=Artifact