diff --git a/.gitattributes b/.gitattributes index 9cd56e12a6c..29726f5a17b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9151,6 +9151,7 @@ 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/Frankenstein[!!-~]1.dck -text res/quest/decks/Frankenstein[!!-~]2.dck -text res/quest/decks/Frankenstein[!!-~]3.dck -text res/quest/decks/Fred[!!-~]Flintstone[!!-~]3.dck -text diff --git a/res/quest/decks/Frankenstein 1.dck b/res/quest/decks/Frankenstein 1.dck new file mode 100644 index 00000000000..bdaa779b22b --- /dev/null +++ b/res/quest/decks/Frankenstein 1.dck @@ -0,0 +1,36 @@ +Frankenstein 1 +[general] +constructed +[main] +12 Plains +8 Forest +4 Elfhame Palace +1 Master Splicer +4 Sensor Splicer +3 Maul Splicer +1 Arcbound Bruiser +1 Battered Golem +1 Clay Statue +1 Dodecapod +1 Enatu Golem +1 Flint Golem +1 Glass Golem +1 Hexplate Golem +2 Lead Golem +1 Obsianus Golem +1 Phyrexian Hulk +2 Sparring Golem +1 Stone Golem +2 Straw Golem +1 Transguild Courier +1 Reknit +1 Bee Sting +1 Deglamer +1 Fog +1 Wing Snare +1 Topple +1 Reciprocate +1 Terashi's Verdict +1 Shieldmate's Blessing +1 Sacred Nectar +[sideboard] diff --git a/res/quest/decks/quest7.dck b/res/quest/decks/quest7.dck index e33eb89fbc2..7a2a715b6d5 100644 --- a/res/quest/decks/quest7.dck +++ b/res/quest/decks/quest7.dck @@ -2,37 +2,38 @@ quest7 [general] constructed [main] -2 Plateau -2 Aven Riftwatcher -2 Taiga -1 Mox Emerald -1 Ancestral Recall -2 Beacon of Unrest -2 Angel of Mercy -4 Scrubland -1 Nath of the Gilt-Leaf -2 Reya Dawnbringer -1 Mox Pearl -1 Liliana Vess -1 Demonic Tutor -1 Mox Jet -4 Savannah -1 Doran, the Siege Tower -2 Jungle Shrine -4 Birds of Paradise -2 Eternal Witness -1 Elspeth, Knight-Errant -1 Mox Sapphire -1 Timetwister -4 Darksteel Ingot -2 Yore-Tiller Nephilim -1 Visara the Dreadful -1 Mox Ruby -2 Sensei's Divining Top -2 Angel of Despair -2 Volcanic Island -4 Mox Diamond -3 Delirium Skeins -1 Magus of the Disk -1 Godsire +4 Glimmervoid +4 Reflecting Pool +4 Rupture Spire +4 Undiscovered Paradise +4 Grand Coliseum +1 Tendo Ice Bridge +1 Vivid Crag +1 Vivid Creek +1 Vivid Grove +1 Vivid Marsh +1 Vivid Meadow +4 Manalith +2 Bant Sureblade +2 Esper Stormblade +2 Grixis Grimblade +2 Jund Hackblade +2 Naya Hushblade +1 Gloryscale Viashino +4 Knight of New Alara +1 Dune-Brood Nephilim +1 Glint-Eye Nephilim +1 Witch-Maw Nephilim +1 Yore-Tiller Nephilim +1 Transguild Courier +1 Defiler of Souls +1 Cromat +3 Fusion Elemental +1 Genju of the Realm +1 Horde of Notions +1 Progenitus +2 Blessing of the Nephilim +2 Dragon Arch +1 Conflux +1 Maelstrom Nexus [sideboard] diff --git a/res/quest/easy.txt b/res/quest/easy.txt index 488ff454479..425ea898de8 100644 --- a/res/quest/easy.txt +++ b/res/quest/easy.txt @@ -16,6 +16,7 @@ Doc Holiday 1 Elrond 1 Fat Albert 1 Fin Fang Foom 1 +Frankenstein 1 Frodo 1 Galahad 1 Genghis Khan 1 diff --git a/src/main/java/forge/quest/data/QuestUtil.java b/src/main/java/forge/quest/data/QuestUtil.java index 411647d3d87..1ae4c38a18f 100644 --- a/src/main/java/forge/quest/data/QuestUtil.java +++ b/src/main/java/forge/quest/data/QuestUtil.java @@ -152,15 +152,8 @@ public class QuestUtil { qa.setCardRewardList(pack.generateCards(cards, 3, Constant.Rarity.Rare, Constant.Color.Colorless)); } else if (id == 7) //Gold Dungeon { - CardList humanList = new CardList(); - Card c = AllZone.getCardFactory().getCard("Trailblazer's Boots", AllZone.getHumanPlayer()); - - c.setCurSetCode(c.getMostRecentSet()); - c.setImageFilename(CardUtil.buildFilename(c)); - - humanList.add(c); - - qa.setHuman(humanList); + qa.addCompy("Darksteel Ingot"); + qa.setCardRewardList(pack.generateCards(cards, 3, Constant.Rarity.Rare, "Multicolor")); } else if (id == 8) { CardList humanList = new CardList(); diff --git a/src/main/java/forge/quest/gui/main/QuestBattle.java b/src/main/java/forge/quest/gui/main/QuestBattle.java index 163e8ef6196..32335d5fe83 100644 --- a/src/main/java/forge/quest/gui/main/QuestBattle.java +++ b/src/main/java/forge/quest/gui/main/QuestBattle.java @@ -157,6 +157,7 @@ public class QuestBattle extends QuestSelectablePanel { 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("Frankenstein 1", "easy", "WG Golem deck with several Splicers"); addToDeckList("Frankenstein 2", "medium", "WU Golem deck with several Splicers"); addToDeckList("Frankenstein 3", "hard", "WUG Golem deck with several Splicers"); addToDeckList("Fred Flintstone 3", "hard", "WUG deck with Phytohydra and Lorescale Coatl");