diff --git a/.gitattributes b/.gitattributes index a2cfa8210c2..4c58696a976 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6818,7 +6818,7 @@ res/cardsfolder/stonework_puma.txt -text svneol=native#text/plain res/cardsfolder/stonybrook_angler.txt -text svneol=native#text/plain res/cardsfolder/stonybrook_banneret.txt -text svneol=native#text/plain res/cardsfolder/stonybrook_schoolmaster.txt -text svneol=native#text/plain -res/cardsfolder/storm_cauldron.txt svneol=native#text/plain +res/cardsfolder/storm_cauldron.txt -text svneol=native#text/plain res/cardsfolder/storm_crow.txt -text svneol=native#text/plain res/cardsfolder/storm_elemental.txt svneol=native#text/plain res/cardsfolder/storm_entity.txt -text svneol=native#text/plain @@ -8455,6 +8455,7 @@ res/quest/decks/Ezio[!!-~]3.dck -text res/quest/decks/Fat[!!-~]Albert[!!-~]1.dck -text res/quest/decks/Fat[!!-~]Albert[!!-~]2.dck -text res/quest/decks/Fat[!!-~]Albert[!!-~]3.dck -text +res/quest/decks/Fin[!!-~]Fang[!!-~]Foom[!!-~]1.dck -text res/quest/decks/Fin[!!-~]Fang[!!-~]Foom[!!-~]2.dck -text res/quest/decks/Fin[!!-~]Fang[!!-~]Foom[!!-~]3.dck -text res/quest/decks/Fred[!!-~]Flintstone[!!-~]3.dck -text diff --git a/res/cardsfolder/storm_cauldron.txt b/res/cardsfolder/storm_cauldron.txt index 8f89fd9d074..cbfdffcd731 100644 --- a/res/cardsfolder/storm_cauldron.txt +++ b/res/cardsfolder/storm_cauldron.txt @@ -1,13 +1,13 @@ -Name:Storm Cauldron -ManaCost:5 -Types:Artifact -Text:Each player may play an additional land during each of his or her turns. -T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ Whenever a land is tapped for mana, return it to its owner's hand. -SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredCard -SVar:RemAIDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_cauldron.jpg -SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/314.jpg -SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/179.jpg -SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/320.jpg +Name:Storm Cauldron +ManaCost:5 +Types:Artifact +Text:Each player may play an additional land during each of his or her turns. +T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ Whenever a land is tapped for mana, return it to its owner's hand. +SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredCard +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_cauldron.jpg +SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/314.jpg +SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/179.jpg +SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/320.jpg End \ No newline at end of file diff --git a/res/quest/decks/Fin Fang Foom 1.dck b/res/quest/decks/Fin Fang Foom 1.dck new file mode 100644 index 00000000000..b1f1c33be07 --- /dev/null +++ b/res/quest/decks/Fin Fang Foom 1.dck @@ -0,0 +1,23 @@ +Fin Fang Foom 1 +[general] +constructed +[main] +24 Forest|MBS +2 Beast Hunt|ZEN +2 Naturalize|M11 +2 Glistener Elf|NPH +2 Virulent Sliver +2 Pistus Strike|MBS +2 Plague Myr|MBS +2 Blight Mamba|SOM +2 Viridian Corrupter|MBS +2 Rot Wolf|MBS +2 Cystbearer|SOM +3 Phyrexian Digester +4 Marsh Viper +4 Carrion Call|SOM +2 Blightwidow|MBS +2 Tel-Jilad Fallen +1 Corpse Cur +1 Serpent Generator +[sideboard] \ No newline at end of file diff --git a/res/quest/easy.txt b/res/quest/easy.txt index 427fbb75204..3feb3140479 100644 --- a/res/quest/easy.txt +++ b/res/quest/easy.txt @@ -11,6 +11,7 @@ Darrin Stephens 1 Doc Holiday 1 Elrond 1 Fat Albert 1 +Fin Fang Foom 1 Frodo 1 Galahad 1 Genghis Khan 1 diff --git a/src/forge/quest/gui/main/QuestBattle.java b/src/forge/quest/gui/main/QuestBattle.java index 38ace89640b..7eaa1be2396 100644 --- a/src/forge/quest/gui/main/QuestBattle.java +++ b/src/forge/quest/gui/main/QuestBattle.java @@ -133,6 +133,7 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("Fat Albert 2", "medium", "WUBRG Winter Orb deck with Keldon Warlord and mana Elves/Slivers"); addToDeckList("Fat Albert 3", "hard", "UG Winter Orb deck with Kalonian Behemoth and mana Elves/Slivers"); // addToDeckList("Fin Fang Foom 1", "easy", "B Artifact"); + addToDeckList("Fin Fang Foom 1", "easy", "Mono G Poison deck"); addToDeckList("Fin Fang Foom 2", "medium", "Mono G Infect deck"); addToDeckList("Fin Fang Foom 3", "hard", "GB Infect deck"); addToDeckList("Fred Flintstone 3", "hard", "WUG deck with Phytohydra and Lorescale Coatl");