Removed extra spaces, dinosaur type errata, bug fixes

Ogre Errant
Brightwood Tracker
Visions of Dread ability$! is the correct syntax
14 Creatures Have Been Errata’d To Be Dinosaurs
Demanding Dragon
Remorseless Punishment
Custodi Lich
So Shiny
Stromkirk Bloodthief
Savage Swipe
Curious Herd target
Wand of Denial
Ornate Kanzashi
Map the Wastes
Misdirection
Tithe Taker

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

@@ -9653,7 +9653,7 @@ toughness=3
 [/card]
 [card]
 name=Brightwood Tracker
-auto={5}{G}{T}:name(look) reveal:4 optionone name(Get a creature card) target(<1>*creature|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
+auto={5}{G}{T}:name(look) reveal:4 optionone name(Get a creature card) target(creature|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
 text={5}{G}, {T}: Look at the top four cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 mana={3}{G}
 type=Creature
@@ -14743,8 +14743,7 @@ toughness=3
 [/card]
 [card]
 name=Commune with Dinosaurs
-auto=choice name(dinosaur) moverandom(dinosaur) from(mylibrary) to(myhand)
+auto=name(look) reveal:5 optionone name(Get a card) target(<1>*[dinosaur;land]|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<5>*|reveal) bottomoflibrary optiontwoend revealend
-auto=choice name(land) moverandom(land) from(mylibrary) to(myhand)
 text=Look at the top five cards of your library. You may reveal a Dinosaur or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 mana={G}
 type=Sorcery
@@ -16827,7 +16826,8 @@ toughness=3
 [/card]
 [card]
 name=Curious Herd
-auto=name(choose opponent) notatarget(opponent) deplete:0 && token(Beast Cur)*foreach(artifact|opponentBattlefield)
+target=opponent
+auto=token(Beast Cur)*type:artifact:opponentBattlefield
 text=Choose target opponent. You create X 3/3 green Beast creature tokens, where X is the number of artifacts that player controls.
 mana={3}{G}
 type=Instant
@@ -17174,7 +17174,8 @@ type=Artifact
 [card]
 name=Custodi Lich
 auto=_MONARCH_CONTROLLER_
-auto=@becomesmonarchof(player):target(player) ability$!name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ targetedplayer
+auto=target(player) ability$!name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ targetedPlayer
+auto=@becomesmonarchof(player):target(player) ability$!name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ targetedPlayer
 text=When Custodi Lich enters the battlefield, you become the monarch. -- Whenever you become the monarch, target player sacrifices a creature.
 mana={3}{B}{B}
 type=Creature
@@ -18886,7 +18887,7 @@ subtype=Equipment
 [card]
 name=Demanding Dragon
 abilities=flying
-auto=damage:5 target(opponent)
+auto=target(opponent) ability$!name(Choose one) choice damage:5 controller _ choice notatarget(creature|mybattlefield) Sacrifice!$
 text=Flying -- When Demanding Dragon enters the battlefield, it deals 5 damage to target opponent unless that player sacrifices a creature.
 mana={3}{R}{R}
 type=Creature
@@ -20723,7 +20724,7 @@ toughness=3
 [card]
 name=Domineering Will
 target=player
-auto=ability!$name(Gain control) name(Gain control) target(<upto:3>creature[-attacking]|opponentbattlefield) moveto(mybattlefield) and!( transforms((,newability[untap],newability[mustblock],newability[phaseaction[endofturn once sourceinplay] moveto(ownerbattlefield)])) ueot )! !$ targetedplayer
+auto=ability$!name(Gain control) name(Gain control) target(<upto:3>creature[-attacking]|opponentbattlefield) moveto(mybattlefield) and!( transforms((,newability[untap],newability[mustblock],newability[phaseaction[endofturn once sourceinplay] moveto(ownerbattlefield)])) ueot )! !$ targetedplayer
 text=Target player gains control of up to three target nonattacking creatures until end of turn. Untap those creatures. They block this turn if able.
 mana={3}{U}
 type=Instant
@@ -34823,7 +34824,7 @@ type=Land
 name=Hall of Storm Giants
 auto=if compare(type:land:myBattlefield)~morethan~2 then tap(noevent)
 auto={T}:Add{U}
-auto={5}{U}:name(Becomes giant) transforms((,newability[becomes(Creature Giant^7/7^blue) ueot],newability[_WARD_(3)])) ueot
+auto={5}{U}:name(Becomes giant) transforms((,newability[becomes(Creature Giant^7/7^blue) ueot],newability[@targeted(this) from(*|opponentstack):choice name(This spell costs 3 more) name(This spell costs 3 more) target(*|opponentstack) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) oneshot])) ueot
 text=If you control two or more other lands, Hall of Storm Giants enters the battlefield tapped. -- {T}: Add {U}. -- {5}{U}: Until end of turn, Hall of Storm Giants becomes a 7/7 blue Giant creature with ward {3}. it's still a land. (Whenever it becomes the target of a spell or ability an opponent controls, counter it unless that player pays {3}.)
 type=Land
 [/card]
@@ -38778,7 +38779,7 @@ name=Imperiosaur
 text=Spend only mana produced by basic lands to cast Imperiosaur.
 mana={2}{G}{G}
 type=Creature
-subtype=Lizard
+subtype=Dinosaur
 power=5
 toughness=5
 [/card]
@@ -49953,7 +49954,7 @@ toughness=2
 [card]
 name=Misdirection
 other={E(*[blue]|myhand)} name(Exile blue card)
-target=*|stack
+target=instant,sorcery|stack
 auto=fizzle
 auto=activate castcard(copied noevent)
 text=You may exile a blue card from your hand rather than pay Misdirection's mana cost. -- Change the target of target spell with a single target.
@@ -52476,7 +52477,7 @@ restriction=type(*[creature;planeswalker]|battlefield)~morethan~0
 otherrestriction=type(*|graveyard)~morethan~0
 flashback={3}{B} name(Return)
 auto=ifnot paid(flashback) then target(*[creature;planeswalker]|battlefield) destroy
-auto=if paid(flashback) then target(*|graveyard) moveto(exile) && _ZOMBIETOKEN_
+auto=if paid(flashback) then moveto(exile) target(*|graveyard) && _ZOMBIETOKEN_
 text=Destroy target creature or planeswalker. -- Aftermath (Cast this spell only from your graveyard. Then exile it.) Exile target card from a graveyard. Create a 2/2 black Zombie creature token.
 mana={1}{B}{B}
 type=Sorcery
@@ -54097,7 +54098,7 @@ toughness=3
 [/card]
 [card]
 name=Ogre Errant
-auto=_ATTACKING_target(knight[attacking]) menace ueot
+auto=_ATTACKING_target(other knight[attacking]) menace ueot
 text=Whenever Ogre Errant attacks, another target attacking Knight gains menace until end of turn. (It can't be blocked except by two or more creatures.)
 mana={3}{R}
 type=Creature
@@ -55170,7 +55171,7 @@ toughness=6
 [/card]
 [card]
 name=Ornate Kanzashi
-auto={2}{T}:all(*[zpos=1]|opponentlibrary) moveto(exile) and!(activate castcard(copied) ueot)! 
+auto={2}{T}:target(opponent) moveto(myexile) and!( transforms((,canplayfromexile)) ueot )! all(*[zpos=1]|opponentlibrary)
 text={2}, {T}: Target opponent exiles the top card of his or her library. You may play that card this turn.
 mana={5}
 type=Artifact
@@ -62351,7 +62352,8 @@ toughness=1
 [/card]
 [card]
 name=Remorseless Punishment
-auto=ability$!name(Choose one) choice name(Pay 5 life) life:-5 controller _ choice name(Discards 2 cards) notatarget(<2>*|myhand) reject _ choice name(Sacrifice) notatarget(*[creature;planeswalker]|mybattlefield)!$ opponent
+target=opponent
+auto=ability$!name(Choose one) choice life:-5 controller _ choice name(Discards 2 cards) notatarget(<2>*|myhand) reject _ choice notatarget(*[creature;planeswalker]|mybattlefield) Sacrifice!$ && ability$!name(Choose one) choice life:-5 controller _ choice name(Discards 2 cards) notatarget(<2>*|myhand) reject _ choice notatarget(*[creature;planeswalker]|mybattlefield) Sacrifice!$
 text=Target opponent loses 5 life unless that player discards two cards or sacrifices a creature or planeswalker. Repeat this process once.
 mana={3}{B}{B}
 type=Sorcery
@@ -63216,7 +63218,7 @@ type=Land
 [card]
 name=Rhystic Lightning
 target=creature,player
-auto=ability$!name(pay to reduce damage) pay[[{2}]] name(pay 2 mana) damage:2?damage:4!$ opponent
+auto=ability$!name(pay to reduce damage) pay[[{2}]] name(pay 2 mana) damage:2?damage:4!$ 
 text=Rhystic Lightning deals 4 damage to target creature or player unless that creature's controller or that player pays {2}. If he or she does, Rhystic Lightning deals 2 damage to the creature or player.
 mana={2}{R}
 type=Instant
@@ -66528,8 +66530,8 @@ type=Instant
 [/card]
 [card]
 name=Savage Swipe
-target=creature[power=2]|myBattlefield
+target=creature|myBattlefield
-auto=2/2 ueot
+auto=teach(creature[power=2]) 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.)
 mana={G}
@@ -72145,8 +72147,8 @@ name=So Shiny
 target=creature
 auto=doesnotuntap
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveTo(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=if type(*[token]|myBattlefield)morethan~0 then tap
+auto=if type(*[token]|myBattlefield)~morethan~0 then teach(creature) tap
-auto=if type(*[token]|myBattlefield)morethan~0 then scry:2 scrycore delayed dontshow donothing scrycoreend scryend
+auto=if type(*[token]|myBattlefield)~morethan~0 then scry:2 scrycore delayed dontshow donothing scrycoreend scryend
 text=Enchant creature -- When So Shiny enters the battlefield, if you control a token, tap enchanted creature, then scry 2. -- Enchanted creature doesn't untap during its controller's untap step.
 mana={2}{U}
 type=Enchantment
@@ -76035,7 +76037,7 @@ type=Artifact
 [/card]
 [card]
 name=Stromkirk Bloodthief
-auto=@each my endofturn restriction{compare(oplifelost)morethan~0}:name(Put 1/1 counter) counter(1/1)
+auto=@each my endofturn restriction{compare(oplifelost)~morethan~0}:target(vampire|myBattlefield) counter(1/1)
 text=At the beginning of your end step, if an opponent lost life this turn, put a +1/+1 counter on target Vampire you control.
 mana={2}{B}
 type=Creature
@@ -81180,7 +81182,7 @@ type=Enchantment
 [/card]
 [card]
 name=Tithe Taker
-auto=while(restriction{myturnonly}) lord(*|opponentcastingzone) altercost(colorless,+1)
+auto=this(variable{controllerturn}>0) lord(*|opponentcastingzone) altercost(colorless,+1)
 auto=_DIES_token(Spirit,Creature Spirit,1/1,white,black,flying)
 text=During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities. -- Afterlife 1 (When this creature dies, create a 1/1 white and black Spirit creature token with flying.)
 mana={1}{W}
@@ -86165,7 +86167,7 @@ type=Sorcery
 [card]
 name=Visions of Dread
 target=opponent
-auto=ability!$name(Give a creature to opponent) name(Give a creature to opponent) target(creature|mygraveyard) moveto(opponentbattlefield)!$ targetedplayer
+auto=ability$!name(Give a creature to opponent) name(Give a creature to opponent) target(creature|mygraveyard) moveto(opponentbattlefield)!$ opponent
 flashback={8}{B}{B}
 otherrestriction=compare(convertedcost:highest:*[iscommander]:mycommandplay)~equalto~0
 auto=if paid(alternative) then all(this|mystack) moveto(myexile)
@@ -86221,7 +86223,7 @@ type=Sorcery
 [/card]
 [card]
 name=Visions of Ruin
-auto=ability!$name(Sacrifice an artifact) name(Sacrifice an artifact) target(artifact|mybattlefield) sacrifice and!( token(Treasure Sur) opponent )! !$ opponent
+auto=ability$! name(Sacrifice an artifact) name(Sacrifice an artifact) target(artifact|mybattlefield) sacrifice and!( token(Treasure Sur) opponent )! !$ opponent
 flashback={8}{R}{R}
 otherrestriction=compare(convertedcost:highest:*[iscommander]:mycommandplay)~equalto~0
 auto=if paid(alternative) then all(this|mystack) moveto(myexile)

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

@@ -2882,7 +2882,7 @@ toughness=1
 name=Alpha Tyrranax
 mana={4}{G}{G}
 type=Creature
-subtype=Beast
+subtype=Dinosaur Beast
 power=6
 toughness=5
 [/card]
@@ -32329,7 +32329,7 @@ auto=@combat(blocking,blocked,turnlimited) source(this):2/-2 ueot
 text=Whenever Dromosaur blocks or becomes blocked, it gets +2/-2 until end of turn.
 mana={2}{R}
 type=Creature
-subtype=Lizard
+subtype=Dinosaur
 power=2
 toughness=3
 [/card]
@@ -43445,7 +43445,7 @@ auto=lord(beast) cantblock
 text=Beasts can't block.
 mana={5}{R}
 type=Creature
-subtype=Lizard Beast
+subtype=Dinosaur Beast
 power=6
 toughness=6
 [/card]
@@ -44045,7 +44045,7 @@ auto=_ENRAGE_counter(1/1)
 text=Whenever Fungusaur is dealt damage, put a +1/+1 counter on it.
 mana={3}{G}
 type=Creature
-subtype=Fungus Lizard
+subtype=Fungus Dinosaur
 power=2
 toughness=2
 [/card]
@@ -53941,7 +53941,7 @@ auto=teach(creature) trample
 auto=teach(creature) haste
 auto={2}:equip
 auto={1}:aslongas(Sword of Kaldra|mybattlefield)aslongas(Shield of Kaldra|mybattlefield)aslongas(Helm of Kaldra|mybattlefield) token(-47449)
-text=Equipped creature has first strike, trample, and haste. -- {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it. -- Equip {2}
+text=Equipped creature has first strike, trample, and haste. -- {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it. -- Equip {2}
 mana={3}
 type=Legendary Artifact
 subtype=Equipment
@@ -69778,7 +69778,7 @@ auto=upcostmulti[{C(1/1,-1)}] sacrifice && thisforeach(counter{1/1.1}) damage:1
 text=Magmasaur enters the battlefield with five +1/+1 counters on it. -- At the beginning of your upkeep, sacrifice Magmasaur unless you remove a +1/+1 counter from it. If you sacrifice Magmasaur this way, it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
 mana={3}{R}{R}
 type=Creature
-subtype=Elemental Lizard
+subtype=Elemental Dinosaur
 power=0
 toughness=0
 [/card]
@@ -70848,8 +70848,7 @@ subtype=Aura
 [/card]
 [card]
 name=Map the Wastes
-aicode=activate moveTo(myBattlefield) and!(tap(noevent))! target(land[basic]|myLibrary)
+auto=moveTo(myBattlefield) and!(tap(noevent))! target(land[basic]|myLibrary)
-auto=name(search card) reveal:plibrarycount optionone name(choose card) target(land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(tap(noevent))!)! afterrevealedend revealend
 auto=ability$!name(Bolster) notatarget(creature[toughness=toughness:lowest:creature:mybattlefield]|mybattlefield) counter(1/1)!$ controller
 text=Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. -- Bolster 1. (Choose a creature with the least toughness among creatures you control and put a +1/+1 counter on it.)
 mana={2}{G}
@@ -84251,7 +84250,7 @@ auto=@movedTo(land|battlefield) from(hand):moveTo(ownerhand)
 text=Whenever a player plays a land, return Pangosaur to its owner's hand.
 mana={2}{G}{G}
 type=Creature
-subtype=Lizard
+subtype=Dinosaur
 power=6
 toughness=6
 [/card]
@@ -90056,7 +90055,7 @@ autofacedown={D(zombie|myhand)}:morph
 text=Morph - Discard a Zombie card. (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
 mana={4}{B}{B}
 type=Creature
-subtype=Zombie Lizard Beast
+subtype=Zombie Dinosaur Beast
 power=4
 toughness=4
 [/card]
@@ -90076,7 +90075,7 @@ abilities=swampwalk
 text=Swampwalk
 mana={2}{G}
 type=Creature
-subtype=Lizard
+subtype=Dinosaur
 power=2
 toughness=2
 [/card]
@@ -91945,7 +91944,6 @@ toughness=3
 [card]
 name=Ransack
 target=player
-aicode=activate choice bottomoflibrary all(*[zpos<=5]|targetedpersonslibrary)
 auto=reveal:5 optionone name(Put On Top) target(<upto:5>*|reveal) moveto(ownerlibrary) optiononeend optiontwo name(put on bottom) target(<5>*|reveal) bottomoflibrary optiontwoend revealend
 text=Look at the top five cards of target player's library. Put any number of them on the bottom of that library in any order and the rest on top of the library in any order.
 mana={3}{U}
@@ -95269,7 +95267,7 @@ abilities=double strike
 text=Double strike (This creature deals both first-strike and regular combat damage.)
 mana={3}{R}
 type=Creature
-subtype=Lizard Beast
+subtype=Dinosaur Beast
 power=2
 toughness=1
 [/card]
@@ -95647,7 +95645,7 @@ abilities=menace
 text=Ripscale Predator can't be blocked except by two or more creatures.
 mana={4}{R}{R}
 type=Creature
-subtype=Lizard
+subtype=Dinosaur
 power=6
 toughness=5
 [/card]
@@ -104360,7 +104358,7 @@ auto=upcost[{2}{R};next upkeep] sacrifice
 text=First strike, haste -- Echo {2}{R} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
 mana={2}{R}
 type=Creature
-subtype=Lizard
+subtype=Dinosaur
 power=3
 toughness=1
 [/card]
@@ -125212,7 +125210,7 @@ auto={1}{G}:-1/1
 text={1}{G}: Tyrranax gets -1/+1 until end of turn.
 mana={4}{G}{G}
 type=Creature
-subtype=Beast
+subtype=Dinosaur Beast
 power=5
 toughness=4
 [/card]
@@ -131635,7 +131633,7 @@ type=Sorcery
 [/card]
 [card]
 name=Wand of Denial
-auto={t}:target(player) reveal:1 optionone name(Look top card) target(<upto:1>*|reveal) transforms((,newability[pay[[{L:2}]] name(Pay Life) moveto(ownergraveyard) ])) forever optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) optiontwoend revealend
+auto={t}:target(player) reveal:1 optionone name(Look top card) target(<upto:1>*[-land]|reveal) transforms((,newability[pay[[{L:2}]] name(Pay Life) moveto(ownergraveyard) ])) forever optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) optiontwoend revealend
 text={T}: Look at the top card of target player's library. If it's a nonland card, you may pay 2 life. If you do, put it into that player's graveyard.
 mana={2}
 type=Artifact

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

@@ -979,7 +979,7 @@ aicode=activate transforms((,newability[if type(creature[zpos=1]|mylibrary)~more
 auto=counter(0/0,5,loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Reveal the top card) reveal:1 optionone target(creature|reveal) moveto(myhand) optiononeend optiontwo name(Put in bottom of library) target(<1>*|reveal) moveto(bottomoflibrary) optiontwoend revealend
 auto={C(0/0,-2,Loyalty)}:name(-2: Deals damage to target creature) target(creature|mybattlefield) transforms((,newability[target(other creature) dynamicability<!powerstrike!>])) oneshot
-auto={C(0/0,-7,Loyalty)}:name(-7: Creatures you control assign damage) all(creature|myBattlefield) transforms((,newability[@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) damage:power opponent && fog from(this)])) ueot
+auto={C(0/0,-7,Loyalty)}:name(-7: Creatures you control assign damage) all(creature|myBattlefield) transforms((,newability[@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)]))
 text=+1: Reveal the top card of your library. If it's a creature card, put it into your hand. Otherwise, put it on the bottom of your library. -- −2: Target creature you control deals damage equal to its power to another target creature. -- −7: Until end of turn, creatures you control gain "You may have this creature assign its combat damage as though it weren't blocked."
 mana={4}{G}{G}
 type=Legendary Planeswalker