added some fixes

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

@@ -1,6 +1,6 @@
 #Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
-#I sorted this programatically so the other comments are removed except for AUTO_DEFINE - kevlahnota 9-5-2016
+#I sorted this programatically so the other comments are removed except for AUTO_DEFINE - kevlahnota 1-26-2017
 [card]
 name=Abandon Reason
 target=<upto:2>creature
@@ -12681,6 +12681,7 @@ toughness=1
 [/card]
 [card]
 name=Boggart Harbinger
+aicode=activate name(put on top) notatarget(goblin|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(goblin|mylibrary) optionone name(choose card) target(goblin|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Boggart Harbinger enters the battlefield, you may search your library for a Goblin card, reveal it, then shuffle your library and put that card on top of it.
 mana={2}{B}
@@ -29916,7 +29917,7 @@ toughness=7
 [card]
 name=Dragonlord Kolaghan
 abilities=flying,haste
-auto=emblem transforms((,newability[aslongas(Dragonlord Kolaghan|mybattlefield) lord(creature|mybattlefield) haste >0])) ueot
+auto=aslongas(Dragonlord Kolaghan|mybattlefield) lord(creature|mybattlefield) haste >0
 auto=@movedto(*[creature;planeswalker]|opponentstack):all(trigger[to]) transforms((,newability[if type(*[share!name!]|mygraveyard)~morethan~0 then life:-10 controller])) oneshot
 text=Flying, haste -- Other creatures you control have haste. -- Whenever an opponent casts a creature or planeswalker spell with the same name as a card in his or her graveyard, that player loses 10 life.
 mana={4}{B}{R}
@@ -29928,7 +29929,7 @@ toughness=5
 [card]
 name=Dragonlord Ojutai
 abilities=flying
-auto=this(attacking) opponentshroud
+auto=this(untapped) opponentshroud
 auto=@combatdamaged(player) from(this):name(look) reveal:3 optionone name(Get a card) target(<1>*|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<3>*|reveal) bottomoflibrary optiontwoend revealend
 text=Flying -- Dragonlord Ojutai has hexproof as long as it's untapped. -- Whenever Dragonlord Ojutai deals combat damage to a player, look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
 mana={3}{W}{U}
@@ -33559,6 +33560,7 @@ toughness=1
 [/card]
 [card]
 name=Elvish Harbinger
+aicode=activate name(put on top) notatarget(elf|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(elf|mylibrary) optionone name(choose card) target(elf|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 auto={T}:Add{G}
 auto={T}:Add{W}
@@ -34708,6 +34710,7 @@ toughness=2
 [/card]
 [card]
 name=Enlightened Tutor
+aicode=activate name(put on top) notatarget(*[artifact;enchantment]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[artifact;enchantment]|mylibrary) optionone name(choose card) target(*[artifact;enchantment]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for an artifact or enchantment card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={W}
@@ -36837,6 +36840,7 @@ type=Land
 [card]
 name=Faerie Harbinger
 abilities=flash,flying
+aicode=activate name(put on top) notatarget(faerie|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(faerie|mylibrary) optionone name(choose card) target(faerie|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Flash -- Flying -- When Faerie Harbinger enters the battlefield, you may search your library for a Faerie card, reveal it, then shuffle your library and put that card on top of it.
 mana={3}{U}
@@ -39562,6 +39566,7 @@ toughness=2
 [/card]
 [card]
 name=Flamekin Harbinger
+aicode=activate name(put on top) notatarget(elemental|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(elemental|mylibrary) optionone name(choose card) target(elemental|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Flamekin Harbinger enters the battlefield, you may search your library for an Elemental card, reveal it, then shuffle your library and put that card on top of it.
 mana={R}
@@ -44247,6 +44252,7 @@ type=Instant
 [/card]
 [card]
 name=Giant Harbinger
+aicode=activate name(put on top) notatarget(giant|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(giant|mylibrary) optionone name(choose card) target(giant|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Giant Harbinger enters the battlefield, you may search your library for a Giant card, reveal it, then shuffle your library and put that card on top of it.
 mana={4}{R}
@@ -60649,6 +60655,7 @@ toughness=1
 [/card]
 [card]
 name=Kithkin Harbinger
+aicode=activate name(put on top) notatarget(kithkin|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(kithkin|mylibrary) optionone name(choose card) target(kithkin|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Kithkin Harbinger enters the battlefield, you may search your library for a Kithkin card, reveal it, then shuffle your library and put that card on top of it.
 mana={2}{W}
@@ -62351,7 +62358,7 @@ toughness=5
 [card]
 name=Kuldotha Phoenix
 abilities=flying,haste
-autograveyard=@each my upkeep:aslongas(artifact|mybattlefield) {4}:moveTo(myBattlefield) myUpkeepOnly >2
+autograveyard={4}:moveTo(myBattlefield) restriction{type(artifact|mybattlefield)~morethan~2,myupkeeponly}
 text=Flying, haste -- Metalcraft {4}: Return Kuldotha Phoenix from your graveyard to the battlefield. Activate this ability only during your upkeep and only if you control three or more artifacts.
 mana={2}{R}{R}{R}
 type=Creature
@@ -65236,6 +65243,7 @@ toughness=2
 [/card]
 [card]
 name=Loam Larva
+aicode=activate name(put on top) notatarget(land[basic]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(land[basic]|mylibrary) optionone name(choose card) target(land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Loam Larva enters the battlefield, you may search your library for a basic land card, reveal it, then shuffle your library and put that card on top of it.
 mana={1}{G}
@@ -70123,6 +70131,7 @@ toughness=2
 [card]
 name=Merrow Harbinger
 abilities=islandwalk
+aicode=activate name(put on top) notatarget(merfolk|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[merfolk]|mylibrary) optionone name(choose card) target(*[merfolk]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Islandwalk -- When Merrow Harbinger enters the battlefield, you may search your library for a Merfolk card, reveal it, then shuffle your library and put that card on top of it.
 mana={3}{U}
@@ -70980,7 +70989,7 @@ toughness=1
 [/card]
 [card]
 name=Mindclaw Shaman
-auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(*[instant;sorcery]|reveal) moveto(myexile) and!( becomes(tobecast) )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend afterrevealed all(tobecast|myexile) moveto(myexile) and!( activate castcard(normal) )! afterrevealedend revealend
+auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(*[instant;sorcery]|reveal) moveto(myexile) and!( becomes(tobecast) )! optiononeend optiontwo name(put in hand) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend afterrevealed all(tobecast|myexile) moveto(myexile) and!( activate castcard(normal) )! afterrevealedend revealend
 text=When Mindclaw Shaman enters the battlefield, target opponent reveals his or her hand. You may cast an instant or sorcery card from it without paying its mana cost.
 mana={4}{R}
 type=Creature
@@ -74808,8 +74817,7 @@ toughness=4
 [/card]
 [card]
 name=Mystical Teachings
-auto=choice name(instant card) moveTo(myhand) target(instant|myLibrary)
-auto=choice name(card with flash) moveTo(myhand) target(*[flash]|myLibrary)
+auto=moveTo(myhand) notatarget(*[instant;flash]|myLibrary)
 flashback={5}{B}
 text=Search your library for an instant card or a card with flash, reveal it, and put it into your hand. Then shuffle your library. -- Flashback {5}{B} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={3}{U}
@@ -74817,6 +74825,7 @@ type=Instant
 [/card]
 [card]
 name=Mystical Tutor
+aicode=activate name(put on top) notatarget(*[instant;sorcery]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[instant;sorcery]|mylibrary) optionone name(choose card) target(*[instant;sorcery]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for an instant or sorcery card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={U}
@@ -79318,8 +79327,8 @@ toughness=2
 [/card]
 [card]
 name=Open the Armory
-target=aura,equipment|mylibrary
-auto=moveto(myhand)
+aicode=activate notatarget(*[aura;equipment]|mylibrary) moveTo(ownerhand)
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[aura;equipment]|mylibrary) optionone name(choose card) target(*[aura;equipment]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend revealend
 text=Search your library for an Aura or Equipment card, reveal it, and put it into your hand. Then shuffle your library.
 mana={1}{W}
 type=Sorcery
@@ -82104,6 +82113,7 @@ type=Enchantment
 [/card]
 [card]
 name=Personal Tutor
+aicode=activate name(put on top) notatarget(sorcery|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(sorcery|mylibrary) optionone name(choose card) target(sorcery|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for a sorcery card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={U}
@@ -108908,6 +108918,7 @@ toughness=1
 [card]
 name=Sterling Grove
 auto=lord(other enchantment|mybattlefield) shroud
+aicode=activate name(put on top) notatarget(enchantment|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto={1}{S}:name(search enchantment) Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(enchantment|mylibrary) optionone name(choose card) target(enchantment|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Other enchantments you control have shroud. (They can't be the targets of spells or abilities.) -- {1}, Sacrifice Sterling Grove: Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={G}{W}
@@ -112418,6 +112429,7 @@ type=Sorcery
 [/card]
 [card]
 name=Sylvan Tutor
+aicode=activate name(put on top) notatarget(creature|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(creature|mylibrary) optionone name(choose card) target(creature|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for a creature card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={G}
@@ -118974,6 +118986,7 @@ type=Artifact Land
 [/card]
 [card]
 name=Treefolk Harbinger
+aicode=activate name(put on top) notatarget(*[treefolk;forest]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[treefolk;forest]|mylibrary) optionone name(choose card) target(*[treefolk;forest]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Treefolk Harbinger enters the battlefield, you may search your library for a Treefolk or Forest card, reveal it, then shuffle your library and put that card on top of it.
 mana={G}
@@ -129737,7 +129750,7 @@ type=Instant
 [card]
 name=Withering Gaze
 target=opponent
-aicode=draw:type:*[forest;green]:targetedpersonshand
+aicode=activate draw:type:*[forest;green]:targetedpersonshand
 auto=Reveal:type:*:opponenthand revealzone(opponenthand) revealtype(*|opponenthand) optionone choice name(Get Bonus) foreach(forest|reveal) draw:1 && foreach(*[green]|reveal) draw:1 optiononeend optiontwo name(Put Back) target(*|reveal) transforms((,newability[all(*|reveal) moveto(ownerhand)])) ueot optiontwoend revealend
 text=Target opponent reveals his or her hand. You draw a card for each Forest and green card in it.
 mana={2}{U}
@@ -130421,6 +130434,7 @@ type=Instant
 [/card]
 [card]
 name=Worldly Tutor
+aicode=activate name(put on top) notatarget(creature|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
 auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(creature|mylibrary) optionone name(choose card) target(creature|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for a creature card and reveal that card. Shuffle your library, then put the revealed card back on top of it.
 mana={G}