From a1bd3fd268b6fbcfacd9e39c48c302c392a14a4b Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 05:26:19 +0000 Subject: [PATCH] Added Merchant Ship, Sire of the Storm, Kingfisher, Merfolk Seer and Surveilling Sprite. Added the deck that should have been in the last revision. --- .gitattributes | 1 + res/card-pictures.txt | 7 ++++++- res/cards.txt | 40 ++++++++++++++++++++++++++++++++++++ res/common.txt | 3 +++ res/quest/common.txt | 3 +++ res/quest/decks/Endora 2.dck | 36 ++++++++++++++++++++++++++++++++ res/quest/uncommon.txt | 2 ++ res/uncommon.txt | 2 ++ 8 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 res/quest/decks/Endora 2.dck diff --git a/.gitattributes b/.gitattributes index 280e683f5df..13f90b85520 100644 --- a/.gitattributes +++ b/.gitattributes @@ -173,6 +173,7 @@ res/quest/decks/Doc[!!-~]Holiday[!!-~]2.dck -text res/quest/decks/Doc[!!-~]Holiday[!!-~]3.dck -text res/quest/decks/Dr[!!-~]No[!!-~]3.dck -text res/quest/decks/Electro[!!-~]3.dck -text +res/quest/decks/Endora[!!-~]2.dck -text res/quest/decks/Endora[!!-~]3.dck -text res/quest/decks/Fat[!!-~]Albert[!!-~]1.dck -text res/quest/decks/Fat[!!-~]Albert[!!-~]2.dck -text diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 8080f0a0033..2589e8efbd6 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,7 +38,12 @@ snow_covered_mountain.jpg http://www.wizards.com/global/images/magic/gene snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg -brass_gnat.jpg http://www.wizards.com/global/images/magic/general/brass_gnat.jpg +surveilling_sprite.jpg http://www.wizards.com/global/images/magic/general/surveilling_sprite.jpg +merfolk_seer.jpg http://www.wizards.com/global/images/magic/general/merfolk_seer.jpg +kingfisher.jpg http://www.wizards.com/global/images/magic/general/kingfisher.jpg +sire_of_the_storm.jpg http://www.wizards.com/global/images/magic/general/sire_of_the_storm.jpg +merchant_ship.jpg http://www.wizards.com/global/images/magic/general/merchant_ship.jpg +brass_gnat.jpg http://www.wizards.com/global/images/magic/general/brass_gnat.jpg brass_man.jpg http://www.wizards.com/global/images/magic/general/brass_man.jpg goblin_dirigible.jpg http://www.wizards.com/global/images/magic/general/goblin_dirigible.jpg ajanis_mantra.jpg http://www.wizards.com/global/images/magic/general/ajanis_mantra.jpg diff --git a/res/cards.txt b/res/cards.txt index b46ecd9a279..711cc491821 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,43 @@ +Sire of the Storm +4 U U +Creature Spirit +no text +3/3 +Flying +WheneverKeyword:CastSpell/Controller:OneTypeOfMany/Arcane/Spirit:Play:DrawCards/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever you cast a Spirit or Arcane spell, you may draw a card. + +Merchant Ship +U +Creature Human +no text +0/2 +CARDNAME can't attack unless defending player controls an Island. +When you control no Islands, sacrifice CARDNAME. +WheneverKeyword:isUnblocked:Self:Play:ModifyLife/2:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:Whenever Merchant Ship attacks and isn't blocked, you gain 2 life. + +Surveilling Sprite +1 U +Creature Faerie Rogue +no text +1/1 +Flying +WheneverKeyword:PermanentIntoGraveyard:Self:Graveyard:DrawCards/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:When Surveilling Sprite is put into a graveyard from the battlefield, you may draw a card. + +Merfolk Seer +2 U +Creature Merfolk Wizard +no text +2/2 +WheneverKeyword:PermanentIntoGraveyard:Self:Graveyard:DrawCards/1:ControllingPlayer_Self:ASAP:PayMana/1 U:No Special Condition:When Merfolk Seer is put into a graveyard from the battlefield, you may pay {1}{U}. If you do, draw a card. + +Kingfisher +3 U +Creature Bird +no text +2/2 +Flying +WheneverKeyword:PermanentIntoGraveyard:Self:Graveyard:DrawCards/1:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Kingfisher is put into a graveyard from the battlefield, draw a card. + Brass Gnat 1 Artifact Creature Insect diff --git a/res/common.txt b/res/common.txt index 0a97b67693c..a123ad43227 100644 --- a/res/common.txt +++ b/res/common.txt @@ -735,6 +735,7 @@ Khalni Garden Khalni Heart Expedition Kindle Kindled Fury +Kingfisher Kird Ape Kitesail Kitsune Blademaster @@ -842,6 +843,7 @@ Meng Huo's Horde Merchant of Secrets Merfolk Looter Merfolk of the Pearl Trident +Merfolk Seer Merrow Levitator Mesa Falcon Metallic Sliver @@ -1354,6 +1356,7 @@ Surging Flame Surging Might Surging Sentinels Surrakar Marauder +Surveilling Sprite Swamp Mosquito Sylvan Bounty Sylvan Ranger diff --git a/res/quest/common.txt b/res/quest/common.txt index 0a97b67693c..a123ad43227 100644 --- a/res/quest/common.txt +++ b/res/quest/common.txt @@ -735,6 +735,7 @@ Khalni Garden Khalni Heart Expedition Kindle Kindled Fury +Kingfisher Kird Ape Kitesail Kitsune Blademaster @@ -842,6 +843,7 @@ Meng Huo's Horde Merchant of Secrets Merfolk Looter Merfolk of the Pearl Trident +Merfolk Seer Merrow Levitator Mesa Falcon Metallic Sliver @@ -1354,6 +1356,7 @@ Surging Flame Surging Might Surging Sentinels Surrakar Marauder +Surveilling Sprite Swamp Mosquito Sylvan Bounty Sylvan Ranger diff --git a/res/quest/decks/Endora 2.dck b/res/quest/decks/Endora 2.dck new file mode 100644 index 00000000000..87157cebbda --- /dev/null +++ b/res/quest/decks/Endora 2.dck @@ -0,0 +1,36 @@ +Endora 2 +[general] +constructed +[main] +1 Femeref Enchantress +1 Hoofprints of the Stag +1 Privileged Position +1 Seal of Cleansing +2 Verduran Enchantress +1 Ajani's Mantra +4 Savannah +3 Ghostly Prison +4 Enchantress's Presence +1 Honden of Cleansing Fire +1 Journey to Nowhere +1 Kismet +4 Oblivion Ring +7 Plains +4 Graypelt Refuge +1 Centaur Glade +2 Argothian Enchantress +1 Seal of Primordium +7 Forest +1 Yavimaya Enchantress +2 Mesa Enchantress +1 Sigil of the Empty Throne +1 Awakening Zone +1 Mana Matrix +1 Honden of Life's Web +1 Lucent Liminid +1 Caribou Range +1 Convalescent Care +1 Bound in Silence +1 Pacifism +1 Guard Duty +[sideboard] diff --git a/res/quest/uncommon.txt b/res/quest/uncommon.txt index 868f5180c68..8ee77e82562 100644 --- a/res/quest/uncommon.txt +++ b/res/quest/uncommon.txt @@ -537,6 +537,7 @@ Marisi's Twinclaws Mask of Riddles Megrim Melesse Spirit +Merchant Ship Merrow Harbinger Messenger Falcons Might Sliver @@ -739,6 +740,7 @@ Silkenfist Order Silver Erne Silver Knight Sir Shandlar of Eberyn +Sire of the Storm Sivitri Scarzam Skarrg, the Rage Pits Skeletal Wurm diff --git a/res/uncommon.txt b/res/uncommon.txt index 868f5180c68..8ee77e82562 100644 --- a/res/uncommon.txt +++ b/res/uncommon.txt @@ -537,6 +537,7 @@ Marisi's Twinclaws Mask of Riddles Megrim Melesse Spirit +Merchant Ship Merrow Harbinger Messenger Falcons Might Sliver @@ -739,6 +740,7 @@ Silkenfist Order Silver Erne Silver Knight Sir Shandlar of Eberyn +Sire of the Storm Sivitri Scarzam Skarrg, the Rage Pits Skeletal Wurm