From 22c8ef7760fcc03de5b9c6413b2c0c921e79a24c Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 22:05:26 +0000 Subject: [PATCH] - Removed 8 quest opponent decks and these will not be considered for inclusion at a later date. --- .gitattributes | 8 ------- res/quest/decks/Flash 2.dck | 25 ------------------- res/quest/decks/Gunslinger 2.dck | 19 --------------- res/quest/decks/Jay Flash 3.dck | 18 -------------- res/quest/decks/Krypto 2.dck | 29 ----------------------- res/quest/decks/Lex 2.dck | 20 ---------------- res/quest/decks/Red Skull 3.dck | 21 ---------------- res/quest/decks/Shelob 2.dck | 23 ------------------ res/quest/decks/Werewolf 3.dck | 23 ------------------ res/quest/hard.txt | 3 --- res/quest/medium.txt | 5 ---- src/forge/Gui_Quest_Deck_Info.java | 8 ------- src/forge/quest/gui/main/QuestBattle.java | 8 ------- 13 files changed, 210 deletions(-) delete mode 100755 res/quest/decks/Flash 2.dck delete mode 100755 res/quest/decks/Gunslinger 2.dck delete mode 100755 res/quest/decks/Jay Flash 3.dck delete mode 100755 res/quest/decks/Krypto 2.dck delete mode 100755 res/quest/decks/Lex 2.dck delete mode 100755 res/quest/decks/Red Skull 3.dck delete mode 100755 res/quest/decks/Shelob 2.dck delete mode 100755 res/quest/decks/Werewolf 3.dck diff --git a/.gitattributes b/.gitattributes index 2f9d4cc85a8..c046edca836 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7985,7 +7985,6 @@ 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/Flash[!!-~]2.dck -text res/quest/decks/Fred[!!-~]Flintstone[!!-~]3.dck -text res/quest/decks/Frodo[!!-~]1.dck -text res/quest/decks/Frodo[!!-~]2.dck -text @@ -8014,7 +8013,6 @@ res/quest/decks/Grampa[!!-~]Simpson[!!-~]3.dck -text res/quest/decks/Green[!!-~]Arrow[!!-~]2.dck -text res/quest/decks/Green[!!-~]Arrow[!!-~]3.dck -text res/quest/decks/Green[!!-~]Lantern[!!-~]3.dck -text -res/quest/decks/Gunslinger[!!-~]2.dck -text res/quest/decks/Gunslinger[!!-~]3.dck -text res/quest/decks/Han[!!-~]Solo[!!-~]3.dck -text res/quest/decks/Hans[!!-~]2.dck -text @@ -8043,7 +8041,6 @@ res/quest/decks/James[!!-~]Bond[!!-~]2.dck -text res/quest/decks/James[!!-~]Bond[!!-~]3.dck -text res/quest/decks/James[!!-~]T[!!-~]Kirk[!!-~]3.dck -text res/quest/decks/Jason[!!-~]Todd[!!-~]3.dck -text -res/quest/decks/Jay[!!-~]Flash[!!-~]3.dck -text res/quest/decks/Joe[!!-~]Kidd[!!-~]1.dck -text res/quest/decks/Joe[!!-~]Kidd[!!-~]2.dck -text res/quest/decks/Joe[!!-~]Kidd[!!-~]3.dck -text @@ -8064,9 +8061,7 @@ res/quest/decks/King[!!-~]Kong[!!-~]3.dck -text res/quest/decks/Kojak[!!-~]1.dck -text res/quest/decks/Kojak[!!-~]2.dck -text res/quest/decks/Kojak[!!-~]3.dck -text -res/quest/decks/Krypto[!!-~]2.dck -text res/quest/decks/Krypto[!!-~]3.dck -text -res/quest/decks/Lex[!!-~]2.dck -text res/quest/decks/Lex[!!-~]3.dck -text res/quest/decks/Link[!!-~]3.dck -text res/quest/decks/Lisa[!!-~]Simpson[!!-~]3.dck -text @@ -8112,7 +8107,6 @@ res/quest/decks/Raven[!!-~]1.dck -text res/quest/decks/Raven[!!-~]2.dck -text res/quest/decks/Raven[!!-~]3.dck -text res/quest/decks/Red[!!-~]Skull[!!-~]2.dck -text -res/quest/decks/Red[!!-~]Skull[!!-~]3.dck -text res/quest/decks/Robin[!!-~]2.dck -text res/quest/decks/Robin[!!-~]3.dck -text res/quest/decks/Rocky[!!-~]1.dck -text @@ -8135,7 +8129,6 @@ res/quest/decks/Secret[!!-~]Squirrel[!!-~]3.dck -text res/quest/decks/Sentinel[!!-~]2.dck -text res/quest/decks/Sentinel[!!-~]3.dck -text res/quest/decks/Shelob[!!-~]1.dck -text -res/quest/decks/Shelob[!!-~]2.dck -text res/quest/decks/Sherlock[!!-~]Holmes[!!-~]1.dck -text res/quest/decks/Sherlock[!!-~]Holmes[!!-~]2.dck -text res/quest/decks/Sherlock[!!-~]Holmes[!!-~]3.dck -text @@ -8172,7 +8165,6 @@ res/quest/decks/Uncle[!!-~]Owen[!!-~]3.dck -text res/quest/decks/Vampire[!!-~]2.dck -text res/quest/decks/Vampire[!!-~]3.dck -text res/quest/decks/Werewolf[!!-~]2.dck -text -res/quest/decks/Werewolf[!!-~]3.dck -text res/quest/decks/White[!!-~]Knight[!!-~]1.dck -text res/quest/decks/White[!!-~]Knight[!!-~]2.dck -text res/quest/decks/White[!!-~]Knight[!!-~]3.dck -text diff --git a/res/quest/decks/Flash 2.dck b/res/quest/decks/Flash 2.dck deleted file mode 100755 index cdebe1f44b9..00000000000 --- a/res/quest/decks/Flash 2.dck +++ /dev/null @@ -1,25 +0,0 @@ -Flash 2 -[general] -constructed -[main] -4 Izzet Signet -2 Confiscate -4 Electrolyze -4 Mana Leak -4 Remand -2 Telling Time -4 Shivan Reef -4 Steam Vents -2 Tendo Ice Bridge -4 Urza's Mine -4 Urza's Power Plant -4 Urza's Tower -4 Keiga, the Tide Star -4 Meloku the Clouded Mirror -1 Minamo, School at Water's Edge -1 Blaze -4 Compulsive Research -1 Invoke the Firemind -2 Pyroclasm -1 Tidings -[sideboard] diff --git a/res/quest/decks/Gunslinger 2.dck b/res/quest/decks/Gunslinger 2.dck deleted file mode 100755 index 4324ee44095..00000000000 --- a/res/quest/decks/Gunslinger 2.dck +++ /dev/null @@ -1,19 +0,0 @@ -Gunslinger 2 -[general] -constructed -[main] -4 Lonely Sandbar -3 Seismic Assault -3 Isochron Scepter -10 Island -4 Boomerang -4 Forgotten Cave -4 Serum Visions -4 Magma Jet -4 Condescend -4 Mana Leak -3 Trade Routes -3 Pyroclasm -3 Crucible of Worlds -7 Mountain -[sideboard] diff --git a/res/quest/decks/Jay Flash 3.dck b/res/quest/decks/Jay Flash 3.dck deleted file mode 100755 index ea4f4ae0bb2..00000000000 --- a/res/quest/decks/Jay Flash 3.dck +++ /dev/null @@ -1,18 +0,0 @@ -Jay Flash 3 -[general] -constructed -[main] -8 Mountain -8 Swamp -4 Disciple of Malice -4 Scion of Darkness -4 Undead Gladiator -4 Lightning Rift -4 Starstorm -4 Swat -4 Barren Moor -4 Forgotten Cave -4 Dirge of Dread -4 Lay Waste -4 Slice and Dice -[sideboard] diff --git a/res/quest/decks/Krypto 2.dck b/res/quest/decks/Krypto 2.dck deleted file mode 100755 index c1b28a7dc27..00000000000 --- a/res/quest/decks/Krypto 2.dck +++ /dev/null @@ -1,29 +0,0 @@ -Krypto 2 -[general] -constructed -[main] -8 Forest -4 Plains -3 Barkhide Mauler -4 Cartographer -4 Disciple of Grace -4 Krosan Tusker -2 Phantom Nishoba -2 Spike Feeder -2 Spike Weaver -2 Stoic Champion -3 Astral Slide -2 Aura of Silence -1 Invigorating Boon -2 Sterling Grove -2 Miraculous Recovery -1 Repopulate -1 Heart of Yavimaya -1 Krosan Verge -4 Secluded Steppe -4 Tranquil Thicket -1 Kamahl, Fist of Krosa -1 Karakas -1 Rath's Edge -1 Regrowth -[sideboard] diff --git a/res/quest/decks/Lex 2.dck b/res/quest/decks/Lex 2.dck deleted file mode 100755 index 28743584e90..00000000000 --- a/res/quest/decks/Lex 2.dck +++ /dev/null @@ -1,20 +0,0 @@ -Lex 2 -[general] -constructed -[main] -4 Gilder Bairn -9 Swamp -4 Silver Myr -3 Clutch of the Undercity -4 Kulrath Knight -1 Vile Requiem -4 Aquamoeba -1 Fallowsage -3 Turtleshell Changeling -3 Horobi, Death's Wail -11 Island -4 Stonybrook Angler -4 Dreadship Reef -1 Gnarled Effigy -4 Coral Reef -[sideboard] diff --git a/res/quest/decks/Red Skull 3.dck b/res/quest/decks/Red Skull 3.dck deleted file mode 100755 index cf31ddba5f8..00000000000 --- a/res/quest/decks/Red Skull 3.dck +++ /dev/null @@ -1,21 +0,0 @@ -Red Skull 3 -[general] -constructed -[main] -6 Island -4 Swamp -3 Grave Titan -3 Sea Gate Oracle -4 Spreading Seas -3 Disfigure -3 Doom Blade -4 Mana Leak -4 Creeping Tar Pit -4 Darkslick Shores -4 Drowned Catacomb -4 Tectonic Edge -2 Jace Beleren -4 Jace, the Mind Sculptor -4 Inquisition of Kozilek -4 Preordain -[sideboard] diff --git a/res/quest/decks/Shelob 2.dck b/res/quest/decks/Shelob 2.dck deleted file mode 100755 index 32fc475c004..00000000000 --- a/res/quest/decks/Shelob 2.dck +++ /dev/null @@ -1,23 +0,0 @@ -Shelob 2 -[general] -constructed -[main] -6 Island -8 Swamp -4 Cavern Harpy -3 Dimir Infiltrator -4 Enigma Eidolon -4 Entropic Eidolon -1 Gempalm Polluter -1 Marsh Crocodile -4 Stinkweed Imp -1 Undead Warchief -4 Vodalian Zombie -1 Wonder -3 Compulsion -4 Zombie Infestation -3 Clutch of the Undercity -4 Dimir Aqueduct -4 Tainted Isle -1 Unholy Grotto -[sideboard] diff --git a/res/quest/decks/Werewolf 3.dck b/res/quest/decks/Werewolf 3.dck deleted file mode 100755 index 07ab13bfd68..00000000000 --- a/res/quest/decks/Werewolf 3.dck +++ /dev/null @@ -1,23 +0,0 @@ -Werewolf 3 -[general] -constructed -[main] -3 Ratchet Bomb -5 Island -3 Swamp -3 Grave Titan -3 Sea Gate Oracle -3 Disfigure -3 Doom Blade -4 Mana Leak -2 Stoic Rebuttal -4 Creeping Tar Pit -4 Darkslick Shores -4 Drowned Catacomb -2 Misty Rainforest -4 Tectonic Edge -3 Jace Beleren -4 Jace, the Mind Sculptor -2 Duress -4 Preordain -[sideboard] diff --git a/res/quest/hard.txt b/res/quest/hard.txt index 3ac973e3779..468a5d8d8c4 100644 --- a/res/quest/hard.txt +++ b/res/quest/hard.txt @@ -69,7 +69,6 @@ Jack Sparrow 3 James Bond 3 James T Kirk 3 Jason Todd 3 -Jay Flash 3 Joe Kidd 3 Jon Stewart 3 Kang 3 @@ -107,7 +106,6 @@ R2-D2 3 Radiant 3 Ras Al Ghul 3 Raven 3 -Red Skull 3 Robin 3 Rocky 3 Rogue 3 @@ -131,7 +129,6 @@ Thugs 3 Treebeard 3 Uncle Owen 3 Vampire 3 -Werewolf 3 White Knight 3 Wilma Flintstone 3 Wolverine 3 diff --git a/res/quest/medium.txt b/res/quest/medium.txt index f38f09c36bb..bbc5b058e85 100644 --- a/res/quest/medium.txt +++ b/res/quest/medium.txt @@ -31,7 +31,6 @@ En Sabah Nur 2 Endora 2 Fat Albert 2 Fin Fang Foom 2 -Flash 2 Frodo 2 Galadriel 2 Galahad 2 @@ -42,7 +41,6 @@ Goblin King 2 Goblin Recruit 2 Grampa Simpson 2 Green Arrow 2 -Gunslinger 2 Hans 2 Harry Potter 2 Homer Simpson 2 @@ -59,8 +57,6 @@ King Arthur 2 King Edward 2 King Kong 2 Kojak 2 -Krypto 2 -Lex 2 Lucifer 2 Magnum 2 Namor 2 @@ -81,7 +77,6 @@ Sauron 2 Scotty 2 Seabiscuit 2 Sentinel 2 -Shelob 2 Sherlock Holmes 2 Spiderman 2 Spock 2 diff --git a/src/forge/Gui_Quest_Deck_Info.java b/src/forge/Gui_Quest_Deck_Info.java index e36bd7a4572..344a4f6326e 100644 --- a/src/forge/Gui_Quest_Deck_Info.java +++ b/src/forge/Gui_Quest_Deck_Info.java @@ -125,7 +125,6 @@ public class Gui_Quest_Deck_Info implements NewConstants { addToDeckList("Fin Fang Foom 1", "easy", "B Artifact"); addToDeckList("Fin Fang Foom 2", "medium", "G Infect"); addToDeckList("Fin Fang Foom 3", "hard", "GB Infect"); - addToDeckList("Flash 2", "medium", "RU Urzatron "); addToDeckList("Fred Flintstone 3", "hard", "Reasontg's Predator's Garden deck with mods, featuring Lorescale Coatl"); addToDeckList("Frodo 1", "easy", "New, Apthaven's AI Zoo Easy, some creature removal"); addToDeckList("Frodo 2", "medium", "New, Apthaven's AI Zoo Medium, some creature removal + Glorious Anthem"); @@ -155,7 +154,6 @@ public class Gui_Quest_Deck_Info implements NewConstants { addToDeckList("Green Arrow 2", "medium", "G Anti-Air"); addToDeckList("Green Arrow 3", "hard", "G Angry Large Monsters"); addToDeckList("Green Lantern 3", "hard", "Nicol Bolas, Planeswalker + threat removal and several creatures"); - addToDeckList("Gunslinger 2", "medium", "UR Trade Routes"); addToDeckList("Gunslinger 3", "hard", "WGRB Cascade"); addToDeckList("Han Solo 3", "hard", "WG enchantments deck with Sigil of the Empty Throne"); @@ -187,7 +185,6 @@ public class Gui_Quest_Deck_Info implements NewConstants { addToDeckList("James Bond 3", "hard", "gohongohon's Hard WGR Agro"); addToDeckList("James T Kirk 3", "hard", "Rares 40 card black discard deck + Liliana Vess"); addToDeckList("Jason Todd 3", "hard", "GBR Sacrifice"); - addToDeckList("Jay Flash 3", "hard", "RB Cycling"); addToDeckList("Joe Kidd 1", "easy", "Voracious Hatchling, Nightsky Mimic, no planeswalkers + a few WB spells"); addToDeckList("Joe Kidd 2", "medium", "Voracious Hatchling, Nightsky Mimic, no planeswalkers + some WB spells"); addToDeckList("Joe Kidd 3", "hard", "Voracious Hatchling, Nightsky Mimic, no planeswalkers + many WB spells"); @@ -209,10 +206,8 @@ public class Gui_Quest_Deck_Info implements NewConstants { addToDeckList("Kojak 1", "easy", "Mono blue deck with Sunken City, Inundate, counterspells and bounce"); addToDeckList("Kojak 2", "medium", "Mono blue deck with Sunken City, Inundate, counterspells and bounce"); addToDeckList("Kojak 3", "hard", "Mono blue deck with Sunken City, Inundate, counterspells and bounce"); - addToDeckList("Krypto 2", "medium", "GW Midrange"); addToDeckList("Krypto 3", "hard", "GUB Standard Constructed"); - addToDeckList("Lex 2", "medium", "UB Horobi"); addToDeckList("Lex 3", "hard", "Ninjas!"); addToDeckList("Link 3", "hard", "GUR Standard Constructed"); addToDeckList("Lisa Simpson 3", "hard", "GW deck, creates tokens which are devoured by Skullmulcher and Gluttonous Slime"); @@ -263,7 +258,6 @@ public class Gui_Quest_Deck_Info implements NewConstants { addToDeckList("Raven 2", "medium", "Birds!"); addToDeckList("Raven 3", "hard", " Possessed Birds!"); addToDeckList("Red Skull 2", "medium", "BR Metalcraft"); - addToDeckList("Red Skull 3", "hard", "UB Standard"); addToDeckList("Robin 2", "medium", "G Big Green"); addToDeckList("Robin 3", "hard", "GW Standard"); addToDeckList("Rocky 1", "easy", "Pro red, Flamebreak + Tremor + Pyroclasm but no Pyrohemia"); @@ -287,7 +281,6 @@ public class Gui_Quest_Deck_Info implements NewConstants { addToDeckList("Sentinel 2", "medium", "WB Token"); addToDeckList("Sentinel 3", "hard", "WB Token"); addToDeckList("Shelob 1", "easy", "G Reach"); - addToDeckList("Shelob 2", "medium", "UB Zombies"); addToDeckList("Sherlock Holmes 1", "easy", "Mono green deck, Baru, Fist of Krosa + land fetch + some buff cards."); addToDeckList("Sherlock Holmes 2", "medium", "Mono green deck, Baru, Fist of Krosa + lots of good green creatures."); addToDeckList("Sherlock Holmes 3", "hard", "Mono green deck, Baru, Fist of Krosa + lots of great green creatures."); @@ -328,7 +321,6 @@ public class Gui_Quest_Deck_Info implements NewConstants { addToDeckList("Vampire 3", "hard", "Vampire Constructed"); addToDeckList("Werewolf 2", "medium", "UGB Fungal Shambler"); - addToDeckList("Werewolf 3", "hard", "UB Constructed"); addToDeckList("White Knight 1", "easy", "W Common Knights"); addToDeckList("White Knight 2", "medium", "Singleton Knights"); addToDeckList("White Knight 3", "hard", "Knights Standard"); diff --git a/src/forge/quest/gui/main/QuestBattle.java b/src/forge/quest/gui/main/QuestBattle.java index 491eb1d5600..3de34da330b 100644 --- a/src/forge/quest/gui/main/QuestBattle.java +++ b/src/forge/quest/gui/main/QuestBattle.java @@ -120,7 +120,6 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("Fin Fang Foom 1", "easy", "B Artifact"); addToDeckList("Fin Fang Foom 2", "medium", "G Infect"); addToDeckList("Fin Fang Foom 3", "hard", "GB Infect"); - addToDeckList("Flash 2", "medium", "RU Urzatron "); addToDeckList("Fred Flintstone 3", "hard", "Reasontg's Predator's Garden deck with mods, featuring Lorescale Coatl"); addToDeckList("Frodo 1", "easy", "New, Apthaven's AI Zoo Easy, some creature removal"); addToDeckList("Frodo 2", "medium", "New, Apthaven's AI Zoo Medium, some creature removal + Glorious Anthem"); @@ -150,7 +149,6 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("Green Arrow 2", "medium", "G Anti-Air"); addToDeckList("Green Arrow 3", "hard", "G Angry Large Monsters"); addToDeckList("Green Lantern 3", "hard", "Nicol Bolas, Planeswalker + threat removal and several creatures"); - addToDeckList("Gunslinger 2", "medium", "UR Trade Routes"); addToDeckList("Gunslinger 3", "hard", "WGRB Cascade"); addToDeckList("Han Solo 3", "hard", "WG enchantments deck with Sigil of the Empty Throne"); @@ -182,7 +180,6 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("James Bond 3", "hard", "gohongohon's Hard WGR Agro"); addToDeckList("James T Kirk 3", "hard", "Rares 40 card black discard deck + Liliana Vess"); addToDeckList("Jason Todd 3", "hard", "GBR Sacrifice"); - addToDeckList("Jay Flash 3", "hard", "RB Cycling"); addToDeckList("Joe Kidd 1", "easy", "Voracious Hatchling, Nightsky Mimic, no planeswalkers + a few WB spells"); addToDeckList("Joe Kidd 2", "medium", "Voracious Hatchling, Nightsky Mimic, no planeswalkers + some WB spells"); addToDeckList("Joe Kidd 3", "hard", "Voracious Hatchling, Nightsky Mimic, no planeswalkers + many WB spells"); @@ -204,10 +201,8 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("Kojak 1", "easy", "Mono blue deck with Sunken City, Inundate, counterspells and bounce"); addToDeckList("Kojak 2", "medium", "Mono blue deck with Sunken City, Inundate, counterspells and bounce"); addToDeckList("Kojak 3", "hard", "Mono blue deck with Sunken City, Inundate, counterspells and bounce"); - addToDeckList("Krypto 2", "medium", "GW Midrange"); addToDeckList("Krypto 3", "hard", "GUB Standard Constructed"); - addToDeckList("Lex 2", "medium", "UB Horobi"); addToDeckList("Lex 3", "hard", "Ninjas!"); addToDeckList("Link 3", "hard", "GUR Standard Constructed"); addToDeckList("Lisa Simpson 3", "hard", "GW deck, creates tokens which are devoured by Skullmulcher and Gluttonous Slime"); @@ -258,7 +253,6 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("Raven 2", "medium", "Birds!"); addToDeckList("Raven 3", "hard", " Possessed Birds!"); addToDeckList("Red Skull 2", "medium", "BR Metalcraft"); - addToDeckList("Red Skull 3", "hard", "UB Standard"); addToDeckList("Robin 2", "medium", "G Big Green"); addToDeckList("Robin 3", "hard", "GW Standard"); addToDeckList("Rocky 1", "easy", "Pro red, Flamebreak + Tremor + Pyroclasm but no Pyrohemia"); @@ -282,7 +276,6 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("Sentinel 2", "medium", "WB Token"); addToDeckList("Sentinel 3", "hard", "WB Token"); addToDeckList("Shelob 1", "easy", "G Reach"); - addToDeckList("Shelob 2", "medium", "UB Zombies"); addToDeckList("Sherlock Holmes 1", "easy", "Mono green deck, Baru, Fist of Krosa + land fetch + some buff cards."); addToDeckList("Sherlock Holmes 2", "medium", "Mono green deck, Baru, Fist of Krosa + lots of good green creatures."); addToDeckList("Sherlock Holmes 3", "hard", "Mono green deck, Baru, Fist of Krosa + lots of great green creatures."); @@ -323,7 +316,6 @@ public class QuestBattle extends QuestSelectablePanel { addToDeckList("Vampire 3", "hard", "Vampire Constructed"); addToDeckList("Werewolf 2", "medium", "UGB Fungal Shambler"); - addToDeckList("Werewolf 3", "hard", "UB Constructed"); addToDeckList("White Knight 1", "easy", "W Common Knights"); addToDeckList("White Knight 2", "medium", "Singleton Knights"); addToDeckList("White Knight 3", "hard", "Knights Standard");