Changes made to Alchemy Innistrad, bug fixes in primitives

Changes made to alchemy innistrad to have the correct multiverseid values and better image quality
Nahiri, the Unforgiving
Kaervek's Spite
Ox Drover
Volrath, the Shapestealer
Garna, Bloodfist of Keld

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

@@ -302,7 +302,7 @@ toughness=5
 name=Access Denied
 target=*|stack
 auto=fizzle
-anyzone=if casted(this) then if compare(hasstorecard)~morethan~0 then token(Thopter,Artifact Creature Thopter,1/1,flying)*storedmanacost
+anyzone=if casted(this) then if compare(hasstorecard)~morethan~0 then _THOPTERTOKEN_*storedmanacost
 text=Counter target spell. Create X 1/1 colorless Thopter artifact creature tokens with flying, where X is that spell's mana value.
 mana={3}{U}{U}
 type=Instant
@@ -851,7 +851,7 @@ toughness=5
 [/card]
 [card]
 name=Aether Channeler
-auto=choice token(Bird,Creature Bird,1/1,white,flying)
+auto=choice _BIRDTOKEN_
 auto=choice target(other *[-land]) moveto(hand)
 auto=choice draw:1
 text=When Aether Channeler enters, choose one - -- - Create a 1/1 white Bird creature token with flying. -- - Return another target nonland permanent to its owner's hand. -- - Draw a card.
@@ -1419,7 +1419,7 @@ toughness=3
 [card]
 name=Akim, the Soaring Wind
 abilities=flying
-auto=@movedTo(*[token]|myBattlefield) turnlimited:token(Bird,creature Bird,1/1,white,flying)
+auto=@movedTo(*[token]|myBattlefield) turnlimited:_BIRDTOKEN_
 auto={3}{U}{R}{W}:all(creature[token]|myBattlefield) double strike ueot
 text=Flying -- Whenever you create one or more tokens for the first time each turn, create a 1/1 white Bird creature token with flying. -- {3}{U}{R}{W}: Creature tokens you control gain double strike until end of turn.
 mana={2}{U}{R}{W}
@@ -8421,8 +8421,8 @@ name=Beck // Call
 abilities=hasnokicker
 other={4}{W}{U} name(Call)
 kicker={4}{W}{U} name(Fuse)
-auto=if paid(alternative) then token(Bird,Creature Bird,1/1,white,flying)*4
-auto=if paid(kicker) then ability$!name(Create 4 birds) name(Create 4 birds) token(Bird,Creature Bird,1/1,white,flying)*4!$ controller
+auto=if paid(alternative) then _BIRDTOKEN_*4
+auto=if paid(kicker) then ability$!name(Create 4 birds) name(Create 4 birds) _BIRDTOKEN_*4!$ controller
 auto=ifnot paid(alternative) then emblem transforms((,newability[@movedto(creature|battlefield):may name(Draw 1 card) draw:1 controller])) ueot
 text=Whenever a creature enters this turn, you may draw a card. // Put four 1/1 white Bird creature tokens with flying onto the battlefield. -- -- Fuse (You may cast one or both halves of this card from your hand.)
 mana={G}{U}
@@ -35079,7 +35079,7 @@ toughness=2
 [/card]
 [card]
 name=Fact or Fiction
-auto=reveal:5 optionone target(<upto:3>*|reveal) moveto(hand) optiononeend optiontwo name(put in grave) target(<5>*|reveal) moveto(mygraveyard) and!( all(*|reveal) moveto(mygraveyard) )! optiontwoend revealend
+auto=reveal:5 optionone target(<upto:3>*|reveal) moveto(hand) optiononeend optiontwo name(put in grave) all(*|reveal) moveto(mygraveyard) optiontwoend revealend
 text=Reveal the top five cards of your library. An opponent separates those cards into two piles. Put one pile into your hand and the other into your graveyard.
 mana={3}{U}
 type=Instant
@@ -40977,8 +40977,8 @@ toughness=7
 [/card]
 [card]
 name=Garna, Bloodfist of Keld
-auto=@movedTo(graveyard) from(other creature[attacking]|battlefield):draw:1
-auto=@movedTo(graveyard) from(other creature[-attacking]|battlefield):damage:1 opponent
+auto=@movedTo(graveyard) from(other creature[attacking]|mybattlefield):draw:1
+auto=@movedTo(graveyard) from(other creature[-attacking]|mybattlefield):damage:1 opponent
 text=Whenever another creature you control dies, draw a card if it was attacking. Otherwise, Garna, Bloodfist of Keld deals 1 damage to each opponent.
 mana={1}{B}{R}{R}
 type=Legendary Creature
@@ -41468,7 +41468,7 @@ toughness=3
 [/card]
 [card]
 name=Generator Servant
-auto={T}{S}:add{2} && emblem transforms((,newability[all(creature[fresh]|mybattlefield) haste ueot limit:1])) ueot
+auto={T}{S}:add{2} && emblem transforms((,newability[@movedTo(creature|mybattlefield) turnLimited:all(trigger) haste ueot])) ueot
 text={T}, Sacrifice Generator Servant: Add {2}. If that mana is spent on a creature spell, it gains haste until end of turn. (That creature can attack and {T} as soon as it comes under your control.)
 mana={1}{R}
 type=Creature
@@ -57304,7 +57304,7 @@ toughness=1
 name=Kaervek's Spite
 target=player
 auto=life:-5
-auto=sacrifice all(*|battlefield)
+auto=sacrifice all(*|myBattlefield)
 auto=reject all(*|myhand)
 text=As an additional cost to cast Kaervek's Spite, sacrifice all permanents you control and discard your hand. -- Target player loses 5 life.
 mana={B}{B}{B}
@@ -59408,7 +59408,7 @@ toughness=2
 [/card]
 [card]
 name=Knight of Doves
-auto=@movedTo(enchantment|mygraveyard) from(battlefield):create(bird:creature bird:1/1:white:flying)
+auto=@movedTo(enchantment|mygraveyard) from(battlefield):_BIRDTOKEN_
 text=Whenever an enchantment you control is put into a graveyard from the battlefield, create a 1/1 white Bird creature token with flying.
 mana={2}{W}
 type=Creature
@@ -60110,8 +60110,8 @@ toughness=3
 [card]
 name=Krenko, Baron of Tin Street
 abilities=haste
-auto={T}{S(artifact|myBattlefield)}:counter(1/1) all(goblin|myBattlefield)
 auto=@movedTo(graveyard) from(artifact|battlefield):pay({R}) create(goblin:creature goblin:1/1:red:haste ueot)
+auto={T}{S(artifact|myBattlefield)}:counter(1/1) all(goblin|myBattlefield)
 text=Haste -- {T}, Sacrifice an artifact: Put a +1/+1 counter on each Goblin you control. -- Whenever an artifact is put into a graveyard from the battlefield, you may pay {R}. If you do, create a 1/1 red Goblin creature token. It gains haste until end of turn.
 mana={2}{R}
 type=Legendary Creature
@@ -76995,7 +76995,8 @@ toughness=3
 [/card]
 [card]
 name=Ox Drover
-abilities=vigilance,cantbeblockedby(Ox)
+abilities=vigilance
+auto=cantbeblockedby(creature[Ox])
 auto=draw:1
 auto=target(opponent) create(ox:ox creature:2/4:white) targetedplayer
 auto=_ATTACKING_draw:1
@@ -79127,8 +79128,8 @@ toughness=3
 [card]
 name=Pia Nalaar, Consul of Revival
 auto=lord(thopter|myBattlefield) haste
-auto=@movedto(land|mybattlefield) from(myexile):name(Create thopter) token(Thopter,Artifact Creature Thopter,1/1,flying)
-auto=@movedto(*|mystack) from(myexile):name(Create thopter) token(Thopter,Artifact Creature Thopter,1/1,flying)
+auto=@movedto(land|mybattlefield) from(myexile):name(Create thopter) _THOPTERTOKEN_
+auto=@movedto(*|mystack) from(myexile):name(Create thopter) _THOPTERTOKEN_
 text=Thopters you control have haste. -- Whenever you play a land from exile or cast a spell from exile, create a 1/1 colorless Thopter artifact creature token with flying.
 mana={R}{W}
 type=Legendary Creature
@@ -83965,7 +83966,7 @@ type=Instant
 [card]
 name=Ram Through
 target=creature|mybattlefield
-auto=transforms((,newability[dynamicability<!powerstrike!> target(creature|opponentbattlefield)])) oneshot
+auto=_PUNCH_
 text=Target creature you control deals damage equal to its power to target creature you don't control. If the creature you control has trample, excess damage is dealt to that creature's controller instead.
 mana={1}{G}
 type=Instant
@@ -100300,7 +100301,7 @@ name=Soul of Migration
 abilities=flying
 other={3}{W} name(Evoke)
 auto=alternative sacrifice
-auto=token(Bird,Creature Bird,1/1,white,flying)*2
+auto=_BIRDTOKEN_*2
 text=Flying -- When Soul of Migration enters, create two 1/1 white Bird creature tokens with flying. -- Evoke {3}{W} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters.)
 mana={5}{W}{W}
 type=Creature
@@ -101478,7 +101479,7 @@ name=Spider Food
 auto=if type(artifact)~morethan~0 then choice name() name(Destroy target artifact) destroy target(artifact)
 auto=if type(enchantment)~morethan~0 then choice name() name(Destroy target enchantment) destroy target(enchantment)
 auto=if type(creature[flying])~morethan~0 then choice name() name(Destroy target flying creature) destroy target(creature[flying])
-auto=choice name(No targets) doNothing
+auto=choice name(No target) doNothing
 auto=_FOOD_
 text=Destroy up to one target artifact, enchantment, or creature with flying. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 mana={2}{G}
@@ -109803,7 +109804,7 @@ toughness=1
 name=The Raven's Warning
 auto=counter(0/0,1,Lore)
 auto=@each my firstmain:counter(0/0,1,Lore)
-auto=token(Bird,Creature Bird,1/1,white,flying) && life:2 controller
+auto=_BIRDTOKEN_ && life:2 controller
 auto=@combatdamageof(player) from(creature[flying]|mybattlefield) restriction{compare(hascntlore)~equalto~2}:name(Draw card) draw:1 controller
 auto=@combatdamageof(player) from(creature[flying]|mybattlefield) restriction{compare(hascntlore)~equalto~2}:name(Look opponent hand and draw) target(*|opponenthand) moveto(opponenthand) and!( draw:1 controller )!
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) may name(Put card on library) target(*|mysideboard) moveTo(mylibrary)
@@ -113356,7 +113357,7 @@ toughness=2
 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}:_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) && _TREASURE_*3
+auto=@counteradded(0/0,1,landmark) from(this):this(counter{0/0.3.landmark}=) removeallcounters(0/0.1.landmark) && flip(Treasure Cove) && ability$! _TREASURE_*3 !$ controller 
 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."
 mana={2}
 type=Artifact
@@ -115059,7 +115060,7 @@ autocommandzone=@counteradded(0/0,1,Explore) from(Undercity|mycommandzone) restr
 autocommandzone=@counteradded(0/0,1,Explore) from(Undercity|mycommandzone) restriction{compare(hascntexplore)~equalto~4,compare(hascntstash)~equalto~1}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Catacombs) name(Catacombs) token(Skeleton^Creature Skeleton^4/1^black^menace)!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Undercity|mycommandzone) restriction{compare(hascntexplore)~equalto~4,compare(hascntarena)~equalto~1}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Archives or Catacombs) name(Archives or Catacombs) transforms((,newability[choice name(Draw a card) draw:1 controller],newability[choice name(Create skeleton) name(Create skeleton) token(Skeleton^Creature Skeleton^4/1^black^menace)])) oneshot!$ controller
 autocommandzone=@counteradded(0/0,1,Explore) from(Undercity|mycommandzone) restriction{compare(hascntexplore)~equalto~5}:choice name(Dungeon completed) all(Undercity|mycommandzone) completedungeon:1 controller
-autocommandzone=@counteradded(0/0,1,Explore) from(Undercity|mycommandzone) restriction{compare(hascntexplore)~equalto~5}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Throne of the Dead Three) name(Throne of the Dead Three) reveal:10 optionone name(Choose a creature) target(creature|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(Put back) target(*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!( shuffle )! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!( moveTo(myBattlefield) and!( transforms((,newability[counter(1/1.3)],newability[counter(0/0,1,Hexproof)],newability[this(counter{0/0.1.Hexproof}>=1) hexproof],newability[phaseaction[my untap once sourceinplay] removeallcounters(0/0.1.Hexproof)])) ueot )! )! afterrevealedend revealend!$ controller
+autocommandzone=@counteradded(0/0,1,Explore) from(Undercity|mycommandzone) restriction{compare(hascntexplore)~equalto~5}:thisforeach(variable{type:*[twodngtrg]:myBattlefieldplus1plusend}) ability$!name(Throne of the Dead Three) name(Throne of the Dead Three) reveal:10 optionone name(Choose a creature) target(creature|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(Put back) all(*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!( shuffle )! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!( moveTo(myBattlefield) and!( transforms((,newability[counter(1/1.3)],newability[counter(0/0,1,Hexproof)],newability[this(counter{0/0.1.Hexproof}>=1) hexproof],newability[phaseaction[my untap once sourceinplay] removeallcounters(0/0.1.Hexproof)])) ueot )! )! afterrevealedend revealend!$ controller
 text=You can't enter this dungeon unless you "venture into Undercity." -- Secret Entrance - Search your library for a basic land card, reveal it, put it into your hand, then shuffle. (Leads to: Forge, Lost Well) -- Forge - Put two +1/+1 counters on target creature. (Leads to: Trap!, Arena) -- Lost Well - Scry 2. (Leads to: Arena, Stash) -- Trap! - Target player loses 5 life. (Leads to: Archives) -- Arena - Goad target creature. (Leads to: Archives, Catacombs) -- Stash - Create a Treasure token. (Leads to: Catacombs) -- Archives - Draw a card. (Leads to: Throne of the Dead Three) -- Catacombs - Create a 4/1 black Skeleton creature token with menace. (Leads to: Throne of the Dead Three) -- Throne of the Dead Three - Reveal the top ten cards of your library. Put a creature card from among them onto the battlefield with three +1/+1 counters on it. It gains hexproof until your next turn. Then shuffle.
 type=Dungeon
 [/card]
@@ -118634,8 +118635,8 @@ toughness=3
 [/card]
 [card]
 name=Vivien's Invocation
-aicode=activate target(creature[zpos<=7]|mylibrary) moveto(mybattlefield) and!(transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike!>])) oneshot)!
-auto=reveal:7 optionone name(Get Creature) target(<1>creature|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) bottomoflibrary )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike!>])) oneshot)! )! afterrevealedend revealend
+aicode=activate target(creature[zpos<=7]|mylibrary) moveto(mybattlefield) and!(_PUNCH_)!
+auto=reveal:7 optionone name(Get Creature) target(<1>creature|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) bottomoflibrary )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(_PUNCH_)! )! afterrevealedend revealend
 text=Look at the top seven cards of your library. You may put a creature card from among them onto the battlefield. Put the rest on the bottom of your library in a random order. When a creature is put onto the battlefield this way, it deals damage equal to its power to target creature an opponent controls.
 mana={5}{G}{G}
 type=Sorcery
@@ -119185,7 +119186,7 @@ type=Enchantment
 [/card]
 [card]
 name=Volrath, the Shapestealer
-auto=@each my combatbegins:target(creature) counter(-1/-1)
+auto=@each my combatbegins:may target(creature) counter(-1/-1)
 auto={1}:copy target(creature[counter{any}]) ueot
 text=At the beginning of combat on your turn, put a -1/-1 counter on up to one target creature. -- {1}: Until your next turn, Volrath, the Shapestealer becomes a copy of target creature with a counter on it, except it's 7/5 and it has this ability.
 mana={2}{B}{G}{U}
@@ -121972,8 +121973,8 @@ toughness=6
 [card]
 name=Wingmantle Chaplain
 abilities=defender
-auto=create(bird:creature bird:1/1:white:flying)*type:creature[defender]:mybattlefield
-auto=@movedTo(creature[defender]|myBattlefield):create(bird:creature bird:1/1:white:flying)
+auto=_BIRDTOKEN_*type:creature[defender]:mybattlefield
+auto=@movedTo(creature[defender]|myBattlefield):_BIRDTOKEN_
 text=Defender -- When Wingmantle Chaplain enters, create a 1/1 white Bird creature token with flying for each creature with defender you control. -- Whenever another creature with defender enters under your control, create a 1/1 white Bird creature token with flying.
 mana={3}{W}
 type=Creature