From 2817925f0d1722464135958a51cf8f24b7af4359 Mon Sep 17 00:00:00 2001 From: Psyyringe Date: Fri, 27 Nov 2009 07:09:06 +0000 Subject: [PATCH] Psyringe - Added Goblin Lackey (USG) and 4 scripts to test its functionality. Also improved the test script for the Spirit Link bug (issue 173) a bit. --- projects/mtg/bin/Res/sets/USG/_cards.dat | 12 +++++++++ projects/mtg/bin/Res/sets/USG/todo.dat | 11 -------- projects/mtg/bin/Res/test/_tests.txt | 4 +++ .../bin/Res/test/bugs/spirit_link_i173.txt | 16 ++++++------ projects/mtg/bin/Res/test/goblin_lackey1.txt | 23 +++++++++++++++++ projects/mtg/bin/Res/test/goblin_lackey2.txt | 23 +++++++++++++++++ projects/mtg/bin/Res/test/goblin_lackey3.txt | 24 ++++++++++++++++++ projects/mtg/bin/Res/test/goblin_lackey4.txt | 25 +++++++++++++++++++ 8 files changed, 119 insertions(+), 19 deletions(-) create mode 100644 projects/mtg/bin/Res/test/goblin_lackey1.txt create mode 100644 projects/mtg/bin/Res/test/goblin_lackey2.txt create mode 100644 projects/mtg/bin/Res/test/goblin_lackey3.txt create mode 100644 projects/mtg/bin/Res/test/goblin_lackey4.txt diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat index 71762242c..b865b0a3c 100644 --- a/projects/mtg/bin/Res/sets/USG/_cards.dat +++ b/projects/mtg/bin/Res/sets/USG/_cards.dat @@ -541,6 +541,18 @@ type=Enchantment mana={1}{W}{W} [/card] [card] +text=Whenever Goblin Lackey deals damage to a player, you may put a Goblin permanent card from your hand into play. +auto=@damaged(player) from(this):may moveTo(myBattlefield) target(goblin[-instant;-sorcery]|myHand) +id=9851 +name=Goblin Lackey +rarity=U +type=Creature +mana={R} +power=1 +subtype=Goblin +toughness=1 +[/card] +[card] text=When Goblin Matron enters the battlefield, you may search your library for a Goblin card, reveal that card, and put it into your hand. If you do, shuffle your library. auto=may moveTo(myHand) target(goblin|myLibrary) id=8824 diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat index 77cc2eaf0..d6624e100 100644 --- a/projects/mtg/bin/Res/sets/USG/todo.dat +++ b/projects/mtg/bin/Res/sets/USG/todo.dat @@ -638,17 +638,6 @@ subtype=Goblin toughness=1 [/card] [card] -text=Whenever Goblin Lackey deals damage to a player, you may put a Goblin permanent card from your hand into play. -id=9851 -name=Goblin Lackey -rarity=U -type=Creature -mana={R} -power=1 -subtype=Goblin -toughness=1 -[/card] -[card] text=Echo {R} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.) id=5653 name=Goblin Patrol diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 3b50a2047..e0c51e12a 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -171,6 +171,10 @@ gnarled_effigy.txt goblin_balloon_brigade.txt goblin_balloon_brigade2.txt goblin_king.txt +goblin_lackey1.txt +goblin_lackey2.txt +goblin_lackey3.txt +goblin_lackey4.txt goblin_offensive.txt gravedigger.txt hannas_custody.txt diff --git a/projects/mtg/bin/Res/test/bugs/spirit_link_i173.txt b/projects/mtg/bin/Res/test/bugs/spirit_link_i173.txt index 32d352f79..45644d16f 100644 --- a/projects/mtg/bin/Res/test/bugs/spirit_link_i173.txt +++ b/projects/mtg/bin/Res/test/bugs/spirit_link_i173.txt @@ -6,26 +6,26 @@ [INIT] firstmain [PLAYER1] -inplay:Armored Pegasus +inplay:Giant Spider hand:Spirit Link manapool:{W} [PLAYER2] -inplay:Courier Hawk +inplay:Giant Mantis [DO] Spirit Link -Courier Hawk +Giant Mantis next next -Armored Pegasus +Giant Spider next -Courier Hawk +Giant Mantis next next [ASSERT] combatend [PLAYER1] -inplay:Armored Pegasus,Spirit Link -life:21 +inplay:Giant Spider,Spirit Link +life:22 [PLAYER2] -inplay:Courier Hawk +inplay:Giant Mantis [END] diff --git a/projects/mtg/bin/Res/test/goblin_lackey1.txt b/projects/mtg/bin/Res/test/goblin_lackey1.txt new file mode 100644 index 000000000..b39e9a2c3 --- /dev/null +++ b/projects/mtg/bin/Res/test/goblin_lackey1.txt @@ -0,0 +1,23 @@ +#NAME: Goblin Lackey 1 +#DESC: Verifies that Goblin Lackey can +#DESC: put a goblin from your hand into +#DESC: play (after damaging a player). +[INIT] +combatattackers +[PLAYER1] +inplay:Goblin Lackey +hand:Raging Goblin +[PLAYER2] +[DO] +Goblin Lackey +next +next +choice 0 +Raging Goblin +[ASSERT] +combatdamage +[PLAYER1] +inplay:Goblin Lackey,Raging Goblin +[PLAYER2] +life:19 +[END] diff --git a/projects/mtg/bin/Res/test/goblin_lackey2.txt b/projects/mtg/bin/Res/test/goblin_lackey2.txt new file mode 100644 index 000000000..2b2819fae --- /dev/null +++ b/projects/mtg/bin/Res/test/goblin_lackey2.txt @@ -0,0 +1,23 @@ +#NAME: Goblin Lackey 2 +#DESC: Verifies that Goblin Lackey can +#DESC: put a goblin artifact from your +#DESC: hand into play. +[INIT] +combatattackers +[PLAYER1] +inplay:Goblin Lackey +hand:Goblin Replica +[PLAYER2] +[DO] +Goblin Lackey +next +next +choice 0 +Goblin Replica +[ASSERT] +combatdamage +[PLAYER1] +inplay:Goblin Lackey,Goblin Replica +[PLAYER2] +life:19 +[END] diff --git a/projects/mtg/bin/Res/test/goblin_lackey3.txt b/projects/mtg/bin/Res/test/goblin_lackey3.txt new file mode 100644 index 000000000..b997c5eb9 --- /dev/null +++ b/projects/mtg/bin/Res/test/goblin_lackey3.txt @@ -0,0 +1,24 @@ +#NAME: Goblin Lackey 1 +#DESC: Verifies that Goblin Lackey can +#DESC: *not* put a non-goblin card into +#DESC: play. +[INIT] +combatattackers +[PLAYER1] +inplay:Goblin Lackey +hand:Grizzly Bears +[PLAYER2] +[DO] +Goblin Lackey +next +next +choice 0 +Grizzly Bears +[ASSERT] +combatdamage +[PLAYER1] +inplay:Goblin Lackey +hand:Grizzly Bears +[PLAYER2] +life:19 +[END] diff --git a/projects/mtg/bin/Res/test/goblin_lackey4.txt b/projects/mtg/bin/Res/test/goblin_lackey4.txt new file mode 100644 index 000000000..4e37578a3 --- /dev/null +++ b/projects/mtg/bin/Res/test/goblin_lackey4.txt @@ -0,0 +1,25 @@ +#NAME: Goblin Lackey 2 +#DESC: Verifies that Goblin Lackey can +#DESC: *not* put a non-permanent goblin +#DESC: card into play (tested with Tarfire, +#DESC: a Goblin Tribal Instant). +[INIT] +combatattackers +[PLAYER1] +inplay:Goblin Lackey +hand:Tarfire +[PLAYER2] +[DO] +Goblin Lackey +next +next +choice 0 +Tarfire +[ASSERT] +combatdamage +[PLAYER1] +inplay:Goblin Lackey +hand:Tarfire +[PLAYER2] +life:19 +[END]