Merge pull request #707 from kevlahnota/master

Updated Primitives and Hide Highlight Border

CHANGELOG.md

@@ -1,8 +1,11 @@
 # Changelog
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
-#### 6/27/16
+
-- *Merged pull-request:* CardID Indicator, Add Missing Tokens, Support Importing dck for Android [#\705] (https://github.com/WagicProject/wagic/pull/705) ([kevlahnota](https://github.com/kevlahnota))
+#### 6/29/16
+- *Merged pull-request:* Updated Primitives and Hide Highlight Border [#\707] (https://github.com/WagicProject/wagic/pull/707) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Committed:* Pretty huge patch here(sorry old habits never die :( )  [#\6ee00c1] (https://github.com/WagicProject/wagic/commit/6ee00c138ce374d54cb3ee034575ce440288ca0e) ([zethfoxster](https://github.com/zethfoxster))
 
 #### 6/23/16
 - *Merged pull-request:* Fix producecolor:color [#\704] (https://github.com/WagicProject/wagic/pull/704) ([kevlahnota](https://github.com/kevlahnota))

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

@@ -12,18 +12,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Aven Warhawk
-abilities=flying
-auto=foreach(bird|myhand) counter(1/1,1)
-auto=foreach(soldier|myhand) counter(1/1,1)
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Bird and/or Soldier card you reveal in your hand.) -- Flying
-mana={4}{W}
-type=Creature
-subtype=Bird Soldier
-power=2
-toughness=2
-[/card]
-[card]
 name=Cemetery Puca
 text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
 auto=@movedto(creature|graveyard) from(battlefield):all(trigger[from]) pay[[{1}]] copy
@@ -109,27 +97,6 @@ auto={3}:counter(1/1)
 #Not all player can use ability
 [/card]
 [card]
-name=Ghastly Remains
-auto=foreach(zombie|myhand) counter(1/1,1)
-autograveyard={B}{B}{B}:moveTo(myhand) myUpkeepOnly
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Zombie card you reveal in your hand.) -- At the beginning of your upkeep, if Ghastly Remains is in your graveyard, you may pay {B}{B}{B}. If you do, return Ghastly Remains to your hand.
-mana={B}{B}{B}
-type=Creature
-subtype=Zombie
-power=0
-toughness=0
-[/card]
-[card]
-name=Glowering Rogon
-auto=foreach(beast|myhand) counter(1/1,1)
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Beast card you reveal in your hand.)
-mana={5}{G}
-type=Creature
-subtype=Beast
-power=4
-toughness=4
-[/card]
-[card]
 name=Govern the Guildless
 target=creature[-multicolor]
 auto=moveto(mybattlefield)
@@ -348,6 +315,13 @@ text={T}: Add {1} to your mana pool. -- {2}, {T}: Thespian's Stage becomes a cop
 type=Land
 [/card]
 [card]
+name=Trinisphere
+auto=this(untapped) lord(*[-land]|hand,library,exile,graveyard) trinisphere forcedalive
+text=As long as Trinisphere is untapped, each spell that would cost less than three mana to cast costs three mana to cast. (Additional mana in the cost may be paid with any color of mana or colorless mana. For example, a spell that would cost {1}{B} to cast costs {2}{B} to cast instead.)
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Unstable Shapeshifter
 auto=@movedto(other creature|battlefield):all(trigger[from]) copy
 text=Whenever another creature enters the battlefield, Unstable Shapeshifter becomes a copy of that creature and gains this ability.
@@ -367,14 +341,3 @@ mana={B}
 type=Instant
 text=Target creature gets +2/+0 and gains deathtouch until end of turn. Rebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
 [/card]
-[card]
-name=Zombie Brute
-abilities=trample
-auto=foreach(zombie|myhand) counter(1/1,1)
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Zombie card you reveal in your hand.) -- Trample
-mana={6}{B}
-type=Creature
-subtype=Zombie
-power=5
-toughness=4
-[/card]

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

@@ -950,7 +950,7 @@ toughness=3
 [card]
 name=Addle
 target=player
-auto=chooseacolor target(*[chosencolor]|targetedpersonshand) reject chooseend
+auto=chooseacolor reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) notatarget(*[chosencolor]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend chooseend
 text=Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
 mana={1}{B}
 type=Sorcery
@@ -1224,7 +1224,7 @@ toughness=4
 name=Agent of Erebos
 auto=choice target(player) moveTo(exile) all(*|targetedpersonsgraveyard)
 auto=@movedto(enchantment|mybattlefield):choice target(player) moveTo(exile) all(*|targetedpersonsgraveyard)
-text=Constellation � Whenever Agent of Erebos or another enchantment enters the battlefield under your control, exile all cards from target player's graveyard.
+text=Constellation ? Whenever Agent of Erebos or another enchantment enters the battlefield under your control, exile all cards from target player's graveyard.
 mana={3}{B}
 type=Enchantment Creature
 subtype=Zombie
@@ -1701,7 +1701,7 @@ toughness=1
 [card]
 name=Akroan Conscriptor
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):name(gain control of target creature until end of turn) target(other creature|battlefield) moveTo(mybattlefield) and!( transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot )!
-text=Heroic � Whenever you cast a spell that targets Akroan Conscriptor, gain control of another target creature until end of turn. Untap that creature. It gains haste until end of turn.
+text=Heroic ? Whenever you cast a spell that targets Akroan Conscriptor, gain control of another target creature until end of turn. Untap that creature. It gains haste until end of turn.
 mana={4}{R}
 type=Creature
 subtype=Human Shaman
@@ -1711,7 +1711,7 @@ toughness=2
 [card]
 name=Akroan Crusader
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):token(Soldier,Creature Soldier,1/1,red,haste) controller
-text=Heroic � Whenever you cast a spell that targets Akroan Crusader, put a 1/1 red Soldier creature token with haste onto the battlefield.
+text=Heroic ? Whenever you cast a spell that targets Akroan Crusader, put a 1/1 red Soldier creature token with haste onto the battlefield.
 mana={R}
 type=Creature
 subtype=Human Soldier
@@ -1754,7 +1754,7 @@ toughness=1
 name=Akroan Line Breaker
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):2/0 ueot
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):intimidate ueot
-text=Heroic � Whenever you cast a spell that targets Akroan Line Breaker, Akroan Line Breaker gets +2/+0 and gains intimidate until end of turn.
+text=Heroic ? Whenever you cast a spell that targets Akroan Line Breaker, Akroan Line Breaker gets +2/+0 and gains intimidate until end of turn.
 mana={2}{R}
 type=Creature
 subtype=Human Warrior
@@ -2537,8 +2537,7 @@ toughness=1
 [card]
 name=Amnesia
 target=player
-auto=name(look) target(*|targetedpersonshand) donothing
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[-land]|reveal) transforms((,newability[moveto(ownerhand) and!( reject )! all(*[-land]|reveal)])) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-auto=reject all(*[-land]|targetedpersonshand)
 text=Target player reveals his or her hand and discards all nonland cards.
 mana={3}{U}{U}{U}
 type=Sorcery
@@ -3788,7 +3787,7 @@ toughness=1
 [card]
 name=Appetite for Brains
 target=opponent
-auto=name(exile a card) notatarget(*|targetedpersonshand) transforms((,newability[this(variable{manacost}>=4) moveto(exile)]))
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(*[manacost>=4]|reveal) moveto(exile) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose a card from it with converted mana cost 4 or greater and exile that card.
 mana={B}
 type=Sorcery
@@ -7153,9 +7152,9 @@ toughness=4
 [card]
 name=Baleful Stare
 target=opponent
-auto=target(*|targetedpersonshand) donothing
 auto=foreach(mountain|opponenthand) draw:1
 auto=foreach(*[red]|opponenthand) draw:1
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiononeend revealend
 text=Target opponent reveals his or her hand. You draw a card for each Mountain and red card in it.
 mana={2}{U}
 type=Sorcery
@@ -8667,7 +8666,7 @@ toughness=3
 [card]
 name=Bellowing Saddlebrute
 auto=ifnot raid then life:-4 controller
-text=Raid � When Bellowing Saddlebrute enters the battlefield, you lose 4 life unless you attacked with a creature this turn.
+text=Raid ? When Bellowing Saddlebrute enters the battlefield, you lose 4 life unless you attacked with a creature this turn.
 mana={3}{B}
 type=Creature
 subtype=Orc Warrior
@@ -10485,7 +10484,7 @@ toughness=2
 name=Bloodcrazed Hoplite
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
 auto=@counteradded(1/1) from(this):counter(1/1,-1) target(creature|opponentbattlefield)
-text=Heroic � Whenever you cast a spell that targets Bloodcrazed Hoplite, put a +1/+1 counter on it. -- Whenever a +1/+1 counter is placed on Bloodcrazed Hoplite, remove a +1/+1 counter from target creature an opponent controls.
+text=Heroic ? Whenever you cast a spell that targets Bloodcrazed Hoplite, put a +1/+1 counter on it. -- Whenever a +1/+1 counter is placed on Bloodcrazed Hoplite, remove a +1/+1 counter from target creature an opponent controls.
 mana={1}{B}
 type=Creature
 subtype=Human Soldier
@@ -10792,7 +10791,7 @@ toughness=3
 name=Bloodsoaked Champion
 abilities=cantblock
 autograveyard={1}{B}:moveTo(mybattlefield) restriction{raid}
-text=Bloodsoaked Champion can't block. -- Raid � {1}{B}: Return Bloodsoaked Champion from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn.
+text=Bloodsoaked Champion can't block. -- Raid ? {1}{B}: Return Bloodsoaked Champion from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn.
 mana={B}
 type=Creature
 subtype=Human Warrior
@@ -12159,7 +12158,7 @@ auto={1}{G}{T}:name(+1/+1 counter) counter(1/1,1) target(creature)
 auto={1}{G}{T}:name(2 damage to flyer) damage:2 target(creature[flying])
 auto={1}{G}{T}:name(gain 3 life) life:3 controller
 auto={1}{G}{T}:name(put up to 4 on bottom) bottomoflibrary target(<upto:4>*|mygraveyard)
-text=Attacking creatures you control have deathtouch. -- {1}{G},{T}: Choose one � Put a +1/+1 counter on target creature; or Bow of Nylea deals 2 damage to target creature with flying; or you gain 3 life; or put up to four target cards from your graveyard on the bottom of your library in any order.
+text=Attacking creatures you control have deathtouch. -- {1}{G},{T}: Choose one ? Put a +1/+1 counter on target creature; or Bow of Nylea deals 2 damage to target creature with flying; or you gain 3 life; or put up to four target cards from your graveyard on the bottom of your library in any order.
 mana={1}{G}{G}
 type=Legendary Enchantment Artifact
 [/card]
@@ -12243,7 +12242,7 @@ type=Instant
 [/card]
 [card]
 name=Brain Maggot
-auto=choice name(target opponent) target(opponent) donothing && all(this) transforms((,newability[if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else hand(blink)forsrc notatarget(*[-land]|targetedpersonshand)])) forever
+auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone hand(blink)forsrc notatarget(*[-land]|reveal) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=When Brain Maggot enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card until Brain Maggot leaves the battlefield.
 mana={1}{B}
 type=Enchantment Creature
@@ -12265,8 +12264,7 @@ toughness=1
 [card]
 name=Brainbite
 target=opponent
-auto=target(*|targetedpersonshand) reject
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend afterrevealed transforms((,newability[draw:1 controller])) oneshot afterrevealedend revealend
-auto=draw:1 controller
 text=Target opponent reveals his or her hand. You choose a card from it. That player discards that card. -- Draw a card.
 mana={2}{U}{B}
 type=Sorcery
@@ -14820,7 +14818,7 @@ subtype=Aura
 [card]
 name=Castigate
 target=opponent
-auto=if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else moveto(exile) notatarget(*[-land]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(*[-land]|reveal) moveto(exile) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
 mana={W}{B}
 type=Sorcery
@@ -18244,7 +18242,7 @@ type=Sorcery
 [card]
 name=Coercion
 target=opponent
-auto=target(*|targetedpersonshand) reject
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose a card from it. That player discards that card.
 mana={2}{B}
 type=Sorcery
@@ -18377,7 +18375,7 @@ auto=aslongas(island|mybattlefield) lord(creature|opponentbattlefield) transform
 auto=aslongas(mountain|mybattlefield) lord(creature|opponentbattlefield) transforms((,newability[attackcost:1]))
 auto=aslongas(swamp|mybattlefield) lord(creature|opponentbattlefield) transforms((,newability[attackcost:1]))
 auto=aslongas(plains|mybattlefield) lord(creature|opponentbattlefield) transforms((,newability[attackcost:1]))
-text=Domain � Creatures can't attack you unless their controller pays {X} for each creature he or she controls that's attacking you, where X is the number of basic land types among lands you control.
+text=Domain ? Creatures can't attack you unless their controller pays {X} for each creature he or she controls that's attacking you, where X is the number of basic land types among lands you control.
 mana={3}{U}
 type=Enchantment
 [/card]
@@ -18581,7 +18579,7 @@ type=Enchantment
 [card]
 name=Compulsive Research
 target=player
-auto=ability$!draw:3 _ choice name(discard 2 cards) target(<2>*|myhand) reject _ choice name(discard land) target(land|myhand) reject!$ targetedplayer
+auto=ability$!draw:3 _ choice name(discard 2 cards) target(<2>*|myhand) reject _ if type(land|myhand)~morethan~0 then choice name(discard land) target(land|myhand) reject!$ targetedplayer
 text=Target player draws three cards. Then that player discards two cards unless he or she discards a land card.
 mana={2}{U}
 type=Sorcery
@@ -19386,7 +19384,7 @@ type=Instant
 [/card]
 [card]
 name=Corpse Traders
-auto={2}{B}{S(creature|mybattlefield)}:name(discard) target(opponent) donothing && all(this) transforms((,newability[notatarget(*|targetedpersonshand) reject])) asSorcery
+auto={2}{B}{S(creature|mybattlefield)}:target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend asSorcery
 text={2}{B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
 mana={3}{B}
 type=Creature
@@ -19925,7 +19923,7 @@ name=Crater's Claws
 target=creature,player
 auto=if type(creature[power=>4]|mybattlefield) then damage:2
 auto=damage:X
-text=Crater's Claws deals X damage to target creature or player. -- Ferocious � Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater.
+text=Crater's Claws deals X damage to target creature or player. -- Ferocious ? Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater.
 mana={R}{X}
 type=Sorcery
 [/card]
@@ -20324,6 +20322,7 @@ text=As an additional cost to cast Crop Rotation, sacrifice a land. -- Search yo
 mana={G}{S(land|mybattlefield)}
 type=Instant
 [/card]
+#toconvert reveal
 [card]
 name=Crosis, the Purger
 abilities=flying
@@ -21781,6 +21780,7 @@ subtype=Human Soldier
 power=3
 toughness=3
 [/card]
+#toconvert reveal
 [card]
 name=Darigaaz, the Igniter
 abilities=flying
@@ -21940,7 +21940,7 @@ target=creature
 auto=regenerate
 auto=draw:1 controller
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then regenerate all(other creature|mybattlefield)
-text=Regenerate target creature. Draw a card. (The next time the creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.) -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, also regenerate each other creature you control.
+text=Regenerate target creature. Draw a card. (The next time the creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.) -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, also regenerate each other creature you control.
 mana={2}{B}
 type=Instant
 [/card]
@@ -21948,7 +21948,7 @@ type=Instant
 name=Dark Petition
 auto=moveto(myhand) notatarget(*|mylibrary)
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then add{B}{B}{B}
-text=Search your library for a card and put that card into your hand. Then shuffle your library. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool.
+text=Search your library for a card and put that card into your hand. Then shuffle your library. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool.
 mana={3}{B}{B}
 type=Sorcery
 [/card]
@@ -22548,7 +22548,7 @@ subtype=Aura
 name=Dawnbringer Charioteers
 abilities=flying,lifelink
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
-text=Flying, lifelink -- Heroic �- Whenever you cast a spell that targets Dawnbringer Charioteers, put a +1/+1 counter on Dawnbringer Charioteers.
+text=Flying, lifelink -- Heroic ?- Whenever you cast a spell that targets Dawnbringer Charioteers, put a +1/+1 counter on Dawnbringer Charioteers.
 mana={2}{W}{W}
 type=Creature
 subtype=Human Soldier
@@ -24524,8 +24524,8 @@ type=Instant
 [card]
 name=Despise
 target=opponent
-auto=if type(*[creature;planeswalker]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[creature;planeswalker]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[creature;planeswalker]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-text=Target opponent reveals his or her hand. You choose a creature or plainswalker card from it. That player discards that card.
+text=Target opponent reveals his or her hand. You choose a creature or planeswalker card from it. That player discards that card.
 mana={B}
 type=Sorcery
 [/card]
@@ -25115,8 +25115,7 @@ toughness=4
 [card]
 name=Diplomacy of the Wastes
 target=opponent
-auto=if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-land]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) notatarget(*[-land]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend afterrevealed transforms((,newability[if type(*[warrior]|mybattlefield)~morethan~0 then life:-2 opponent])) oneshot afterrevealedend revealend
-auto=if type(*[warrior]|mybattlefield)~morethan~0 then life:-2 targetedplayer
 text=Target opponent reveals his or her hand. You choose a nonland card from it. That player discards that card. If you control a Warrior, that player loses 2 life.
 mana={2}{B}
 type=Sorcery
@@ -25325,7 +25324,7 @@ auto={1}{E(*[instant;sorcery]|mygraveyard)}:name(counter noncreature unless pay
 auto={1}{E(*[instant;sorcery]|mygraveyard)}:1/1 ueot
 auto={1}{E(*[instant;sorcery]|mygraveyard)}:tap target(creature)
 auto={1}{E(*[instant;sorcery]|mygraveyard)}:untap target(creature)
-text={1}, Exile an instant or sorcery card from your graveyard: Choose one � -- � Counter target noncreature spell unless its controller pays {2}. -- � Disciple of the Ring gets +1/+1 until end of turn. -- � Tap target creature. -- � Untap target creature.
+text={1}, Exile an instant or sorcery card from your graveyard: Choose one ? -- ? Counter target noncreature spell unless its controller pays {2}. -- ? Disciple of the Ring gets +1/+1 until end of turn. -- ? Tap target creature. -- ? Untap target creature.
 mana={3}{U}{U}
 type=Creature
 subtype=Human Wizard
@@ -25671,7 +25670,7 @@ type=Sorcery
 [card]
 name=Distress
 target=player
-auto=if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-land]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) notatarget(*[-land]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand. You choose a nonland card from it. That player discards that card.
 mana={B}{B}
 type=Sorcery
@@ -26024,7 +26023,7 @@ toughness=10
 name=Doomwake Giant
 auto=all(creature|opponentbattlefield) -1/-1
 auto=@movedTo(enchantment|myBattlefield):all(creature|opponentbattlefield) -1/-1
-text=Constellation � Whenever Doomwake Giant or another enchantment enters the battlefield under your control, creatures your opponents control get -1/-1 until end of turn.
+text=Constellation ? Whenever Doomwake Giant or another enchantment enters the battlefield under your control, creatures your opponents control get -1/-1 until end of turn.
 mana={4}{B}
 type=Enchantment Creature
 subtype=Giant
@@ -26998,7 +26997,7 @@ type=Sorcery
 name=Dreadbringer Lampads
 auto=name(intimidate) target(creature) transforms((,newability[intimidate])) ueot
 auto=@movedTo(enchantment|myBattlefield):name(intimidate) target(creature) transforms((,newability[intimidate])) ueot
-text=Constellation � Whenever Dreadbringer Lampads or another enchantment enters the battlefield under your control, target creature gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
+text=Constellation ? Whenever Dreadbringer Lampads or another enchantment enters the battlefield under your control, target creature gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
 mana={4}{B}
 type=Enchantment Creature
 subtype=Nymph
@@ -27998,7 +27997,7 @@ toughness=*
 [card]
 name=Duress
 target=opponent
-auto=if type(*[-creature;-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-creature;-land]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) notatarget(*[-creature;-land]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
 mana={B}
 type=Sorcery
@@ -29010,7 +29009,7 @@ subtype=Shapeshifter
 name=Eidolon of Blossoms
 auto=draw:1
 auto=@movedTo(enchantment|myBattlefield):draw:1
-text=Constellation � Whenever Eidolon of Blossoms or another enchantment enters the battlefield under your control, draw a card.
+text=Constellation ? Whenever Eidolon of Blossoms or another enchantment enters the battlefield under your control, draw a card.
 mana={2}{G}{G}
 type=Enchantment Creature
 subtype=Spirit
@@ -30432,7 +30431,7 @@ toughness=2
 [card]
 name=Encroach
 target=player
-auto=if type(*[-basic]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-basic]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) notatarget(*[-basic]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand. You choose a nonbasic land card from it. That player discards that card.
 mana={B}
 type=Sorcery
@@ -30922,7 +30921,7 @@ type=Instant
 [card]
 name=Entomber Exarch
 auto=choice moveTo(myhand) target(creature|mygraveyard)
-auto=choice moveTo(graveyard) target(*[-creature]|opponenthand)
+auto=choice target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) notatarget(*[-creature]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=When Entomber Exarch enters the battlefield, choose one - Return target creature card from your graveyard to your hand; or target opponent reveals his or her hand, you choose a noncreature card from it, then that player discards that card.
 mana={2}{B}{B}
 type=Creature
@@ -32187,7 +32186,7 @@ name=Exquisite Firecraft
 target=creature,player
 auto=damage:4
 auto=aslongas(*[instant;sorcery]|mygraveyard) nofizzle >1
-text=Exquisite Firecraft deals 4 damage to target creature or player. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, Exquisite Firecraft can't be countered by spells or abilities.
+text=Exquisite Firecraft deals 4 damage to target creature or player. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, Exquisite Firecraft can't be countered by spells or abilities.
 mana={1}{R}{R}
 type=Sorcery
 [/card]
@@ -34124,7 +34123,7 @@ toughness=2
 name=Fiery Impulse
 target=creature
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then damage:3 else damage:2
-text=Fiery Impulse deals 2 damage to target creature. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, Fiery Impulse deals 3 damage to that creature instead.
+text=Fiery Impulse deals 2 damage to target creature. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, Fiery Impulse deals 3 damage to that creature instead.
 mana={R}
 type=Instant
 [/card]
@@ -36367,7 +36366,7 @@ toughness=1
 name=Forgeborn Oreads
 auto=damage:1 target(creature,player)
 auto=@movedTo(enchantment|myBattlefield):damage:1 target(creature,player)
-text=Constellation � Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player.
+text=Constellation ? Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player.
 mana={2}{R}{R}
 type=Enchantment Creature
 subtype=Nymph
@@ -38567,8 +38566,7 @@ toughness=4
 [card]
 name=Ghastlord of Fugue
 auto=unblockable
-auto=@combatdamagefoeof(player) from(this):may moveTo(myexile) target(*|opponenthand)
+auto=@combatdamaged(player) from(this):reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose card) notatarget(*|reveal) moveto(exile) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-auto=@combatdamageof(player) from(this):may moveTo(myexile) target(*|myhand)
 text=Ghastlord of Fugue is unblockable. -- Whenever Ghastlord of Fugue deals combat damage to a player, that player reveals his or her hand. You choose a card from it. That player exiles that card.
 mana={UB}{UB}{UB}{UB}{UB}
 type=Creature
@@ -39246,7 +39244,7 @@ toughness=1
 [card]
 name=Gideon's Phalanx
 auto=if type(*[instant;sorcery]|mygraveyard)~lessthan~1 then token(Knight,Creature Knight,2/2,white,vigilance)*4 controller else token(Knight,Creature Knight,2/2,white,vigilance)*4 &&  all(creature|mybattlefield) indestructible ueot
-text=Put four 2/2 white Knight creature tokens with vigilance onto the battlefield. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, creatures you control gain indestructible until end of turn.
+text=Put four 2/2 white Knight creature tokens with vigilance onto the battlefield. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, creatures you control gain indestructible until end of turn.
 mana={5}{W}{W}
 type=Instant
 [/card]
@@ -42698,7 +42696,7 @@ type=Sorcery
 name=Grim Guardian
 auto=life:-1 opponent
 auto=@movedTo(enchantment|myBattlefield):life:-1 opponent
-text=Constellation � Whenever Grim Guardian or another enchantment enters the battlefield under your control, each opponent loses 1 life.
+text=Constellation ? Whenever Grim Guardian or another enchantment enters the battlefield under your control, each opponent loses 1 life.
 mana={2}{B}
 type=Enchantment Creature
 subtype=Zombie
@@ -43224,7 +43222,7 @@ subtype=Aura
 name=Gruesome Discovery
 target=player
 auto=ifnot morbid then ability$!name(discard 2 cards) target(<2>*|myhand) reject!$ targetedplayer
-auto=if morbid then target(<2>*|opponenthand) reject
+auto=if morbid then reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(<2>*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player discards two cards. -- Morbid - If a creature died this turn, instead that player reveals his or her hand, you choose two cards from it, then that player discards those cards.
 mana={2}{B}{B}
 type=Sorcery
@@ -44598,7 +44596,7 @@ toughness=5
 name=Harvestguard Alseids
 auto=name(prevent all damage) target(creature) transforms((,newability[preventalldamage to(this)])) ueot
 auto=@movedto(enchantment|mybattlefield):name(prevent all damage) target(creature) transforms((,newability[preventalldamage to(this)])) ueot
-text=Constellation � Whenever Harvestguard Alseids or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn.
+text=Constellation ? Whenever Harvestguard Alseids or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn.
 mana={2}{W}
 type=Enchantment Creature
 subtype=Nymph
@@ -44880,7 +44878,7 @@ toughness=1
 [card]
 name=He Who Hungers
 abilities=flying
-auto={1}{S(creature[spirit]|mybattlefield)}:name(discard) target(opponent) donothing && all(this) transforms((,newability[notatarget(*|targetedpersonshand) reject]))
+auto={1}{S(creature[spirit]|mybattlefield)}:target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend asSorcery
 auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=4]|mygraveyard)
 text=Flying -- {1}, Sacrifice a Spirit: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. -- Soulshift 4 (When this dies, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 mana={4}{B}
@@ -46323,8 +46321,7 @@ type=Instant
 [card]
 name=Hint of Insanity
 target=player
-auto=target(*|targetedpersonshand) donothing
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(discards) all(*[-land]|reveal) transforms((,newability[all(other *[share!name!]|reveal) moveto(ownerhand) and!(reject)!])) oneshot optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-auto=all(*|targetedpersonshand) transforms((,newability[if type(*[share!name!]|myhand)~morethan~1 then reject])) forever
 text=Target player reveals his or her hand. That player discards all nonland cards with the same name as another card in his or her hand.
 mana={2}{B}
 type=Sorcery
@@ -47468,7 +47465,7 @@ toughness=1
 name=Humbler of Mortals
 auto=all(creature|myBattlefield) trample ueot
 auto=@movedTo(enchantment|myBattlefield):all(creature|myBattlefield) trample ueot
-text=Constellation � Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn.
+text=Constellation ? Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn.
 mana={4}{G}{G}
 type=Enchantment Creature
 subtype=Elemental
@@ -48279,7 +48276,7 @@ name=Icy Blast
 target=<prex>creature|battlefield
 auto=tap
 auto=if type(creature[power>=4]|mybattlefield)~morethan~0 then frozen
-text=Tap X target creatures. -- Ferocious � If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps.
+text=Tap X target creatures. -- Ferocious ? If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps.
 mana={X}{U}
 type=Instant
 [/card]
@@ -49452,8 +49449,8 @@ type=Sorcery
 [card]
 name=Inquisition
 target=player
-auto=target(*|targetedpersonshand) donothing
 auto=damage:type:*[white]:targetedpersonshand targetedplayer
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiononeend revealend
 text=Target player reveals his or her hand. Inquisition deals damage to that player equal to the number of white cards in his or her hand.
 mana={2}{B}
 type=Sorcery
@@ -49461,7 +49458,7 @@ type=Sorcery
 [card]
 name=Inquisition of Kozilek
 target=player
-auto=if type(*[-land;manacost<=3]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-land;manacost<=3]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[-land;manacost<=3]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand. You choose a nonland card from it with converted mana cost 3 or less. That player discards that card.
 mana={B}
 type=Sorcery
@@ -53306,7 +53303,7 @@ toughness=5
 [card]
 name=King Macar, the Gold-Cursed
 auto=@untapped(this):may moveto(exile) target(creature) && token(-378445) controller
-text=Inspired � Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
+text=Inspired ? Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
 mana={2}{B}{B}
 type=Legendary Creature
 subtype=Human
@@ -55293,7 +55290,7 @@ toughness=3
 name=Kytheon's Tactics
 auto=all(creature|mybattlefield) 2/1 ueot
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then all(creature|mybattlefield) vigilance ueot
-text=Creatures you control get +2/+1 until end of turn. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, those creatures also gain vigilance until end of turn. (Attacking doesn't cause them to tap.)
+text=Creatures you control get +2/+1 until end of turn. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, those creatures also gain vigilance until end of turn. (Attacking doesn't cause them to tap.)
 mana={1}{W}{W}
 type=Sorcery
 [/card]
@@ -55454,7 +55451,7 @@ toughness=2
 [card]
 name=Lagonna-Band Trailblazer
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
-text=Heroic �- Whenever you cast a spell that targets  Lagonna-Band Trailblazer, put a +1/+1 counter on Lagonna-Band Trailblazer.
+text=Heroic ?- Whenever you cast a spell that targets  Lagonna-Band Trailblazer, put a +1/+1 counter on Lagonna-Band Trailblazer.
 mana={W}
 type=Creature
 subtype=Centaur Scout
@@ -56359,7 +56356,7 @@ toughness=1
 [card]
 name=Leonin Iconoclast
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):destroy target(Creature[enchantment]|opponentbattlefield)
-text=Heroic � Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls.
+text=Heroic ? Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls.
 mana={3}{W}
 type=Creature
 subtype=Cat Monk
@@ -56741,7 +56738,7 @@ type=Artifact
 [card]
 name=Lifebane Zombie
 abilities=intimidate
-auto=choice name(target opponent) target(opponent) donothing && all(this) transforms((,newability[if type(creature[green;white]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else moveto(exile) notatarget(creature[green;white]|targetedpersonshand)],black)) oneshot
+auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(creature[green;white]|reveal) moveto(exile) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Intimidate. -- When Lifebane Zombie enters the battlefield, target opponent reveals his or her hand. You choose a green or white creature card from it and exile that card.
 mana={1}{B}{B}
 type=Creature
@@ -57768,7 +57765,7 @@ toughness=4
 [card]
 name=Lobotomy
 target=player
-auto=if type(*[-basic]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else name(exile nonbasic) notatarget(*[-basic]|targetedpersonshand) transforms((,newability[all(*[share!name!]|myhand) moveto(exile)],newability[all(*[share!name!]|mylibrary) moveto(exile) and!( shuffle )!],newability[all(*[share!name!]|mygraveyard) moveto(exile)]))
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) notatarget(*[-basic]|reveal) moveto(exile) and!( transforms((,newability[all(*[share!name!]|mylibrary) moveto(exile) and!(shuffle)!],newability[all(*[share!name!]|mygraveyard) moveto(exile)],newability[all(*[share!name!]|myhand) moveto(exile)])) oneshot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles his or her library.
 mana={2}{U}{B}
 type=Sorcery
@@ -60247,7 +60244,7 @@ toughness=4
 name=Mardu Charm
 auto=choice name(4 Damage) damage:4 target(creature)
 auto=choice name(2 Warrior tokens) token(-386593)*2
-auto=choice name(Duress opponent) target(opponent) donothing && all(this) transforms((,newability[if type(*[-creature;-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-creature;-land]|targetedpersonshand)])) oneshot 
+auto=choice name(discard opponent) target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[-creature;-land]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Choose one: -- Mardu Charm deals 4 damage to target creature. -- Put two 1/1 white Warrior creature tokens onto the battlefield. They gain first strike until end of turn. -- Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card. 
 mana={R}{W}{B}
 type=Instant
@@ -61918,7 +61915,7 @@ toughness=2
 name=Mercurial Pretender
 auto=may copy NotATarget(creature)
 auto=transforms((,newability[{2}{U}{U}:moveto(ownerhand)])) forever
-text=You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains �{2}{U}{U}: Return this creature to its owner�s hand.� 
+text=You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains ?{2}{U}{U}: Return this creature to its owner?s hand.? 
 mana={4}{U}
 type=Creature
 subtype=Shapeshifter
@@ -62122,7 +62119,7 @@ toughness=1
 [/card]
 [card]
 name=Mesmeric Fiend
-auto=choice name(target opponent) target(opponent) donothing && all(this) transforms((,newability[if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else hand(blink)forsrc notatarget(*[-land]|targetedpersonshand)])) forever
+auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone hand(blink)forsrc notatarget(*[-land]|reveal) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=When Mesmeric Fiend enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card. -- When Mesmeric Fiend leaves the battlefield, return the exiled card to its owner's hand.
 mana={1}{B}
 type=Creature
@@ -62771,7 +62768,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mind Slash
-auto={B}{S(creature|mybattlefield)}:name(discard) target(opponent) donothing && all(this) transforms((,newability[notatarget(*|targetedpersonshand) reject])) asSorcery
+auto={B}{S(creature|mybattlefield)}:target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend asSorcery
 text={B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
 mana={1}{B}{B}
 type=Enchantment
@@ -62854,7 +62851,7 @@ toughness=1
 [/card]
 [card]
 name=Mindclaw Shaman
-auto=choice name(target opponent) target(opponent) donothing && all(this) transforms((,newability[if type(*[instant;sorcery]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else may castcard(restricted) notatarget(*[instant;sorcery]|targetedpersonshand)])) forever
+auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(*[instant;sorcery]|reveal) castcard(restricted) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend 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
@@ -66912,7 +66909,7 @@ type=Enchantment
 name=Necromantic Summons
 target=creature|graveyard
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then transforms((,newability[moveto(mybattlefield)],newability[counter(1/1.2)])) forever else moveto(mybattlefield)
-text=Put target creature card from a graveyard onto the battlefield under your control. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
+text=Put target creature card from a graveyard onto the battlefield under your control. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
 mana={4}{B}
 type=Sorcery
 [/card]
@@ -67737,7 +67734,7 @@ type=Enchantment
 [card]
 name=Night Terrors
 target=player
-auto=if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else moveto(exile) notatarget(*[-land]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone target(*[-land]|reveal) moveto(exile) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand. You choose a nonland card from it. Exile that card.
 mana={2}{B}
 type=Sorcery
@@ -67828,7 +67825,7 @@ subtype=Equipment
 [card]
 name=Nightmare Void
 target=player
-auto=target(*|targetedpersonshand) reject
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 dredge=dredge(2)
 text=Target player reveals his or her hand. You choose a card from it. That player discards that card. -- Dredge 2 (If you would draw a card, instead you may put exactly two cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)
 mana={3}{B}
@@ -68219,7 +68216,7 @@ toughness=3
 [card]
 name=Nissa's Pilgrimage
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then name(fetch to play) notatarget(forest[basic]|mylibrary) transforms((,newability[name(move to hand) notatarget(<upto:2>forest[basic]|mylibrary) moveTo(myhand)],newability[moveTo(myBattlefield) and!(tap)!])) oneshot else name(fetch to play) notatarget(forest[basic]|mylibrary) transforms((,newability[name(move to hand) notatarget(forest[basic]|mylibrary) moveTo(myhand)],newability[moveTo(myBattlefield) and!(tap)!])) oneshot
-text=Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
+text=Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
 mana={2}{G}
 type=Sorcery
 [/card]
@@ -68956,7 +68953,7 @@ toughness=7
 name=Oakheart Dryads
 auto=1/1 target(creature) ueot
 auto=@movedTo(enchantment|myBattlefield):1/1 target(creature) ueot
-text=Constellation � Whenever Oakheart Dryads or another enchantment enters the battlefield under your control, target creature gets +1/+1 until end of turn.
+text=Constellation ? Whenever Oakheart Dryads or another enchantment enters the battlefield under your control, target creature gets +1/+1 until end of turn.
 mana={2}{G}
 type=Enchantment Creature
 subtype=Nymph Dryad
@@ -69523,7 +69520,7 @@ name=Ojutai Exemplars
 auto=@movedto(*[-creature]|mystack):choice name(Tap target creature) tap target(creature|battlefield)
 auto=@movedto(*[-creature]|mystack):choice name(First Strike and Lifelink) transforms((,newability[first strike ueot],newability[lifelink ueot])) ueot
 auto=@movedto(*[-creature]|mystack):choice name(Exile and returned tapped) moveto(exile) and!( transforms((,newability[moveto(ownerbattlefield) and!(tap)!])) forever)!
-text=Whenever you cast a noncreature spell, choose one � -- � Tap target creature. -- � Ojutai Exemplars gains first strike and lifelink until end of turn. -- � Exile Ojutai Exemplars, then return it to the battlefield tapped under its owner's control.
+text=Whenever you cast a noncreature spell, choose one ? -- ? Tap target creature. -- ? Ojutai Exemplars gains first strike and lifelink until end of turn. -- ? Exile Ojutai Exemplars, then return it to the battlefield tapped under its owner's control.
 mana={2}{W}{W}
 type=Creature
 subtype=Human Monk
@@ -70699,8 +70696,7 @@ toughness=2
 [card]
 name=Ostracize
 target=opponent
-auto=target(creature|targetedpersonshand) reject
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(creature|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-auto=if type(creature|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(creature|targetedpersonshand)
 text=Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card.
 mana={B}
 type=Sorcery
@@ -72371,8 +72367,8 @@ type=Sorcery
 [/card]
 [card]
 name=Perish the Thought
-arget=opponent
+target=opponent
-auto=moveTo(ownerlibrary) and!( shuffle )! notatarget(*|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone target(*|reveal) moveto(ownerlibrary) and!( shuffle )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose a card from it. That player shuffles that card into his or her library.
 mana={2}{B}
 type=Sorcery
@@ -72415,8 +72411,7 @@ type=Enchantment
 [card]
 name=Persecute
 target=player
-auto=name(see target hand) target(*|targetedpersonshand) donothing
+auto=chooseacolor reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone all(*[chosencolor]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend chooseend
-auto=chooseacolor all(*[chosencolor]|targetedpersonshand) reject chooseend
 text=Choose a color. Target player reveals his or her hand and discards all cards of that color.
 mana={2}{B}{B}
 type=Sorcery
@@ -72943,7 +72938,7 @@ toughness=5
 [card]
 name=Pheres-Band Thunderhoof
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,2)
-text=Heroic �- Whenever you cast a spell that targets Pheres-Band Thunderhoof, put two +1/+1 counters on Pheres-Band Thunderhoof.
+text=Heroic ?- Whenever you cast a spell that targets Pheres-Band Thunderhoof, put two +1/+1 counters on Pheres-Band Thunderhoof.
 mana={4}{G}
 type=Creature
 subtype=Centaur Warrior
@@ -75892,7 +75887,7 @@ subtype=Aura
 [card]
 name=Psychic Spear
 target=player
-auto=if type(*[spirit;arcane]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[spirit;arcane]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[spirit;arcane]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand. You choose a Spirit or Arcane card from it. That player discards that card.
 mana={B}
 type=Sorcery
@@ -78304,7 +78299,7 @@ name=Ravaging Blaze
 target=creature
 auto=damage:X
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then damage:x targetcontroller
-text=Ravaging Blaze deals X damage to target creature.  -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, Ravaging Blaze also deals X damage to that creature's controller.
+text=Ravaging Blaze deals X damage to target creature.  -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, Ravaging Blaze also deals X damage to that creature's controller.
 mana={X}{R}{R}
 type=Instant
 [/card]
@@ -78797,7 +78792,7 @@ type=Instant
 [card]
 name=Reap Intellect
 target=opponent
-auto=target(<upto:castx>*[-land]|targetedpersonshand) moveTo(exile) and!(transforms((,newability[moveTo(exile) all(*[share!name!]|mygraveyard)],newability[moveTo(exile) all(*[share!name!]|myhand)],newability[moveTo(exile) all(*[share!name!]|mylibrary)])) forever)!
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) notatarget(<upto:castx>*[-land]|reveal) moveto(exile) and!( transforms((,newability[moveTo(exile) all(*[share!name!]|mygraveyard)],newability[moveTo(exile) all(*[share!name!]|myhand)],newability[moveTo(exile) and!(shuffle)! all(*[share!name!]|mylibrary)])) oneshot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library.
 mana={X}{2}{U}{B}
 type=Sorcery
@@ -82347,7 +82342,7 @@ toughness=2
 [card]
 name=Rotfeaster Maggot
 auto=moveTo(exile) target(creature|graveyard) and!( dynamicability<!mytgt toughnesslifegain srccontroller!> )!
-text=When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card�s toughness. 
+text=When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card?s toughness. 
 mana={4}{B}
 type=Creature
 subtype=Insect
@@ -84411,7 +84406,7 @@ toughness=1
 [card]
 name=Satyr Hoplite
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
-text=Heroic �- Whenever you cast a spell that targets Satyr Hoplite, put a +1/+1 counter on Satyr Hoplite.
+text=Heroic ?- Whenever you cast a spell that targets Satyr Hoplite, put a +1/+1 counter on Satyr Hoplite.
 mana={R}
 type=Creature
 subtype=Satyr Soldier
@@ -86137,8 +86132,8 @@ type=Sorcery
 [card]
 name=Search Warrant
 target=player
-auto=name(look) target(*|targetedpersonshand) donothing
 auto=life:type:*:targetedpersonshand controller
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )! optiononeend revealend
 text=Target player reveals his or her hand. You gain life equal to the number of cards in that player's hand.
 mana={W}{U}
 type=Sorcery
@@ -86950,7 +86945,7 @@ name=Send to Sleep
 target=<upto:2>creature|battlefield
 auto=tap
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then frozen
-text=Tap up to two target creatures. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps.
+text=Tap up to two target creatures. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps.
 mana={1}{U}
 type=Instant
 [/card]
@@ -86977,7 +86972,7 @@ power=1
 toughness=2
 [/card]
 #The Sengir Nosferatu that the Bat token's ability returns to the battlefield doesn't have to be the same one that created it, and it doesn't even have to be owned by the same player.
-#If the Nosferatu is copied (by Clone, for example) and then the copy is exiled by the first activated ability, it won�t be able to come back using the second activated ability, since it�s no longer named Sengir Nosferatu in the Exile zone.
+#If the Nosferatu is copied (by Clone, for example) and then the copy is exiled by the first activated ability, it won?t be able to come back using the second activated ability, since it?s no longer named Sengir Nosferatu in the Exile zone.
 #since we can't target exile, I use moverandom(name)
 [card]
 name=Sengir Nosferatu
@@ -88154,7 +88149,7 @@ type=Sorcery
 [card]
 name=Shattered Dreams
 target=opponent
-auto=if type(artifact|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(artifact|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) notatarget(artifact|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose an artifact card from it. That player discards that card.
 mana={B}
 type=Sorcery
@@ -88507,9 +88502,7 @@ toughness=0
 [card]
 name=Shimian Specter
 abilities=flying
-auto=@combatdamagefoeof(player) from(this) restriction{type(*[-land]|opponenthand)~morethan~0}:name(exile a nonland) notatarget(*[-land]|opponenthand) transforms((,newability[all(*[share!name!]|mylibrary) moveto(exile) and!(shuffle)!],newability[all(*[share!name!]|mygraveyard) moveto(exile)],newability[all(*[share!name!]|myhand) moveto(exile)]))
+auto=@combatdamaged(player) from(this):reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose card) notatarget(*[-land]|reveal) moveto(exile) and!( transforms((,newability[all(*[share!name!]|mylibrary) moveto(exile) and!(shuffle)!],newability[all(*[share!name!]|mygraveyard) moveto(exile)],newability[all(*[share!name!]|myhand) moveto(exile)])) oneshot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-auto=@combatdamageof(player) from(this) restriction{type(*[-land]|myhand)~morethan~0}:name(exile a nonland) notatarget(*[-land]|myhand) transforms((,newability[all(*[share!name!]|mylibrary) moveto(exile) and!(shuffle)!],newability[all(*[share!name!]|mygraveyard) moveto(exile)],newability[all(*[share!name!]|myhand) moveto(exile)]))
-auto=@combatdamagefoeof(player) from(this) restriction{type(*[-land]|opponenthand)~lessthan~1}:name(look) notatarget(*|opponenthand) donothing
 text=Flying -- Whenever Shimian Specter deals combat damage to a player, that player reveals his or her hand. You choose a nonland card from it. Search that player's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles his or her library.
 mana={2}{B}{B}
 type=Creature
@@ -90262,8 +90255,7 @@ type=Instant
 [/card]
 [card]
 name=Sin Collector
-target=opponent
+auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) notatarget(*[instant;sorcery]|reveal) moveto(exile) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-auto=if type(*[instant;sorcery]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else moveto(exile) notatarget(*[instant;sorcery]|targetedpersonshand)
 text=When Sin Collector enters the battlefield target opponent reveals his or her hand. You choose an instant or a sorcery card from it and exile that card.
 mana={1}{W}{B}
 type=Creature
@@ -91168,7 +91160,7 @@ toughness=1
 name=Skybind
 auto=(blink) target(*[-enchantment]) ueot
 auto=@movedTo(enchantment|myBattlefield):(blink) target(*[-enchantment]) ueot
-text=Constellation � Whenever Skybind or another enchantment enters the battlefield under your control, exile target nonenchantment permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step.
+text=Constellation ? Whenever Skybind or another enchantment enters the battlefield under your control, exile target nonenchantment permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step.
 mana={3}{W}{W}
 type=Enchantment
 [/card]
@@ -95378,7 +95370,7 @@ type=Enchantment
 name=Splitting Headache
 target=player
 auto=choice name(discard 2 cards) ability$!name(discard 2 cards) notatarget(<2>*|myhand) reject!$ targetedplayer
-auto=choice name(chosen discard) notatarget(*|targetedpersonshand) reject
+auto=choice name(chosen discard) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) notatarget(*[-land]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Choose one - Target player discards two cards; or target player reveals his or her hand, you choose a card from it, then that player discards that card.
 mana={3}{B}
 type=Sorcery
@@ -97627,7 +97619,7 @@ toughness=4
 name=Strength from the Fallen
 auto=target(creature) type:creature:mygraveyard/type:creature:mygraveyard ueot
 auto=@movedTo(enchantment|myBattlefield):target(creature) type:creature:mygraveyard/type:creature:mygraveyard ueot
-text=Constellation � Whenever Strength from the Fallen or another enchantment enters the battlefield under your control, target creature gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
+text=Constellation ? Whenever Strength from the Fallen or another enchantment enters the battlefield under your control, target creature gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
 mana={1}{G}
 type=Enchantment
 [/card]
@@ -97899,7 +97891,7 @@ toughness=3
 name=Stubborn Denial
 target=*[-creature]|stack
 auto=if type(creature[power>=4]|mybattlefield) then fizzle else transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) forever
-text=Counter target noncreature spell unless its controller pays {1}. -- Ferocious � If you control a creature with power 4 or greater, counter that spell instead.
+text=Counter target noncreature spell unless its controller pays {1}. -- Ferocious ? If you control a creature with power 4 or greater, counter that spell instead.
 mana={U}
 type=Instant
 [/card]
@@ -99306,7 +99298,7 @@ other={1}{W} name(Spell Mastery)
 otherrestriction=type(*[instant;sorcery]|mygraveyard)~morethan~1
 target=creature[tapped]|battlefield
 auto=destroy
-text=Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, you may cast Swift Reckoning as though it had flash. (You may cast it any time you could cast an instant.) Destroy target tapped creature.
+text=Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, you may cast Swift Reckoning as though it had flash. (You may cast it any time you could cast an instant.) Destroy target tapped creature.
 mana={1}{W}
 type=Sorcery
 [/card]
@@ -100064,7 +100056,7 @@ toughness=3
 [card]
 name=Talara's Bane
 target=opponent
-auto=if type(creature[green;white]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else notatarget(creature[green;white]|targetedpersonshand) dynamicability<!mytgt toughnesslifegain srccontroller!> reject
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(creature[green;white]|reveal) moveto(ownerhand) and!( dynamicability<!mytgt toughnesslifegain srccontroller!> reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose a green or white creature card from it. You gain life equal that creature card's toughness, then that player discards that card.
 mana={1}{B}
 type=Sorcery
@@ -101716,7 +101708,7 @@ toughness=2
 [card]
 name=Tethmos High Priest
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):moveTo(mybattlefield) target(creature[manacost<=2]|mygraveyard)
-text=Heroic � Whenever you cast a spell that targets Tethmos High Priest, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
+text=Heroic ? Whenever you cast a spell that targets Tethmos High Priest, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
 mana={2}{W}
 type=Creature
 subtype=Cat Cleric
@@ -101944,7 +101936,7 @@ type=Sorcery
 name=Thassa's Devourer
 auto=deplete:2 target(player)
 auto=@movedTo(enchantment|myBattlefield):deplete:2 target(player)
-text=Constellation � Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard.
+text=Constellation ? Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard.
 mana={4}{U}
 type=Enchantment Creature
 subtype=Elemental
@@ -102618,7 +102610,7 @@ type=Sorcery
 [/card]
 [card]
 name=Thoughtcutter Agent
-auto={U}{B}{T}:target(player) life:-1 && all(this) transforms((,newability[name(look) notatarget(*|targetedpersonshand) donothing]))
+auto={U}{B}{T}:target(player) life:-1 && all(this) transforms((,newability[reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )! optiononeend revealend])) oneshot
 text={U}{B}, {T}: Target player loses 1 life and reveals his or her hand.
 mana={U}{B}
 type=Artifact Creature
@@ -102651,7 +102643,7 @@ type=Enchantment
 name=Thoughtrender Lamia
 auto=ability$!name(discard) target(*|myhand) reject!$ opponent
 auto=@movedTo(enchantment|myBattlefield):ability$!name(discard) target(*|myhand) reject!$ opponent
-text=Constellation � Whenever Thoughtrender Lamia or another enchantment enters the battlefield under your control, each opponent discards a card.
+text=Constellation ? Whenever Thoughtrender Lamia or another enchantment enters the battlefield under your control, each opponent discards a card.
 mana={4}{B}{B}
 type=Enchantment Creature
 subtype=Lamia
@@ -102669,8 +102661,7 @@ type=Sorcery
 [card]
 name=Thoughtseize
 target=player
-auto=if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-land]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[-land]|reveal) moveto(ownerhand) and!( transforms((,newability[reject],newability[all(*[-land]|reveal) moveto(ownerhand) and!(reject)!])) oneshot )! optiononeend optiontwo name(look) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend afterrevealed transforms((,newability[life:-2 controller])) oneshot afterrevealedend revealend
-auto=life:-2 controller
 text=Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. You lose 2 life.
 mana={B}
 type=Sorcery
@@ -103476,7 +103467,7 @@ toughness=1
 [/card]
 [card]
 name=Tidehollow Sculler
-auto=choice name(target opponent) target(opponent) donothing && all(this) transforms((,newability[if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else hand(blink)forsrc notatarget(*[-land]|targetedpersonshand)])) forever
+auto=target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone hand(blink)forsrc notatarget(*[-land]|reveal) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=When Tidehollow Sculler enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card. -- When Tidehollow Sculler leaves the battlefield, return the exiled card to its owner's hand.
 mana={W}{B}
 type=Artifact Creature
@@ -105152,8 +105143,7 @@ type=Instant
 [card]
 name=Trapfinder's Trick
 target=player
-auto=name(see target hand)target(*|targetedpersonshand) donothing
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[trap]|reveal) moveto(ownerhand) and!( transforms((,newability[reject],newability[all(*[trap]|reveal) moveto(ownerhand) and!(reject)!])) oneshot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
-auto=all(trap|targetedpersonshand) reject
 text=Target player reveals his or her hand and discards all Trap cards.
 mana={1}{U}
 type=Sorcery
@@ -105824,7 +105814,7 @@ toughness=1
 [card]
 name=Triton Cavalry
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):may moveTo(ownerhand) target(enchantment|battlefield) 
-text=Heroic � Whenever you cast a spell that targets Triton Cavalry, you may return target enchantment to its owner's hand.
+text=Heroic ? Whenever you cast a spell that targets Triton Cavalry, you may return target enchantment to its owner's hand.
 mana={3}{U}
 type=Creature
 subtype=Merfolk Soldier
@@ -107113,7 +107103,7 @@ name=Underworld Coinsmith
 auto=life:1
 auto=@movedTo(enchantment|myBattlefield):life:1
 auto={W}{B}{L}:life:-1 opponent
-text=Constellation � Whenever Underworld Coinsmith or another enchantment enters the battlefield under your control, you gain 1 life. -- {W}{B}, Pay 1 life: Each opponent loses 1 life.
+text=Constellation ? Whenever Underworld Coinsmith or another enchantment enters the battlefield under your control, you gain 1 life. -- {W}{B}, Pay 1 life: Each opponent loses 1 life.
 mana={W}{B}
 type=Enchantment Creature
 subtype=Human Cleric
@@ -107264,7 +107254,7 @@ name=Unholy Hunger
 target=creature
 auto=destroy
 auto=if type(*[instant;sorcery]|mygraveyard)~morethan~1 then life:2 srccontroller
-text=Destroy target creature. -- Spell mastery � If there are two or more instant and/or sorcery cards in your graveyard, you gain 2 life.
+text=Destroy target creature. -- Spell mastery ? If there are two or more instant and/or sorcery cards in your graveyard, you gain 2 life.
 mana={3}{B}{B}
 type=Instant
 [/card]
@@ -107322,7 +107312,7 @@ type=Instant
 [card]
 name=Unmask
 target=player
-auto=if type(*[-land]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-land]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[-land]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 other={E(other *[black]|myhand)} name(Exile a Black Card from Hand)
 text=You may exile a black card from your hand rather than pay Unmask's mana cost. -- Target player reveals his or her hand. You choose a nonland card from it. That player discards that card.
 mana={3}{B}
@@ -108884,7 +108874,7 @@ type=Land
 [card]
 name=Venarian Glimmer
 target=player
-auto=if type(*[-land;manacost<=castx]|targetedpersonshand)~lessthan~1 then name(look) donothing notatarget(*|targetedpersonshand) else reject notatarget(*[-land;manacost<=castx]|targetedpersonshand)
+auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*[-land;manacost<=castx]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand. You choose a nonland card with converted mana cost X or less from it. That player discards that card.
 mana={X}{U}
 type=Instant
@@ -108901,7 +108891,7 @@ type=Instant
 [card]
 name=Vendilion Clique
 abilities=flash,flying
-auto=name(choose a card) target(*[-land]|opponenthand) transforms((,newability[bottomoflibrary],newability[draw:1 controller]))
+auto=name(target player) target(player) Reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose card) target(*[-land]|reveal) transforms((,newability[bottomoflibrary],newability[draw:1],newability[all(*|reveal) moveto(ownerhand)])) oneshot optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Flash -- Flying -- When Vendilion Clique enters the battlefield, look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of his or her library, then draws a card.
 mana={1}{U}{U}
 type=Legendary Creature
@@ -112971,7 +112961,7 @@ type=Sorcery
 [card]
 name=Wavecrash Triton
 auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):target(creature|opponentbattlefield) transforms((,newability[tap],newability[frozen])) oneshot
-text=Heroic � Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
+text=Heroic ? Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 mana={2}{U}
 type=Creature
 subtype=Merfolk Wizard
@@ -113845,7 +113835,7 @@ type=Instant
 name=Whitewater Naiads
 auto=unblockable target(creature) ueot
 auto=@movedTo(enchantment|myBattlefield):unblockable target(creature) ueot
-text=Constellation � Whenever Whitewater Naiads or another enchantment enters the battlefield under your control, target creature can't be blocked this turn.
+text=Constellation ? Whenever Whitewater Naiads or another enchantment enters the battlefield under your control, target creature can't be blocked this turn.
 mana={3}{U}{U}
 type=Enchantment Creature
 subtype=Nymph
@@ -118822,6 +118812,7 @@ text=Roil's Retribution deals 5 damage divided as you choose among any number of
 mana={3}{W}{W}
 type=Instant
 [/card]
+[card]
 name=Roilmage's Trick
 auto=all(creature|opponentbattlefield) -converge/0 ueot
 auto=draw:1 controller
@@ -119638,7 +119629,7 @@ subtype=Aura
 [/card]
 [card]
 name=Hanweir Militia Captain
-auto=@each my upkeep restriction{type(creature|mybattlefield)~morethan~3}:flip(Westvale Cult Leader)
+auto=@each my upkeep restriction{type(creature|mybattlefield)~morethan~3}: transforms((,newability[flip(Westvale Cult Leader)])) forever
 text=At the beginning of your upkeep, if you control four or more creatures, transform Hanweir Militia Captain.
 mana={1}{W}
 type=Creature
@@ -119649,7 +119640,7 @@ toughness=2
 [card]
 name=Westvale Cult Leader
 anyzone=type:creature:mybattlefield/type:creature:mybattlefield cdaactive
-auto=@each my endofturn:token(Human Cleric,creature Human Cleric,1/1,white,black)
+auto=@each my endofturn:token(Human Cleric,Creature Human Cleric,1/1,white,black)
 text=Westvale Cult Leader's power and toughness are each equal to the number of creatures you control. -- At the beginning of your end step, put a 1/1 white and black Human Cleric creature token onto the battlefield.
 type=Creature
 subtype=Human Cleric
@@ -126635,7 +126626,7 @@ name=Prism Array
 auto=counter(0/0,converge,crystal)
 auto={c(0/0,-1,crystal)}:tap target(creature)
 auto={W}{U}{B}{R}{G}:scry:3 scrycore delayed dontshow donothing scrycoreend scryend
-text=Converge נPrism Array enters the battlefield with a crystal counter on it for each color of mana spent to cast it. -- Remove a crystal counter from Prism Array: Tap target creature. -- {W}{U}{B}{R}{G}: Scry 3. (Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+text=Converge — Prism Array enters the battlefield with a crystal counter on it for each color of mana spent to cast it. -- Remove a crystal counter from Prism Array: Tap target creature. -- {W}{U}{B}{R}{G}: Scry 3. (Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={4}{U}
 type=Enchantment
 [/card]
@@ -126736,7 +126727,7 @@ type=Sorcery
 [card]
 name=Retreat to Coralhelm
 auto=@movedTo(land|myBattlefield):name(choose one) transforms((,newability[reveal:1 optionone name(Scry Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend],newability[choice name(Tap creature) target(creature) tap])) oneshot
-text=Landfall Whenever a land enters the battlefield under your control, choose one  --  You may tap or untap target creature. -- Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+text=Landfall — Whenever a land enters the battlefield under your control, choose one — -- • You may tap or untap target creature. -- • Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={2}{U}
 type=Enchantment
 [/card]
@@ -126787,7 +126778,8 @@ subtype=Leviathan
 power=0
 toughness=0
 [/card]
-##due to card type association dryad arbor is placed at the end. any other card that associates 2 super types in this manner should also ##be in the end of the primitive to avoid abilities like changling thinking that "forest" is a creature type.
+##due to card type association dryad arbor is placed at the end. any other card that associates 2 super types in this manner should also
+##be in the end of the primitive to avoid abilities like changling thinking that "forest" is a creature type.
 [card]
 name=Dryad Arbor
 text=(Dryad Arbor isn't a spell, it's affected by summoning sickness, and it has "{T}: Add {G} to your mana pool.") -- Dryad Arbor is green.

projects/mtg/src/AllAbilities.cpp

@@ -765,7 +765,7 @@ bool MTGScryCards::CheckUserInput(JButton key)
 			}
 			game->Update(1);
 
-			if (zone->cards.size() || revealDisplay && !zone->cards.size())
+			if (zone->cards.size() || (revealDisplay && !zone->cards.size()))
 			{
 				initDisplay(revealTopAmount);
 				abilitySecond = contructAbility(abilityTwo);

projects/mtg/src/MTGCardInstance.cpp

@@ -793,6 +793,9 @@ bool MTGCardInstance::StackIsEmptyandSorcerySpeed()
 //check targetted?
 bool MTGCardInstance::isTargetted()
 {
+    if(controller()->game->reveal->cards.size() || controller()->opponent()->game->reveal->cards.size())
+        return false;
+
     if(getObserver()->mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0)
     {
         ActionStack * stack = observer->mLayers->stackLayer();
@@ -818,6 +821,9 @@ bool MTGCardInstance::isTargetted()
 //check targetter?
 bool MTGCardInstance::isTargetter()
 {
+    if(controller()->game->reveal->cards.size() || controller()->opponent()->game->reveal->cards.size())
+        return false;
+
     if(getObserver()->mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0)
     {
         ActionStack * stack = observer->mLayers->stackLayer();
@@ -1039,7 +1045,6 @@ ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * new
                     if(newCost->getCost(color) > 0)
                         newCost->remove(color,1);
             }//end3
-        SAFE_DELETE(original);
     
     if(!noTrinisphere)
     {
@@ -1062,6 +1067,8 @@ ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * new
         }
     }
 
+    SAFE_DELETE(original);
+
     return newCost;
 }
 

projects/mtg/src/MTGRules.cpp

@@ -1358,7 +1358,7 @@ int MTGBestowRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
 {
 	if (!card->model)
 		return 0;
-	Player * player = game->currentlyActing();
+	//Player * player = game->currentlyActing();
 	if (!card->model->data->getManaCost()->getBestow())
 		return 0;
 	if (card->isInPlay(game))