From d67701a3b022d5fd32ffb3cd40c90a0272fa96fd Mon Sep 17 00:00:00 2001 From: "solo81@web.de" Date: Sat, 28 Aug 2010 22:11:57 +0000 Subject: [PATCH] Added 7 successfully tested cards based on rev2209 (bloodthirst). Added 1 test for creatures with Bloodthirst. Removed 1 test (Tolsimir Wolfblood: This was related to a Voja workaround, which does not exist anymore!). --- projects/mtg/bin/Res/sets/mtg_todo.dat | 63 --------------- projects/mtg/bin/Res/sets/primitives/mtg.txt | 77 ++++++++++++++++++- projects/mtg/bin/Res/test/_tests.txt | 1 + .../mtg/bin/Res/test/bloodscale_prowler.txt | 32 ++++++++ .../mtg/bin/Res/test/tolsimir_wolfblood.txt | 29 ------- 5 files changed, 109 insertions(+), 93 deletions(-) create mode 100644 projects/mtg/bin/Res/test/bloodscale_prowler.txt delete mode 100644 projects/mtg/bin/Res/test/tolsimir_wolfblood.txt diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat index ef8e48952..a0456bcb6 100644 --- a/projects/mtg/bin/Res/sets/mtg_todo.dat +++ b/projects/mtg/bin/Res/sets/mtg_todo.dat @@ -3116,15 +3116,6 @@ power=1 toughness=1 [/card] [card] -name=Bloodscale Prowler -text=Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) -mana={2}{R} -type=Creature -subtype=Viashino Warrior -power=3 -toughness=1 -[/card] -[card] name=Bloodscent text=All creatures able to block target creature this turn do so. mana={3}{G} @@ -12799,15 +12790,6 @@ mana={X}{R} type=Sorcery [/card] [card] -name=Ghor-Clan Savage -text=Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.) -mana={3}{G}{G} -type=Creature -subtype=Centaur Berserker -power=2 -toughness=3 -[/card] -[card] name=Ghost Council of Orzhova text=When Ghost Council of Orzhova enters the battlefield, target opponent loses 1 life and you gain 1 life. -- {1}, Sacrifice a creature: Exile Ghost Council of Orzhova. Return it to the battlefield under its owner's control at the beginning of the next end step. mana={W}{W}{B}{B} @@ -14303,15 +14285,6 @@ mana={4}{R}{R} type=Enchantment [/card] [card] -name=Gristleback -text=Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) -- Sacrifice Gristleback: You gain life equal to Gristleback's power. -mana={2}{G} -type=Creature -subtype=Boar Beast -power=2 -toughness=2 -[/card] -[card] name=Grixis Grimblade text=As long as you control another multicolored permanent, Grixis Grimblade gets +1/+1 and has deathtouch. (Creatures dealt damage by this creature are destroyed. You can divide its combat damage among any of the creatures blocking or blocked by it.) mana={UR}{B} @@ -25051,15 +25024,6 @@ type=Enchantment subtype=Aura [/card] [card] -name=Petrified Wood-Kin -text=Petrified Wood-Kin can't be countered. -- Bloodthirst X (This creature enters the battlefield with X +1/+1 counters on it, where X is the damage dealt to your opponents this turn.) -- Protection from instants -mana={6}{G} -type=Creature -subtype=Elemental Warrior -power=3 -toughness=3 -[/card] -[card] name=Phage the Untouchable text=When Phage the Untouchable enters the battlefield, if you didn't cast it from your hand, you lose the game. -- Whenever Phage deals combat damage to a creature, destroy that creature. It can't be regenerated. -- Whenever Phage deals combat damage to a player, that player loses the game. mana={3}{B}{B}{B}{B} @@ -26927,15 +26891,6 @@ power=5 toughness=4 [/card] [card] -name=Rabble-Rouser -text=Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) -- {R}, {T}: Attacking creatures get +X/+0 until end of turn, where X is Rabble-Rouser's power. -mana={3}{R} -type=Creature -subtype=Goblin Shaman -power=1 -toughness=1 -[/card] -[card] name=Rabid Wombat text=Vigilance -- Rabid Wombat gets +2/+2 for each Aura attached to it. mana={2}{G}{G} @@ -29805,15 +29760,6 @@ power=1 toughness=1 [/card] [card] -name=Scab-Clan Mauler -text=Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.) -- Trample -mana={R}{G} -type=Creature -subtype=Human Berserker -power=1 -toughness=1 -[/card] -[card] name=Scald text=Whenever a player taps an Island for mana, Scald deals 1 damage to that player. mana={1}{R} @@ -31598,15 +31544,6 @@ power=1 toughness=1 [/card] [card] -name=Skarrgan Skybreaker -text=Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.) -- {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to target creature or player. -mana={4}{R}{R}{G} -type=Creature -subtype=Giant Shaman -power=3 -toughness=3 -[/card] -[card] name=Skeletal Changeling text=Changeling (This card is every creature type at all times.) -- {1}{B}: Regenerate Skeletal Changeling. mana={1}{B} diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index 99545ddb3..92bdd7ac1 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -5138,6 +5138,16 @@ power=3 toughness=3 [/card] [card] +name=Bloodscale Prowler +auto=bloodthirst:1 +text=Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) +mana={2}{R} +type=Creature +subtype=Viashino Warrior +power=3 +toughness=1 +[/card] +[card] name=Bloodshed Fever target=creature auto=mustattack @@ -14167,7 +14177,7 @@ toughness=5 [card] name=Elvish Archdruid auto=lord(elf|myBattlefield) 1/1 other -auto={T}:foreach(elf|myBattlefield) add{G} +auto={T}:foreach(elf|mybattlefield) add{G} text=Other Elf creatures you control get +1/+1. -- {T}: Add {G} to your mana pool for each Elf you control. mana={1}{G}{G} type=Creature @@ -14186,6 +14196,17 @@ power=2 toughness=1 [/card] [card] +name=Rabble-Rouser +auto=bloodthirst:1 +auto={R}{T}:thisforeach(power>=1) 1/0 all(creature[attacking]|mybattlefield) +text=Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) -- {R}, {T}: Attacking creatures get +X/+0 until end of turn, where X is Rabble-Rouser's power. +mana={3}{R} +type=Creature +subtype=Goblin Shaman +power=1 +toughness=1 +[/card] +[card] name=Elvish Berserker auto=rampage(1/1,0) text=Whenever Elvish Berserker becomes blocked, it gets +1/+1 until end of turn for each creature blocking it. @@ -18462,6 +18483,16 @@ power=2 toughness=1 [/card] [card] +name=Ghor-Clan Savage +auto=bloodthirst:3 +text=Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.) +mana={3}{G}{G} +type=Creature +subtype=Centaur Berserker +power=2 +toughness=3 +[/card] +[card] name=Ghost Ship abilities=flying auto={U}{U}{U}:regenerate @@ -20535,6 +20566,17 @@ power=3 toughness=3 [/card] [card] +name=Gristleback +auto=bloodthirst:1 +auto={S}:thisforeach(power>=1) life:1 controller +text=Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.) -- Sacrifice Gristleback: You gain life equal to Gristleback's power. +mana={2}{G} +type=Creature +subtype=Boar Beast +power=2 +toughness=2 +[/card] +[card] name=Grixis Battlemage auto={U}{T}:token(-1111123) && draw:1 auto={R}{T}:cantblock target(creature) @@ -34826,6 +34868,18 @@ text={T}: Add {1} to your mana pool. -- {T}, Sacrifice Petrified Field: Return t type=Land [/card] [card] +name=Petrified Wood-Kin +abilities=nofizzle +auto=protection from(instant) +auto=counter(1/1,odcount) +text=Petrified Wood-Kin can't be countered. -- Bloodthirst X (This creature enters the battlefield with X +1/+1 counters on it, where X is the damage dealt to your opponents this turn.) -- Protection from instants +mana={6}{G} +type=Creature +subtype=Elemental Warrior +power=3 +toughness=3 +[/card] +[card] name=Pewter Golem auto={1}{B}:regenerate text={1}{B}: Regenerate Pewter Golem. @@ -40281,6 +40335,16 @@ text=Scabland enters the battlefield tapped. -- {T}: Add {1} to your mana pool. type=Land [/card] [card] +name=Scab-Clan Mauler +auto=bloodthirst:2 +text=Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.) -- Trample +mana={R}{G} +type=Creature +subtype=Human Berserker +power=1 +toughness=1 +[/card] +[card] name=Scalding Tarn auto={L}{T}{S}:moveTo(myBattlefield) target(island,mountain|mylibrary) text={T}, Pay 1 life, Sacrifice Scalding Tarn: Search your library for an Island or Mountain card and put it onto the battlefield. Then shuffle your library. @@ -43041,6 +43105,17 @@ text={T}: Add {1} to your mana pool. -- {R}{G}, {T}: Target creature gets +1/+1 type=Land [/card] [card] +name=Skarrgan Skybreaker +auto=bloodthirst:3 +auto={1}{S}:thisforeach(power>=1) damage:1 target(creature,player) +text=Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.) -- {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to target creature or player. +mana={4}{R}{R}{G} +type=Creature +subtype=Giant Shaman +power=3 +toughness=3 +[/card] +[card] name=Skeletal Crocodile mana={3}{B} type=Creature diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 004decd15..6d6976911 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -140,6 +140,7 @@ bloated_toad1.txt bloated_toad2.txt bloodfire_colossus.txt bloodhall_ooze.txt +bloodscale_prowler.txt body_double.txt boggart_arsonists.txt borderland_behemoth.txt diff --git a/projects/mtg/bin/Res/test/bloodscale_prowler.txt b/projects/mtg/bin/Res/test/bloodscale_prowler.txt new file mode 100644 index 000000000..1bbb53965 --- /dev/null +++ b/projects/mtg/bin/Res/test/bloodscale_prowler.txt @@ -0,0 +1,32 @@ +#Testing Bloodthirst keyword. +[INIT] +FIRSTMAIN +[PLAYER1] +hand:lightning bolt,bloodscale prowler +manapool:{2}{R}{R} +inplay:fervor +[PLAYER2] +[DO] +lightning bolt +p2 +bloodscale prowler +next +#begin +next +#attackers +bloodscale prowler +next +#blockers +next +#damage +next +#end combat +[ASSERT] +COMBATEND +[PLAYER1] +life:20 +inplay:fervor,bloodscale prowler +graveyard:lightning bolt +[PLAYER2] +life:13 +[END] \ No newline at end of file diff --git a/projects/mtg/bin/Res/test/tolsimir_wolfblood.txt b/projects/mtg/bin/Res/test/tolsimir_wolfblood.txt deleted file mode 100644 index e8891fc10..000000000 --- a/projects/mtg/bin/Res/test/tolsimir_wolfblood.txt +++ /dev/null @@ -1,29 +0,0 @@ -#testing ledgendary token + multicolour via manacost. -[INIT] -FIRSTMAIN -[PLAYER1] -inplay:Tolsimir Wolfblood -[PLAYER2] -[DO] -Tolsimir Wolfblood -eot -eot -next -next -next -next -next -Voja -next -next -next -Tolsimir Wolfblood -next -next -[ASSERT] -endofturn -[PLAYER1] -inplay:Tolsimir Wolfblood -[PLAYER2] -life:16 -[END] \ No newline at end of file