external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading of existing conquests

Browse Source
This commit is contained in:
drdev
2015-11-27 16:48:49 +00:00
parent 9c913fb649
commit 4224f8a0a8
4 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
View File

@@ -56,7 +56,7 @@ public class ConquestMenu extends FPopupMenu {
final File dirConquests = new File(ForgeConstants.CONQUEST_SAVE_DIR); final File dirConquests = new File(ForgeConstants.CONQUEST_SAVE_DIR);
final String questname = FModel.getConquestPreferences().getPref(CQPref.CURRENT_CONQUEST); final String questname = FModel.getConquestPreferences().getPref(CQPref.CURRENT_CONQUEST);
final File data = new File(dirConquests.getPath(), questname); final File data = new File(dirConquests.getPath(), questname);
if (data.exists() || ConquestDataIO.TEST_MODE) { if (data.exists()) {
LoadingOverlay.show("Loading current conquest...", new Runnable() { LoadingOverlay.show("Loading current conquest...", new Runnable() {
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

2
forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
View File

@@ -28,6 +28,7 @@ import forge.quest.QuestUtil;
import forge.screens.LaunchScreen; import forge.screens.LaunchScreen;
import forge.screens.home.LoadGameMenu; import forge.screens.home.LoadGameMenu;
import forge.screens.home.NewGameMenu.NewGameScreen; import forge.screens.home.NewGameMenu.NewGameScreen;
import forge.screens.planarconquest.ConquestMenu.LaunchReason;
import forge.screens.settings.SettingsScreen; import forge.screens.settings.SettingsScreen;
import forge.toolbox.FButton; import forge.toolbox.FButton;
import forge.toolbox.FEvent; import forge.toolbox.FEvent;
@@ -174,6 +175,7 @@ public class LoadConquestScreen extends LaunchScreen {
FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST,
lstConquests.getSelectedConquest().getName() + ".dat"); lstConquests.getSelectedConquest().getName() + ".dat");
FModel.getConquestPreferences().save(); FModel.getConquestPreferences().save();
ConquestMenu.launchPlanarConquest(LaunchReason.LoadConquest);
} }
private void renameConquest(final ConquestData quest) { private void renameConquest(final ConquestData quest) {

2
forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
View File

@@ -112,7 +112,7 @@ public class NewConquestScreen extends FScreen {
FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquestName + ".dat"); FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquestName + ".dat");
FModel.getConquestPreferences().save(); FModel.getConquestPreferences().save();
ConquestMenu.launchPlanarConquest(LaunchReason.NewConquest); //launch quest mode for new quest ConquestMenu.launchPlanarConquest(LaunchReason.NewConquest);
} }
}); });
} }

21
forge-gui/src/main/java/forge/planarconquest/ConquestDataIO.java
View File

@@ -39,23 +39,6 @@ import forge.util.IgnoringXStream;
import forge.util.ItemPool; import forge.util.ItemPool;
public class ConquestDataIO { 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 { static {
//ensure save directory exists if this class is used //ensure save directory exists if this class is used
FileUtil.ensureDirectoryExists(ForgeConstants.CONQUEST_SAVE_DIR); FileUtil.ensureDirectoryExists(ForgeConstants.CONQUEST_SAVE_DIR);
@@ -72,10 +55,6 @@ public class ConquestDataIO {
} }
public static ConquestData loadData(final File xmlSaveFile) { public static ConquestData loadData(final File xmlSaveFile) {
if (TEST_MODE) {
return createTestData();
}
try { try {
ConquestData data = null; ConquestData data = null;