From 4224f8a0a8a5b0ee2887c070af7b02a0554dcea5 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Fri, 27 Nov 2015 16:48:49 +0000
Subject: [PATCH] Fix loading of existing conquests

---
 .../screens/planarconquest/ConquestMenu.java  |  2 +-
 .../planarconquest/LoadConquestScreen.java    |  2 ++
 .../planarconquest/NewConquestScreen.java     |  2 +-
 .../forge/planarconquest/ConquestDataIO.java  | 21 -------------------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
index 4d679a571fe..e10d448ce69 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
@@ -56,7 +56,7 @@ public class ConquestMenu extends FPopupMenu {
         final File dirConquests = new File(ForgeConstants.CONQUEST_SAVE_DIR);
         final String questname = FModel.getConquestPreferences().getPref(CQPref.CURRENT_CONQUEST);
         final File data = new File(dirConquests.getPath(), questname);
-        if (data.exists() || ConquestDataIO.TEST_MODE) {
+        if (data.exists()) {
             LoadingOverlay.show("Loading current conquest...", new Runnable() {
                 @Override
                 @SuppressWarnings("unchecked")
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
index 84f90c90239..6d627b28edc 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
@@ -28,6 +28,7 @@ import forge.quest.QuestUtil;
 import forge.screens.LaunchScreen;
 import forge.screens.home.LoadGameMenu;
 import forge.screens.home.NewGameMenu.NewGameScreen;
+import forge.screens.planarconquest.ConquestMenu.LaunchReason;
 import forge.screens.settings.SettingsScreen;
 import forge.toolbox.FButton;
 import forge.toolbox.FEvent;
@@ -174,6 +175,7 @@ public class LoadConquestScreen extends LaunchScreen {
         FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST,
                 lstConquests.getSelectedConquest().getName() + ".dat");
         FModel.getConquestPreferences().save();
+        ConquestMenu.launchPlanarConquest(LaunchReason.LoadConquest);
     }
 
     private void renameConquest(final ConquestData quest) {
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
index 421e13294f6..487086150d5 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
@@ -112,7 +112,7 @@ public class NewConquestScreen extends FScreen {
                         FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquestName + ".dat");
                         FModel.getConquestPreferences().save();
 
-                        ConquestMenu.launchPlanarConquest(LaunchReason.NewConquest); //launch quest mode for new quest
+                        ConquestMenu.launchPlanarConquest(LaunchReason.NewConquest);
                     }
                 });
             }
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestDataIO.java b/forge-gui/src/main/java/forge/planarconquest/ConquestDataIO.java
index 3853bdd0a80..801dac828a9 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestDataIO.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestDataIO.java
@@ -39,23 +39,6 @@ import forge.util.IgnoringXStream;
 import forge.util.ItemPool;
 
 public class ConquestDataIO {
-    public static boolean TEST_MODE = true;
-    private static ConquestData createTestData() {
-        /*ConquestData temp = new ConquestData("My Conquest", 0,
-                ConquestPlane.Alara,
-                ConquestPlane.Alara.getCardPool().getCard("Rafiq of the Many"));*/
-        /*ConquestData temp = new ConquestData("My Conquest", 0,
-                ConquestPlane.Kamigawa,
-                ConquestPlane.Kamigawa.getCardPool().getCard("Meloku the Clouded Mirror"));*/
-        /*ConquestData temp = new ConquestData("My Conquest", 0,
-                ConquestPlane.Mirrodin,
-                ConquestPlane.Mirrodin.getCardPool().getCard("Glissa Sunseeker"));*/
-        ConquestData temp = new ConquestData("My Conquest", 0,
-                ConquestPlane.Ravnica,
-                ConquestPlane.Ravnica.getCardPool().getCard("Savra, Queen of the Golgari"));
-        return temp;
-    }
-
     static {
         //ensure save directory exists if this class is used
         FileUtil.ensureDirectoryExists(ForgeConstants.CONQUEST_SAVE_DIR);
@@ -72,10 +55,6 @@ public class ConquestDataIO {
     }
 
     public static ConquestData loadData(final File xmlSaveFile) {
-        if (TEST_MODE) {
-            return createTestData();
-        }
-
         try {
             ConquestData data = null;