Bug fixes and macros for Extort, Angel Token and Saproling Token

Ishai, Ojutai Dragonspeaker
Instrument of the Bards
Psychic Theft
Zabaz, the Glimmerwasp
Harvester of Souls
Serra the Benevolent

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

@@ -1790,17 +1790,8 @@ toughness=4
 color=white
 [/card]
 [card]
-name=Angel Spe
-abilities=flying
-type=Creature
-subtype=Angel
-power=4
-toughness=4
-color=white
-[/card]
-[card]
 name=Angel of Condemnation
-abilities=flying, vigilance
+abilities=flying,vigilance
 auto={2}{W}{T}:(blink)ueot target(other creature|battlefield)
 auto=@exerted(this):(blink)forsrc target(other creature|battlefield)
 auto={2}{W}{T}:exert
@@ -1976,7 +1967,7 @@ toughness=2
 name=Angelic Ascension
 target=creature,planeswalker
 auto=moveTo(Exile)
-auto=token(Angel Ang) targetController
+auto=_ANGELTOKEN_ targetController
 text=Exile target creature or planeswalker. Its controller creates a 4/4 white Angel creature token with flying.
 mana={1}{W}
 type=Instant
@@ -14597,7 +14588,7 @@ type=Enchantment
 name=Court of Grace
 auto=_MONARCH_CONTROLLER_
 auto=@each my upkeep restriction{compare(pmonarch)~equalto~0}:token(Spirit,Creature Spirit,1/1,white,flying)
-auto=@each my upkeep restriction{compare(pmonarch)~equalto~1}:token(Angel,Creature Angel,4/4,white,flying)
+auto=@each my upkeep restriction{compare(pmonarch)~equalto~1}:_ANGELTOKEN_
 text=When Court of Grace enters the battlefield, you become the monarch. -- At the beginning of your upkeep, create a 1/1 white Spirit creature token with flying. If you're the monarch, create a 4/4 white Angel creature token with flying instead.
 mana={2}{W}{W}
 type=Enchantment
@@ -22384,7 +22375,7 @@ toughness=8
 [/card]
 [card]
 name=Empyrial Storm
-auto=thisforeach(variable{pnumofcommandcastplus1plusend}) create(Angel:creature Angel:4/4:white:flying)
+auto=thisforeach(variable{pnumofcommandcastplus1plusend}) _ANGELTOKEN_
 text=When you cast this spell, copy it for each time you've cast your commander from the command zone this game. -- Create a 4/4 white Angel creature token with flying.
 mana={4}{W}{W}
 type=Sorcery
@@ -22733,7 +22724,7 @@ type=Instant
 [card]
 name=Entreat the Angels
 autohand=restriction{miracle} pay[[{X}{W}{W}]] name(Miracle) activate name(Miracle) castcard(restricted)
-auto=token(Angel, Creature Angel,4/4,flying,white)*XX
+auto=_ANGELTOKEN_*XX
 text=Put X 4/4 white Angel creature tokens with flying onto the battlefield. -- Miracle {X}{W}{W} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
 mana={X}{X}{W}{W}{W}
 type=Sorcery
@@ -37361,7 +37352,7 @@ subtype=Aura
 [card]
 name=Instrument of the Bards
 auto=@each my upkeep:may name(Put harmony counter) counter(0/0,1,Harmony)
-auto={3}{G}{T}:name(Search creature) transforms((,newability[target(creature[manacost<=hascntharmony]|mylibrary) moveTo(myhand) and!( if cantargetcard(*[legendary]|*) then token(Treasure Sur) )!])) oneshot
+auto={3}{G}{T}:name(Search creature) transforms((,newability[target(creature[manacost=hascntharmony]|mylibrary) moveTo(myhand) and!( if cantargetcard(*[legendary]|*) then token(Treasure Sur) )!])) oneshot
 text=At the beginning of your upkeep, you may put a harmony counter on Instrument of the Bards. -- {3}{G}, {T}: Search your library for a creature card with mana value equal to the number of harmony counters on Instrument of the Bards, reveal it, and put it into your hand. If that card is legendary, create a Treasure token. Then shuffle.
 mana={G}
 type=Legendary Artifact
@@ -37825,7 +37816,7 @@ toughness=3
 [card]
 name=Ishai, Ojutai Dragonspeaker
 abilities=flying,partner
-auto=@movedTo(*|stack): counter(1/1)
+auto=@movedTo(*|opponentStack): counter(1/1)
 text=Flying -- Whenever an opponent casts a spell, put a +1/+1 counter on Ishai, Ojutai Dragonspeaker. -- Partner (You can have two commanders if both have partner.)
 mana={2}{W}{U}
 type=Legendary Creature
@@ -55227,7 +55218,7 @@ toughness=3
 name=Psychic Theft
 target=player
 auto=if type(*[instant;sorcery]|targetedpersonshand)~morethan~0 then name(Exile a card) name(Exile a card) target(*[instant;sorcery]|targetedpersonshand) moveto(myexile) and!( transforms((,newability[canplayfromexile],newability[phaseaction[endofturn once checkex] moveto(ownerhand)])) ueot )!
-auto=if type(*[instant;sorcery]|targetedpersonshand)~equalto~0 then name(Reveal hand) name(Reveal hand) target(*|targetedpersonshand) moveto(myreveal) and!( moveto(targetedpersonshand) )!
+auto=if type(*[instant;sorcery]|targetedpersonshand)~equalto~0 then name(Reveal hand) name(Reveal hand) target(*|targetedpersonshand) moveto(myreveal) and!( moveto(ownerHand) )!
 text=Target player reveals his or her hand. You choose an instant or sorcery card from it and exile that card. You may cast that card for as long as it remains exiled. At the beginning of the next end step, if you haven't cast the card, return it to its owner's hand.
 mana={1}{U}
 type=Sorcery
@@ -61517,21 +61508,13 @@ type=Enchantment
 [card]
 name=Saproling Migration
 kicker={4}
-auto=if paid(kicker) then create(Saproling:creature Saproling:1/1:green:)*2
-auto=create(Saproling:creature Saproling:1/1:green:)*2
+auto=if paid(kicker) then _SAPROLINGTOKEN_*2
+auto=_SAPROLINGTOKEN_*2
 text=Kicker {4} (You may pay an additional {4} as you cast this spell.) -- Create two 1/1 green Saproling creature tokens. If this spell was kicked, create four of those tokens instead.
 mana={1}{G}
 type=Sorcery
 [/card]
 [card]
-name=Saproling Spo
-type=Creature
-subtype=Saproling
-power=1
-toughness=1
-color=green
-[/card]
-[card]
 name=Saproling Symbiosis
 abilities=flash
 restriction=myturnonly
@@ -68067,7 +68050,7 @@ toughness=6
 [card]
 name=Speaker of the Heavens
 abilities=vigilance,lifelink
-auto={T}:token(Angel Spe) restriction{compare(lifetotalminusstartinglifeminusend)~morethan~6} asSorcery
+auto={T}:token(_ANGELTOKEN_) restriction{compare(lifetotalminusstartinglifeminusend)~morethan~6} asSorcery
 text=Vigilance, lifelink -- {T}: Create a 4/4 white Angel creature token with flying. Activate this ability only if you have at least 7 life more than your starting life total and only any time you could cast a sorcery.
 mana={W}
 type=Creature
@@ -69102,7 +69085,7 @@ toughness=2
 name=Sporeweb Weaver
 abilities=reach
 auto=cantbetargetof(*[blue])
-auto=_ENRAGE_life:1 controller && token(Saproling Spo)
+auto=_ENRAGE_life:1 controller && _SAPROLINGTOKEN_
 text=Reach, hexproof from blue -- Whenever Sporeweb Weaver is dealt damage, you gain 1 life and create a 1/1 green Saproling creature token.
 mana={2}{G}
 type=Creature
@@ -73264,7 +73247,7 @@ name=Tendershoot Dryad
 auto=_ASCEND_
 auto=@movedTo(*|myBattlefield) restriction{type(City's Blessing|mybattlefield)~equalto~0}:_ASCEND_
 auto=_CITY'S_BLESSING_ lord(Saproling|myBattlefield) 2/2
-auto=@each upkeep:create(saproling:creature saproling:1/1:green)
+auto=@each upkeep:_SAPROLINGTOKEN_
 text=Ascend (If you control ten or more permanents, you get the city's blessing for the rest of the game.) -- At the beginning of each upkeep, create a 1/1 green Saproling creature token. -- Saprolings you control get +2/+2 as long as you have the city's blessing.
 mana={4}{G}
 type=Creature
@@ -74818,7 +74801,7 @@ type=Land
 [/card]
 [card]
 name=Thrull Parasite
-auto=@movedto(*|mystack):pay({WB}) life:-1 opponent && life:1 controller
+auto=_EXTORT_
 auto={T}{L:2}:name(Remove a counter) name(Remove a counter) removesinglecountertype(1) target(*[-land;counter{any}]|myBattlefield)
 text=Extort (Whenever you cast a spell, you may pay {WB}. If you do, each opponent loses 1 life and you gain that much life.) -- {T}, Pay 2 life: Remove a counter from target nonland permanent.
 mana={B}
@@ -83527,7 +83510,7 @@ toughness=4
 [/card]
 [card]
 name=Yavimaya Sapherd
-auto=create(saproling:creature saproling:1/1:green)
+auto=_SAPROLINGTOKEN_
 text=When Yavimaya Sapherd enters the battlefield, create a 1/1 green Saproling creature token.
 mana={2}{G}
 type=Creature
@@ -83793,7 +83776,7 @@ toughness=4
 [card]
 name=Zabaz, the Glimmerwasp
 abilities=modular
-modular=3
+modular=1
 auto={R}:name(Destroy artifact) target(artifact|myBattlefield)
 auto={W}:name(Gains flying) transforms((,newability[flying])) ueot
 auto=@counteradded(1/1) from(*[modular]|myBattlefield) except(Zabaz, the Glimmerwasp):may name(Trigger modular) counter(1/1) target(creature[counter{1/1.1}]|myBattlefield)
@@ -84113,14 +84096,6 @@ power=3
 toughness=5
 [/card]
 [card]
-name=Zombie Xat
-type=Creature
-subtype=Zombie
-power=2
-toughness=2
-color=black
-[/card]
-[card]
 name=Zulaport Duelist
 abilities=flash
 auto=may target(creature) -2/-0 ueot && deplete:2 targetcontroller