Bug fixes and macros for servo token

Herald of the Forgotten crashed the game, the modifier * seems to work for this effect since it doesn't do anything while targeting instants or sorceries
Karona, False God
Excavating Anurid
Multiple Choice still neds scry 1 with x>=4
Quarantine Field
Optimus Prime, Inspiring Leader subtype
Gate Colossus
Harmonic Prodigy at least give them their own trigger twice
Faerie Artisans
Liliana, Death Wielder
Greven, Predator Captain
Verazol, the Split Current
Thunderstaff
Mask of Immolation
Purraj of Urborg
Ghired, Conclave Exile
Shatter Assumptions
Brawl-Bash Ogre
Tactical Advantage
The Birth of Meletis
Speaker of the Heavens
Superior Numbers
Flames of the Raze-Boar
Crushing Vines
Rite of Belzenlok
sacrifices should not target or else you can't sacrifice a permanent with shroud

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

@@ -1200,7 +1200,7 @@ type=Enchantment
 name=Aether Chaser
 abilities=first strike
 auto=alterenergy:2 controller
-auto=_ATTACKING_pay({e:2}) create(Servo:Artifact Creature Servo:1/1)
+auto=_ATTACKING_pay({e:2}) _SERVOTOKEN_
 text=First strike -- When Aether Chaser enters the battlefield, you get {E}{E} (two energy counters). -- Whenever Aether Chaser attacks, you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token.
 mana={1}{R}
 type=Creature
@@ -1238,7 +1238,7 @@ type=Sorcery
 [card]
 name=Aether Herder
 auto=alterenergy:2 controller
-auto=_ATTACKING_pay({e:2}) create(Servo:Artifact Creature Servo:1/1)
+auto=_ATTACKING_pay({e:2}) _SERVOTOKEN_
 text=When Aether Herder enters the battlefield, you get {E}{E} (two energy counters). -- Whenever Aether Herder attacks, you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token.
 mana={3}{G}
 type=Creature
@@ -1262,7 +1262,7 @@ type=Land
 name=Aether Inspector
 abilities=vigilance
 auto=alterenergy:2 controller
-auto=_ATTACKING_pay({e:2}) create(Servo:Artifact Creature Servo:1/1)
+auto=_ATTACKING_pay({e:2}) _SERVOTOKEN_
 text=Vigilance -- When Aether Inspector enters the battlefield, you get {E}{E} (two energy counters). -- Whenever Aether Inspector attacks, you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token.
 mana={3}{W}
 type=Creature
@@ -1305,7 +1305,7 @@ type=Sorcery
 name=Aether Poisoner
 abilities=deathtouch
 auto=alterenergy:2 controller
-auto=_ATTACKING_pay({e:2}) create(Servo:Artifact Creature Servo:1/1)
+auto=_ATTACKING_pay({e:2}) _SERVOTOKEN_
 text=Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.) -- When Aether Poisoner enters the battlefield, you get {E}{E} (two energy counters). -- Whenever Aether Poisoner attacks, you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token.
 mana={1}{B}
 type=Creature
@@ -1348,7 +1348,7 @@ type=Enchantment
 name=Aether Swooper
 abilities=flying
 auto=alterenergy:2 controller
-auto=_ATTACKING_pay({e:2}) create(Servo:Artifact Creature Servo:1/1)
+auto=_ATTACKING_pay({e:2}) _SERVOTOKEN_
 text=Flying -- When Aether Swooper enters the battlefield, you get {E}{E} (two energy counters). -- Whenever Aether Swooper attacks, you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token.
 mana={1}{U}
 type=Creature
@@ -21301,8 +21301,8 @@ toughness=3
 [/card]
 [card]
 name=Cogworker's Puzzleknot
-auto=create(Servo:Artifact Creature Servo:1/1)
-auto={1}{W}{S}:create(Servo:Artifact Creature Servo:1/1)
+auto=_SERVOTOKEN_
+auto={1}{W}{S}:_SERVOTOKEN_
 text=When Cogworker's Puzzleknot enters the battlefield, create a 1/1 colorless Servo artifact creature token. -- {1}{W}, Sacrifice Cogworker's Puzzleknot: Create a 1/1 colorless Servo artifact creature token.
 mana={2}
 type=Artifact
@@ -22996,7 +22996,7 @@ type=Instant
 [/card]
 [card]
 name=Countless Gears Renegade
-auto=if revolt then create(Servo:Artifact Creature Servo:1/1)
+auto=if revolt then _SERVOTOKEN_
 text=Revolt -- When Countless Gears Renegade enters the battlefield, if a permanent you controlled left the battlefield this turn, create a 1/1 colorless Servo artifact creature token.
 mana={1}{W}
 type=Creature
@@ -24380,8 +24380,8 @@ subtype=Arcane
 [/card]
 [card]
 name=Crushing Vines
-target=*[artifact;creature&flying]
-auto=destroy
+auto=choice destroy target(creature[flying]) restriction{type(creature[flying])~morethan~0}
+auto=choice destroy target(artifact) restriction{type(artifact)~morethan~0}
 text=Choose one - Destroy target creature with flying, or destroy target artifact.
 mana={2}{G}
 type=Instant
@@ -54501,7 +54501,7 @@ type=Enchantment
 [card]
 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}:create(Servo:Artifact Creature Servo:1/1)
+auto=@each my end restriction{revolt}:_SERVOTOKEN_
 auto={1}{S(creature|mybattlefield)}:scry:1 scrycore delayed dontshow donothing scrycoreend scryend
 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}
@@ -61777,7 +61777,7 @@ type=Instant
 [card]
 name=Karona, False God
 abilities=haste
-auto=@each upkeep:moveTo(opponentbattlefield)
+auto=@each upkeep:untap && moveTo(opponentbattlefield)
 auto=_ATTACKING_chooseatype all(creature[chosentype]) 3/3 ueot chooseend
 text=Haste -- At the beginning of each player's upkeep, that player untaps Karona, False God and gains control of it. -- Whenever Karona attacks, creatures of the creature type of your choice get +3/+3 until end of turn.
 mana={1}{W}{U}{B}{R}{G}
@@ -71972,7 +71972,7 @@ toughness=2
 [card]
 name=Master Trinketeer
 auto=lord(*[servo;thopter]|mybattlefield) 1/1
-auto={3}{W}:create(Servo:Artifact Creature Servo:1/1)
+auto={3}{W}:_SERVOTOKEN_
 text=Servos and Thopters you control get +1/+1. -- {3}{W}: Create a 1/1 colorless Servo artifact creature token.
 mana={2}{W}
 type=Creature
@@ -83809,7 +83809,7 @@ toughness=1
 [/card]
 [card]
 name=Oviya Pashiri, Sage Lifecrafter
-auto={2}{G}{T}:create(Servo:Artifact Creature Servo:1/1)
+auto={2}{G}{T}:_SERVOTOKEN_
 auto={4}{G}{T}:token(Construct,Artifact Creature Construct,type:creature:mybattlefield/type:creature:mybattlefield)
 text={2}{G}, {T}: Create a 1/1 colorless Servo artifact creature token. -- {4}{G}, {T}: Create an X/X colorless Construct artifact creature token, where X is the number of creatures you control.
 mana={G}
@@ -89963,7 +89963,7 @@ toughness=3
 [/card]
 [card]
 name=Purraj of Urborg
-auto=_ATTACKING_first strike ueot
+auto=this(attacking) first strike
 auto=@movedto(*[black]|stack):pay({B}) counter(1/1)
 text=Purraj of Urborg has first strike as long as it's attacking. -- Whenever a player casts a black spell, you may pay {B}. If you do, put a +1/+1 counter on Purraj of Urborg.
 mana={3}{B}{B}
@@ -90406,7 +90406,7 @@ toughness=5
 [card]
 name=Quarantine Field
 auto=counter(0/0,xx,Isolation)
-auto=this(variable{halfpaid}>0) (blink)forsrc target(<upto:counter{0%0.1.Isolation}>*[-land]|opponentbattlefield)
+auto=this(variable{halfpaid}>0) (blink)forsrc target(<upto:xx>*[-land]|opponentbattlefield)
 text=Quarantine Field enters the battlefield with X isolation counters on it. -- When Quarantine Field enters the battlefield, for each isolation counter on it, exile up to one target nonland permanent an opponent controls until Quarantine Field leaves the battlefield.
 mana={X}{X}{W}{W}
 type=Enchantment
@@ -94051,7 +94051,7 @@ toughness=2
 name=Renegade's Getaway
 target=*
 auto=indestructible ueot
-auto=create(Servo:Artifact Creature Servo:1/1)
+auto=_SERVOTOKEN_
 text=Target permanent gains indestructible until end of turn. Create a 1/1 colorless Servo artifact creature token. (Effects that say "destroy" don't destroy a permanent with indestructible, and if it's a creature, it can't be destroyed by damage.)
 mana={2}{B}
 type=Instant
@@ -102960,15 +102960,15 @@ toughness=3
 [/card]
 [card]
 name=Servo Exhibition
-auto=create(Servo:Artifact Creature Servo:1/1)*2
+auto=_SERVOTOKEN_*2
 text=Create two 1/1 colorless Servo artifact creature tokens.
 mana={1}{W}
 type=Sorcery
 [/card]
 [card]
 name=Servo Schematic
-auto=create(Servo:Artifact Creature Servo:1/1)
-auto=_DIES_create(Servo:Artifact Creature Servo:1/1)
+auto=_SERVOTOKEN_
+auto=_DIES__SERVOTOKEN_
 text=When Servo Schematic enters the battlefield or is put into a graveyard from the battlefield, create a 1/1 colorless Servo artifact creature token.
 mana={2}
 type=Artifact
@@ -108357,7 +108357,7 @@ type=Artifact
 [card]
 name=Sly Requisitioner
 other={improvise} name(Improvise)
-auto=@movedto(graveyard) from(artifact[-token]|myBattlefield):create(Servo:Artifact Creature Servo:1/1)
+auto=@movedto(graveyard) from(artifact[-token]|myBattlefield):_SERVOTOKEN_
 text=Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.) -- Whenever a nontoken artifact you control is put into a graveyard from the battlefield, create a 1/1 colorless Servo artifact creature token.
 mana={4}{B}
 type=Creature
@@ -110828,7 +110828,7 @@ type=Artifact
 name=Sphinx of Jwar Isle
 abilities=flying,opponentshroud
 alias=185709
-auto={0}:name(Look) reveal:1 optionone name(look) target(<1>*|reveal) moveto(mylibrary) optiononeend optiontwo name(put it back) all(*|reveal) moveto(mylibrary) optiontwoend revealend
+auto={0}:name(Look) reveal:1 optionone name(look) target(<1>*|reveal) moveto(mylibrary) optiononeend optiontwo name(put it back) all(*|reveal) moveto(mylibrary) optiontwoend revealend limit:5
 text=Flying, shroud -- You may look at the top card of your library. (You may do this at any time.)
 mana={4}{U}{U}
 type=Creature
@@ -112459,7 +112459,7 @@ toughness=2
 [/card]
 [card]
 name=Sram's Expertise
-auto=create(Servo:Artifact Creature Servo:1/1)*3
+auto=_SERVOTOKEN_*3
 auto=may castcard(normal) notatarget(*[-land;manacost<=3]|myhand)
 text=Create three 1/1 colorless Servo artifact creature tokens. -- You may cast a card with mana value 3 or less from your hand without paying its mana cost.
 mana={2}{W}{W}