From cf71f84e49a71b562d9427b9a14d1485a22be222 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 7 Jul 2016 09:15:57 +0800 Subject: [PATCH] Revert "Sorted Primitives" This reverts commit 2f4c00c602a7aeb076a32fa9bb813db3f199bfa5. --- projects/mtg/bin/Res/sets/primitives/mtg.txt | 80 ++++++++++--------- .../bin/Res/sets/primitives/unsupported.txt | 27 +++++++ 2 files changed, 68 insertions(+), 39 deletions(-) diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index eea5024a4..f724167c0 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -1,6 +1,6 @@ #Primitives Pack for Wagic the Homebrew. #Please keep these card alphabetized, and try to have the "name=" line at the top of each card -#I sorted this programatically so the other comments are removed except for AUTO_DEFINE - kevlahnota 7-6-2016 +#I sorted this programatically so the other comments are removed except for AUTO_DEFINE - kevlahnota 7-4-2016 [card] name=Abandoned Outpost auto=tap @@ -14420,13 +14420,6 @@ mana={4} type=Artifact [/card] [card] -name=Bulwark -auto=@each opponent upkeep:target(opponent) damage:mathtype:*:myhandminustype:*:opponenthandminusendmathend opponent -text=At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand. -mana={3}{R}{R} -type=Enchantment -[/card] -[card] name=Bump in the Night auto=life:-3 opponent flashback={5}{R} @@ -23727,18 +23720,6 @@ mana={2}{B} type=Instant [/card] [card] -name=Dark Deal -auto=count(type:*:myhand) -auto=all(*|myhand) reject -auto=draw:countedamountplus1plusend controller -auto=count(type:*:opponenthand) -auto=all(*|opponenthand) reject -auto=draw:countedamountplus1plusend opponent -text=Each player discards all the cards in his or her hand, then draws that many cards minus one. -mana={2}{B} -type=Sorcery -[/card] -[card] name=Dark Depths auto=counter(0/0,10,Ice) auto={3}:counter(0/0,-1,Ice) all(this) @@ -23848,13 +23829,6 @@ power=1 toughness=1 [/card] [card] -name=Dark Suspicions -auto=@each opponent upkeep:life:-mathtype:*:opponenthandminustype:*:myhandminusendmathend opponent -text=At the beginning of each opponent's upkeep, that player loses X life, where X is the number of cards in that player's hand minus the number of cards in your hand. -mana={2}{B}{B} -type=Enchantment -[/card] -[card] name=Dark Temper target=creature auto=aslongas(*[black]|myBattlefield) destroy @@ -89031,18 +89005,6 @@ mana={1}{W}{U} type=Sorcery [/card] [card] -name=Roiling Horror -anyzone=mathlifetotalminusopponentlifetotalminusendmathend/mathlifetotalminusopponentlifetotalminusendmathend cdaactive -autoexile=@counterremoved(0/0,1,Time) from(sourcecard) suspended:ability$!choice life:-1 target(opponent) && life:1 controller!$ controller -text=Roiling Horror's power and toughness are each equal to your life total minus the life total of an opponent with the most life. -- Suspend X—{X}{B}{B}{B}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{B}{B}{B} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.) -- Whenever a time counter is removed from Roiling Horror while it's exiled, target player loses 1 life and you gain 1 life. -mana={3}{B}{B} -suspend(0)={X}{b}{b}{b} -type=Creature -subtype=Horror -power=* -toughness=* -[/card] -[card] name=Roiling Terrain target=land auto=destroy @@ -127593,6 +127555,46 @@ subtype=Orc Warrior power=7 toughness=2 [/card] +###### +######unsorted +[card] +name=Dark Suspicions +auto=@each opponent upkeep:life:-mathtype:*:opponenthandminustype:*:myhandminusendmathend opponent +text=At the beginning of each opponent's upkeep, that player loses X life, where X is the number of cards in that player's hand minus the number of cards in your hand. +mana={2}{B}{B} +type=Enchantment +[/card] +[card] +name=Bulwark +auto=@each opponent upkeep:target(opponent) damage:mathtype:*:myhandminustype:*:opponenthandminusendmathend opponent +text=At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand. +mana={3}{R}{R} +type=Enchantment +[/card] +[card] +name=Roiling Horror +anyzone=mathlifetotalminusopponentlifetotalminusendmathend/mathlifetotalminusopponentlifetotalminusendmathend cdaactive +autoexile=@counterremoved(0/0,1,Time) from(sourcecard) suspended:ability$!choice life:-1 target(opponent) && life:1 controller!$ controller +text=Roiling Horror's power and toughness are each equal to your life total minus the life total of an opponent with the most life. -- Suspend X—{X}{B}{B}{B}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{B}{B}{B} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.) -- Whenever a time counter is removed from Roiling Horror while it's exiled, target player loses 1 life and you gain 1 life. +mana={3}{B}{B} +suspend(0)={X}{b}{b}{b} +type=Creature +subtype=Horror +power=* +toughness=* +[/card] +[card] +name=Dark Deal +auto=count(type:*:myhand) +auto=all(*|myhand) reject +auto=draw:countedamountplus1plusend controller +auto=count(type:*:opponenthand) +auto=all(*|opponenthand) reject +auto=draw:countedamountplus1plusend opponent +text=Each player discards all the cards in his or her hand, then draws that many cards minus one. +mana={2}{B} +type=Sorcery +[/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. [card] diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt index 8cb3ca733..853855c96 100644 --- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt +++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt @@ -1927,6 +1927,12 @@ mana={B} type=Sorcery [/card] [card] +name=Bulwark +text=At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand. +mana={3}{R}{R} +type=Enchantment +[/card] +[card] name=Burn at the Stake text=As an additional cost to cast Burn at the Stake, tap any number of untapped creatures you control. -- Burn at the Stake deals damage to target creature or player equal to three times the number of creatures tapped this way. mana={2}{R}{R}{R} @@ -3692,6 +3698,12 @@ power=2 toughness=3 [/card] [card] +name=Dark Deal +text=Each player discards all the cards in his or her hand, then draws that many cards minus one. +mana={2}{B} +type=Sorcery +[/card] +[card] name=Dark Impostor text={4}{B}{B}: Exile target creature and put a +1/+1 counter on Dark Impostor. -- Dark Impostor has all activated abilities of all creature cards exiled with it. mana={2}{B} @@ -3707,6 +3719,12 @@ mana={0} type=Artifact [/card] [card] +name=Dark Suspicions +text=At the beginning of each opponent's upkeep, that player loses X life, where X is the number of cards in that player's hand minus the number of cards in your hand. +mana={2}{B}{B} +type=Enchantment +[/card] +[card] name=Darkpact text=Remove Darkpact from your deck before playing if you're not playing for ante. -- You own target card in the ante. Exchange that card with the top card of your library. mana={B}{B}{B} @@ -14669,6 +14687,15 @@ power=3 toughness=2 [/card] [card] +name=Roiling Horror +text=Roiling Horror's power and toughness are each equal to your life total minus the life total of an opponent with the most life. -- Suspend X—{X}{B}{B}{B}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{B}{B}{B} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.) -- Whenever a time counter is removed from Roiling Horror while it's exiled, target player loses 1 life and you gain 1 life. +mana={3}{B}{B} +type=Creature +subtype=Horror +power=* +toughness=* +[/card] +[card] name=Roiling Waters text=Return up to two target creatures your opponents control to their owners' hands. Target player draws two cards. mana={5}{U}{U}