Refactored the code of all spells which let you do sth with opponent manually (like looking at opponent's hand or choosing certain cards there to let them be discarded).

They now target a player. This means they cannot be casted anymore on a player who cannot be targeted, like for the case he controls a card like True Believer.
This commit is contained in:
solo81@web.de
2012-04-13 21:17:13 +00:00
parent ceea925b93
commit ae90a4ba61
+68 -62
View File
@@ -671,11 +671,8 @@ type=Land
[/card] [/card]
[card] [card]
name=Addle name=Addle
auto=choice name(White) reject target(*[white]|hand) target=player
auto=choice name(Blue) reject target(*[blue]|hand) auto=chooseacolor target(*[chosencolor]|targetedpersonshand) reject chooseend
auto=choice name(Black) reject target(*[black]|hand)
auto=choice name(Red) reject target(*[red]|hand)
auto=choice name(Green) reject target(*[green]|hand)
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. 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} mana={1}{B}
type=Sorcery type=Sorcery
@@ -925,8 +922,8 @@ type=Instant
[/card] [/card]
[card] [card]
name=Agonizing Memories name=Agonizing Memories
target=<2>*|opponenthand target=player
auto=moveTo(opponentlibrary) auto=target(<2>*|targetedpersonshand) moveTo(opponentlibrary)
text=Look at target player's hand and choose two cards from it. Put them on top of that player's library in any order. text=Look at target player's hand and choose two cards from it. Put them on top of that player's library in any order.
mana={2}{B}{B} mana={2}{B}{B}
type=Sorcery type=Sorcery
@@ -1742,8 +1739,9 @@ toughness=1
[/card] [/card]
[card] [card]
name=Amnesia name=Amnesia
target=*[-land]|hand target=player
auto=reject all(*[-land]|targetcontrollerhand) auto=target(*|targetedpersonshand) 0/0
auto=reject all(*[-land]|targetedpersonshand)
text=Target player reveals his or her hand and discards all nonland cards. text=Target player reveals his or her hand and discards all nonland cards.
mana={3}{U}{U}{U} mana={3}{U}{U}{U}
type=Sorcery type=Sorcery
@@ -5321,6 +5319,8 @@ toughness=4
[/card] [/card]
[card] [card]
name=Baleful Stare name=Baleful Stare
target=opponent
auto=target(*|targetedpersonshand) 0/0
auto=foreach(mountain|opponenthand) draw:1 auto=foreach(mountain|opponenthand) draw:1
auto=foreach(*[red]|opponenthand) draw:1 auto=foreach(*[red]|opponenthand) draw:1
text=Target opponent reveals his or her hand. You draw a card for each Mountain and red card in it. text=Target opponent reveals his or her hand. You draw a card for each Mountain and red card in it.
@@ -9436,8 +9436,8 @@ toughness=1
[/card] [/card]
[card] [card]
name=Brainbite name=Brainbite
target=*|opponenthand target=opponent
auto=reject auto=target(*|targetedpersonshand) reject
auto=draw:1 controller 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. 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} mana={2}{U}{B}
@@ -11503,8 +11503,8 @@ type=Land
[/card] [/card]
[card] [card]
name=Castigate name=Castigate
target=*[-land]|opponenthand target=opponent
auto=moveTo(exile) auto=target(*[-land]|targetedpersonshand) moveTo(exile)
text=Target opponent reveals his or her hand. You choose a nonland card from it and exile that card. text=Target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
mana={W}{B} mana={W}{B}
type=Sorcery type=Sorcery
@@ -13500,7 +13500,8 @@ toughness=2
[/card] [/card]
[card] [card]
name=Clairvoyance name=Clairvoyance
auto=name(look at opponents hand) target(*|opponenthand) 0/0 ueot target=player
auto=target(*|targetedpersonshand) 0/0 ueot
auto=@next upkeep:draw:1 controller auto=@next upkeep:draw:1 controller
text=Look at target player's hand. -- Draw a card at the beginning of the next turn's upkeep. text=Look at target player's hand. -- Draw a card at the beginning of the next turn's upkeep.
mana={U} mana={U}
@@ -14312,8 +14313,8 @@ toughness=4
[/card] [/card]
[card] [card]
name=Coercion name=Coercion
target=*|opponenthand target=opponent
auto=reject auto=target(*|targetedpersonshand) reject
text=Target opponent reveals his or her hand. You choose a card from it. That player discards that card. text=Target opponent reveals his or her hand. You choose a card from it. That player discards that card.
mana={2}{B} mana={2}{B}
type=Sorcery type=Sorcery
@@ -19263,8 +19264,8 @@ type=Instant
[/card] [/card]
[card] [card]
name=Despise name=Despise
target=creature|opponenthand target=opponent
auto=reject auto=target(creature,planeswalker|targetedpersonshand) reject
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 plainswalker card from it. That player discards that card.
mana={B} mana={B}
type=Sorcery type=Sorcery
@@ -20032,8 +20033,8 @@ type=Sorcery
[/card] [/card]
[card] [card]
name=Distress name=Distress
target=*[-land]|hand target=player
auto=reject auto=target(*[-land]|targetedpersonshand) reject
text=Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. text=Target player reveals his or her hand. You choose a nonland card from it. That player discards that card.
mana={B}{B} mana={B}{B}
type=Sorcery type=Sorcery
@@ -21733,8 +21734,8 @@ toughness=*
[/card] [/card]
[card] [card]
name=Duress name=Duress
target=*[-creature;-land]|opponenthand target=opponent
auto=reject auto=target(*[-creature;-land]|targetedpersonshand) reject
text=Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card. text=Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
mana={B} mana={B}
type=Sorcery type=Sorcery
@@ -23721,8 +23722,8 @@ toughness=2
[/card] [/card]
[card] [card]
name=Encroach name=Encroach
target=land[-basic]|hand target=player
auto=reject auto=target(land[-basic]|targetedpersonshand) reject
text=Target player reveals his or her hand. You choose a nonbasic land card from it. That player discards that card. text=Target player reveals his or her hand. You choose a nonbasic land card from it. That player discards that card.
mana={B} mana={B}
type=Sorcery type=Sorcery
@@ -25095,8 +25096,8 @@ type=Instant
[/card] [/card]
[card] [card]
name=Extortion name=Extortion
target=<upto:2>*|opponenthand target=player
auto=moveTo(opponentlibrary) auto=target(<upto:2>*|targetedpersonshand) reject
text=Look at target player's hand and choose up to two cards from it. That player discards those cards. text=Look at target player's hand and choose up to two cards from it. That player discards those cards.
mana={3}{B}{B} mana={3}{B}{B}
type=Sorcery type=Sorcery
@@ -29584,7 +29585,7 @@ subtype=Garruk
name=Garruk Relentless name=Garruk Relentless
auto=counter(0/0,3,loyalty) auto=counter(0/0,3,loyalty)
auto=this(counter{0/0.1.loyalty}<3) flip(Garruk the Veil-Cursed) auto=this(counter{0/0.1.loyalty}<3) flip(Garruk the Veil-Cursed)
auto={0}:target(creature) damage:3 && dynamicability<!powerstrike eachother!> auto={0}:target(creature) dynamicability<!mytgt powerstrike tosrc!> damage:3
auto={0}:token(Wolf,Creature Wolf,2/2,green) auto={0}:token(Wolf,Creature Wolf,2/2,green)
text=When Garruk Relentless has two or fewer loyalty counters on him, transform him. -- 0: Garruk Relentless deals 3 damage to target creature. That creature deals damage equal to its power to him. -- 0: Put a 2/2 green Wolf creature token onto the battlefield. text=When Garruk Relentless has two or fewer loyalty counters on him, transform him. -- 0: Garruk Relentless deals 3 damage to target creature. That creature deals damage equal to its power to him. -- 0: Put a 2/2 green Wolf creature token onto the battlefield.
mana={3}{G} mana={3}{G}
@@ -30829,7 +30830,8 @@ toughness=2
[/card] [/card]
[card] [card]
name=Gitaxian Probe name=Gitaxian Probe
auto=name(look at opponents hand) target(*|opponenthand) 0/0 ueot target=player
auto=target(*|targetedpersonshand) 0/0
auto=draw:1 controller auto=draw:1 controller
text=({p(U)} may be paid for with either {U} or 2 life.) -- Look at target player's hand. -- Draw a card. text=({p(U)} may be paid for with either {U} or 2 life.) -- Look at target player's hand. -- Draw a card.
color=blue color=blue
@@ -36169,8 +36171,9 @@ toughness=3
[/card] [/card]
[card] [card]
name=Hint of Insanity name=Hint of Insanity
target=*[-land]|hand target=player
auto=reject all(*[share!name!]|targetcontrollerhand) auto=target(*|targetedpersonshand) 0/0
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. 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} mana={2}{B}
type=Sorcery type=Sorcery
@@ -38630,16 +38633,17 @@ toughness=3
[/card] [/card]
[card] [card]
name=Inquisition name=Inquisition
auto=name(look at opponents hand) target(*|opponenthand) 0/0 ueot target=player
auto=foreach(*[white]|opponenthand) damage:1 opponent auto=target(*|targetedpersonshand) 0/0
auto=foreach(*[white]|targetedpersonshand) damage:1 targetedplayer
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. 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} mana={2}{B}
type=Sorcery type=Sorcery
[/card] [/card]
[card] [card]
name=Inquisition of Kozilek name=Inquisition of Kozilek
target=*[manacost<=3;-land]|hand target=player
auto=reject auto=target(*[manacost<=3;-land]|targetedpersonshand) reject
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. 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} mana={B}
type=Sorcery type=Sorcery
@@ -49213,8 +49217,8 @@ type=Enchantment
[/card] [/card]
[card] [card]
name=Mind Warp name=Mind Warp
target=<prex>*|opponenthand target=player
auto=reject auto=target(*<prex>|targetedpersonshand) reject
text=Look at target player's hand and choose X cards from it. That player discards them. text=Look at target player's hand and choose X cards from it. That player discards them.
mana={X}{3}{B} mana={X}{3}{B}
type=Sorcery type=Sorcery
@@ -53149,8 +53153,8 @@ type=Enchantment
[/card] [/card]
[card] [card]
name=Night Terrors name=Night Terrors
target=*[-land]|opponenthand target=player
auto=moveTo(exile) auto=target(*[-land]|targetedpersonshand) reject
text=Target player reveals his or her hand. You choose a nonland card from it. Exile that card. text=Target player reveals his or her hand. You choose a nonland card from it. Exile that card.
mana={2}{B} mana={2}{B}
type=Sorcery type=Sorcery
@@ -55521,8 +55525,8 @@ toughness=2
[/card] [/card]
[card] [card]
name=Ostracize name=Ostracize
target=creature|opponenthand target=opponent
auto=reject auto=target(creature|targetedpersonshand) reject
text=Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card. text=Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card.
mana={B} mana={B}
type=Sorcery type=Sorcery
@@ -55873,8 +55877,8 @@ toughness=1
[/card] [/card]
[card] [card]
name=Painful Memories name=Painful Memories
target=*|opponenthand target=player
auto=moveTo(ownerlibrary) auto=target(*|targetedpersonshand) moveTo(ownerlibrary)
text=Look at target opponent's hand and choose a card from it. Put that card on top of that player's library. text=Look at target opponent's hand and choose a card from it. Put that card on top of that player's library.
mana={1}{B} mana={1}{B}
type=Sorcery type=Sorcery
@@ -56601,7 +56605,8 @@ type=Land
[/card] [/card]
[card] [card]
name=Peek name=Peek
auto=name(look at opponents hand) target(*|opponenthand) 0/0 ueot target=player
auto=target(*|targetedpersonshand) 0/0
auto=draw:1 controller auto=draw:1 controller
text=Look at target player's hand. -- Draw a card. text=Look at target player's hand. -- Draw a card.
mana={U} mana={U}
@@ -56903,8 +56908,8 @@ type=Sorcery
[/card] [/card]
[card] [card]
name=Perish the Thought name=Perish the Thought
target=*|opponenthand arget=opponent
auto=moveTo(ownerlibrary) && shuffle auto=target(*|targetedpersonshand) moveTo(ownerlibrary) && shuffle
text=Target opponent reveals his or her hand. You choose a card from it. That player shuffles that card into his or her library. 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} mana={2}{B}
type=Sorcery type=Sorcery
@@ -56946,11 +56951,9 @@ type=Enchantment
[/card] [/card]
[card] [card]
name=Persecute name=Persecute
auto=choice name(white) target(*[white]|opponenthand) 0/0 ueot && reject all(*[white]|opponenthand) target=player
auto=choice name(Blue) target(*[blue]|opponenthand) 0/0 ueot && reject all(*[blue]|opponenthand) auto=target(*|targetedpersonshand) 0/0
auto=choice name(Black) target(*[black]|opponenthand) 0/0 ueot && reject all(*[black]|opponenthand) auto=chooseacolor all(*[chosencolor]|targetedpersonshand) reject chooseend
auto=choice name(Red) target(*[red]|opponenthand) 0/0 ueot && reject all(*[red]|opponenthand)
auto=choice name(Green) target(*[green]|opponenthand) 0/0 ueot && reject all(*[green]|opponenthand)
text=Choose a color. Target player reveals his or her hand and discards all cards of that color. text=Choose a color. Target player reveals his or her hand and discards all cards of that color.
mana={2}{B}{B} mana={2}{B}{B}
type=Sorcery type=Sorcery
@@ -59729,8 +59732,8 @@ subtype=Aura
[/card] [/card]
[card] [card]
name=Psychic Spear name=Psychic Spear
target=spirit,arcane|hand target=player
auto=reject auto=target(spirit,arcane|targetedpersonshand) reject
text=Target player reveals his or her hand. You choose a Spirit or Arcane card from it. That player discards that card. text=Target player reveals his or her hand. You choose a Spirit or Arcane card from it. That player discards that card.
mana={B} mana={B}
type=Sorcery type=Sorcery
@@ -68973,8 +68976,8 @@ type=Sorcery
[/card] [/card]
[card] [card]
name=Shattered Dreams name=Shattered Dreams
target=artifact|opponenthand target=opponent
auto=reject auto=target(artifact|targetedpersonshand) reject
text=Target opponent reveals his or her hand. You choose an artifact card from it. That player discards that card. text=Target opponent reveals his or her hand. You choose an artifact card from it. That player discards that card.
mana={B} mana={B}
type=Sorcery type=Sorcery
@@ -73093,7 +73096,8 @@ toughness=1
[/card] [/card]
[card] [card]
name=Sorcerous Sight name=Sorcerous Sight
auto=name(look at opponents hand) target(*|opponenthand) 0/0 ueot target=opponent
auto=target(*|targetedpersonshand) 0/0
auto=draw:1 controller auto=draw:1 controller
text=Look at target opponent's hand. -- Draw a card. text=Look at target opponent's hand. -- Draw a card.
mana={U} mana={U}
@@ -80389,8 +80393,8 @@ type=Enchantment
[/card] [/card]
[card] [card]
name=Thoughtseize name=Thoughtseize
target=*[-land]|hand target=player
auto=reject auto=target(*[-land]|targetedpersonshand) reject
auto=life:-2 controller 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. 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} mana={B}
@@ -82468,8 +82472,9 @@ toughness=3
[/card] [/card]
[card] [card]
name=Trapfinder's Trick name=Trapfinder's Trick
target=*|hand target=player
auto=reject all(trap|targetcontrollerhand) auto=target(*|targetedpersonshand) 0/0
auto=all(trap|targetedpersonshand) reject
text=Target player reveals his or her hand and discards all Trap cards. text=Target player reveals his or her hand and discards all Trap cards.
mana={1}{U} mana={1}{U}
type=Sorcery type=Sorcery
@@ -84036,8 +84041,8 @@ type=Instant
[/card] [/card]
[card] [card]
name=Unmask name=Unmask
target=*[-land]|hand target=player
auto=reject auto=target(*[-land]|targetedpersonshand) reject
other={E(other *[black]|myhand)} name(Exile a Black Card from Hand) 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. 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} mana={3}{B}
@@ -85302,7 +85307,8 @@ type=Land
[/card] [/card]
[card] [card]
name=Venarian Glimmer name=Venarian Glimmer
auto=reject target(*[-land;manacost <=X]|opponenthand) target=player
auto=target(*[-land;manacost=prex]|targetedpersonshand) reject
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. 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} mana={X}{U}
type=Instant type=Instant