diff --git a/.gitattributes b/.gitattributes index 13f90b85520..a98fd096396 100644 --- a/.gitattributes +++ b/.gitattributes @@ -183,6 +183,9 @@ res/quest/decks/Frodo[!!-~]1.dck -text res/quest/decks/Frodo[!!-~]2.dck -text res/quest/decks/Frodo[!!-~]3.dck -text res/quest/decks/Galadriel[!!-~]2.dck -text +res/quest/decks/Galahad[!!-~]1.dck -text +res/quest/decks/Galahad[!!-~]2.dck -text +res/quest/decks/Galahad[!!-~]3.dck -text res/quest/decks/Genghis[!!-~]Khan[!!-~]1.dck -text res/quest/decks/Genghis[!!-~]Khan[!!-~]2.dck -text res/quest/decks/Genghis[!!-~]Khan[!!-~]3.dck -text diff --git a/res/quest/decks/Galahad 1.dck b/res/quest/decks/Galahad 1.dck new file mode 100644 index 00000000000..2a009537377 --- /dev/null +++ b/res/quest/decks/Galahad 1.dck @@ -0,0 +1,29 @@ +Galahad 1 +[general] +constructed +[main] +1 Befoul +2 White Shield Crusader +1 Deathmark +8 Swamp +2 Stillmoon Cavalier +8 Plains +1 Knight Exemplar +2 Craven Knight +2 Glorious Charge +2 Ghostly Visit +2 Plover Knights +2 Knight of the White Orchid +2 Oust +2 Lionheart Maverick +1 Black Knight +4 Scrubland +1 Silver Knight +2 Headless Horseman +1 Kinsbaile Cavalier +2 Soltari Crusader +4 Godless Shrine +4 Serra's Blessing +3 Knight Errant +1 White Knight +[sideboard] diff --git a/res/quest/decks/Galahad 2.dck b/res/quest/decks/Galahad 2.dck new file mode 100644 index 00000000000..e8ab3361bbf --- /dev/null +++ b/res/quest/decks/Galahad 2.dck @@ -0,0 +1,26 @@ +Galahad 2 +[general] +constructed +[main] +7 Swamp +2 Stillmoon Cavalier +7 Plains +2 Knight Exemplar +2 Glorious Charge +2 Knight of Meadowgrain +2 Plover Knights +3 Knight of the White Orchid +4 Black Knight +4 Scrubland +1 Swords to Plowshares +2 Silver Knight +4 Kinsbaile Cavalier +1 Mox Pearl +2 Soltari Crusader +2 Serra's Blessing +4 Godless Shrine +3 Paladin en-Vec +3 Path to Exile +1 Mox Jet +2 Doom Blade +[sideboard] diff --git a/res/quest/decks/Galahad 3.dck b/res/quest/decks/Galahad 3.dck new file mode 100644 index 00000000000..5fda7b30d39 --- /dev/null +++ b/res/quest/decks/Galahad 3.dck @@ -0,0 +1,25 @@ +Galahad 3 +[general] +constructed +[main] +2 Armageddon +6 Swamp +6 Plains +1 Day of Judgment +4 Knight Exemplar +4 Knight of Meadowgrain +4 Knight of the White Orchid +3 Black Knight +4 Scrubland +4 Swords to Plowshares +2 Silver Knight +2 Kinsbaile Cavalier +1 Mox Pearl +4 Godless Shrine +2 Serra's Blessing +3 Paladin en-Vec +2 Path to Exile +1 Mox Jet +2 White Knight +3 Doom Blade +[sideboard] diff --git a/res/quest/easy.txt b/res/quest/easy.txt index a0c86bb3994..d7deeb227b3 100644 --- a/res/quest/easy.txt +++ b/res/quest/easy.txt @@ -1,34 +1,35 @@ -Bamm Bamm Rubble 1 -Barney Rubble 1 -Bart Simpson 1 +Bamm Bamm Rubble 1 +Barney Rubble 1 +Bart Simpson 1 Buffy 1 Catwoman 1 Crocodile Dundee 1 -Da Vinci 1 +Da Vinci 1 Darrin Stephens 1 -Doc Holiday 1 -Fat Albert 1 +Doc Holiday 1 +Fat Albert 1 Frodo 1 -Genghis Khan 1 -George of the Jungle 1 -Grampa Simpson 1 +Galahad 1 +Genghis Khan 1 +George of the Jungle 1 +Grampa Simpson 1 Harry Potter 1 Homer Simpson 1 -Indiana Jones 1 +Indiana Jones 1 Jack Sparrow 1 -James Bond 1 -Joe Kidd 1 +James Bond 1 +Joe Kidd 1 King Arthur 1 -King Edward 1 +King Edward 1 King Kong 1 -Kojak 1 -Magnum 1 +Kojak 1 +Magnum 1 Ned Flanders 1 Rocky 1 Seabiscuit 1 Sherlock Holmes 1 Storm 1 Superman 1 -Tarzan 1 +Tarzan 1 Wilma Flintstone 1 Wyatt Earp 1 \ No newline at end of file diff --git a/res/quest/hard.txt b/res/quest/hard.txt index 3be08f12094..1251463be4d 100644 --- a/res/quest/hard.txt +++ b/res/quest/hard.txt @@ -1,80 +1,81 @@ Abraham Lincoln 3 -Albert Einstein 3 -Barney Rubble 3 +Albert Einstein 3 +Barney Rubble 3 Bart Simpson 3 -Batman 3 -Bela Lugosi 3 +Batman 3 +Bela Lugosi 3 Betty Rubble 3 Blackbeard 3 -Boba Fett 3 +Boba Fett 3 Boris Karloff 3 Buffy 3 C3PO 3 Comic Book Guy 3 Crocodile Dundee 3 Cyclops 3 -Da Vinci 3 +Da Vinci 3 Darrin Stephens 3 Darth Vador 3 -Data 3 +Data 3 Dino 3 -Doc Holiday 3 -Dr No 3 -Electro 3 -Endora 3 -Fat Albert 3 -Fred Flintstone 3 +Doc Holiday 3 +Dr No 3 +Electro 3 +Endora 3 +Fat Albert 3 +Fred Flintstone 3 Frodo 3 -Genghis Khan 3 -George of the Jungle 3 -Gold Finger 3 +Galahad 3 +Genghis Khan 3 +George of the Jungle 3 +Gold Finger 3 Grampa Simpson 3 Green Lantern 3 -Han Solo 3 -Harry Potter 3 +Han Solo 3 +Harry Potter 3 Higgins 3 Homer Simpson 3 Iceman 3 Indiana Jones 3 -Jabba the Hut 3 +Jabba the Hut 3 Jack Sparrow 3 James Bond 3 -James T Kirk 3 -Joe Kidd 3 +James T Kirk 3 +Joe Kidd 3 King Arthur 3 -King Edward 3 +King Edward 3 King Kong 3 -Kojak 3 +Kojak 3 Lisa Simpson 3 -Luke Skywalker 3 +Luke Skywalker 3 Maggie Simpson 3 -Magneto 3 -Magnum 3 -Marge Simpson 3 +Magneto 3 +Magnum 3 +Marge Simpson 3 Mr Slate 3 Morpheus 3 -Napoleon 3 +Napoleon 3 Ned Flanders 3 Neo 3 -Newton 3 +Newton 3 Pebbles Flintstone 3 Picard 3 Pinky and the Brain 3 -Professor X 3 +Professor X 3 R2-D2 3 Rocky 3 -Rogue 3 -Samantha Stephens 3 +Rogue 3 +Samantha Stephens 3 Scooby Doo 3 Saruman 3 -Seabiscuit 3 +Seabiscuit 3 Secret Squirrel 3 Sherlock Holmes 3 Silver Surfer 3 Storm 3 -Terminator 3 +Terminator 3 The Great Gazoo 3 -Uncle Owen 3 +Uncle Owen 3 Wilma Flintstone 3 Wolverine 3 Wyatt Earp 3 \ No newline at end of file diff --git a/res/quest/medium.txt b/res/quest/medium.txt index 6ded6fb1652..6ee1cfddfa9 100644 --- a/res/quest/medium.txt +++ b/res/quest/medium.txt @@ -1,32 +1,33 @@ -Albert Einstein 2 +Albert Einstein 2 Barney Rubble 2 -Bart Simpson 2 +Bart Simpson 2 Buffy 2 Catwoman 2 Crocodile Dundee 2 -Da Vinci 2 -Darrin Stephens 2 +Da Vinci 2 +Darrin Stephens 2 Dino 2 Doc Holiday 2 -Endora 2 -Fat Albert 2 +Endora 2 +Fat Albert 2 Frodo 2 Galadriel 2 -Genghis Khan 2 -George of the Jungle 2 -Grampa Simpson 2 +Galahad 2 +Genghis Khan 2 +George of the Jungle 2 +Grampa Simpson 2 Harry Potter 2 Homer Simpson 2 -Indiana Jones 2 +Indiana Jones 2 Jack Sparrow 2 -James Bond 2 -Joe Kidd 2 +James Bond 2 +Joe Kidd 2 King Arthur 2 -King Edward 2 +King Edward 2 King Kong 2 -Kojak 2 -Magnum 2 -Ned Flanders 2 +Kojak 2 +Magnum 2 +Ned Flanders 2 Pebbles Flintstone 2 Radagast 2 Rocky 2 @@ -37,6 +38,6 @@ Spiderman 2 Spock 2 Storm 2 Superman 2 -Tarzan 2 +Tarzan 2 Wilma Flintstone 2 Wyatt Earp 2 \ No newline at end of file diff --git a/src/forge/Gui_Quest.java b/src/forge/Gui_Quest.java index 22d5c733a4a..0c4aef869aa 100644 --- a/src/forge/Gui_Quest.java +++ b/src/forge/Gui_Quest.java @@ -435,7 +435,13 @@ public class Gui_Quest extends JFrame implements NewConstants{ sb.append("\r\n"); sb.append("Frodo 3 hard New, Apthaven's AI Zoo Hard, more creature removal + Glorious Anthems"); sb.append("\r\n"); - sb.append("Galadriel 2 medium Amulet of Vigor, green mana ramp, time vault and Howl of the Night Pack"); + sb.append("Galadriel 2 medium Amulet of Vigor, green mana ramp, time vault and Howl of the Night Pack"); + sb.append("\r\n"); + sb.append("Galahad 1 easy apthaven's knight deck with Kinsbaile Cavalier and Knight Exemplar"); + sb.append("\r\n"); + sb.append("Galahad 2 medium apthaven's knight deck with Kinsbaile Cavalier and Knight Exemplar"); + sb.append("\r\n"); + sb.append("Galahad 3 hard apthaven's knight deck with Kinsbaile Cavalier and Knight Exemplar"); sb.append("\r\n"); sb.append("Genghis Khan 1 easy Mana Elves + Birds + Armageddon, Llanowar Behemoth"); sb.append("\r\n");