diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index f70c3a4649c..ac728b18479 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -176,7 +176,7 @@ public class LoadConquestScreen extends LaunchScreen { ConquestData conquest = lstConquests.getSelectedConquest(); if (conquest == null) { return; } - FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquest.getName() + ".dat"); + FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquest.getName()); FModel.getConquestPreferences().save(); ConquestMenu.launchPlanarConquest(LaunchReason.LoadConquest); } diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 968f60f381f..1b59fbaa459 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -73,9 +73,8 @@ public final class ConquestData { xmlFilename = directory.getPath() + ForgeConstants.PATH_SEPARATOR + XML_FILE; aetherShards = FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_START_SHARDS); currentLocation = new ConquestLocation(startingPlane0, 0, 0, Region.START_COL); - planeswalker = planeswalker0; - planeswalkerToken = PlaneswalkerAchievements.getTrophyImage(planeswalker.getName()); - unlockCard(planeswalker); + setPlaneswalker(planeswalker0); + unlockCard(planeswalker0); //generate deck for starting commander and add all cards to collection ConquestCommander commander = new ConquestCommander(startingCommander0, startingPlane0.getCardPool(), false); @@ -93,7 +92,7 @@ public final class ConquestData { try { XmlReader xml = new XmlReader(xmlFilename); CardDb cardDb = FModel.getMagicDb().getCommonCards(); - planeswalker = xml.read("planeswalker", cardDb); + setPlaneswalker(xml.read("planeswalker", cardDb)); aetherShards = xml.read("aetherShards", aetherShards); currentLocation = xml.read("currentLocation", ConquestLocation.class); xml.read("unlockedCards", unlockedCards, cardDb); @@ -113,6 +112,10 @@ public final class ConquestData { public PaperCard getPlaneswalker() { return planeswalker; } + public void setPlaneswalker(PaperCard planeswalker0) { + planeswalker = planeswalker0; + planeswalkerToken = PlaneswalkerAchievements.getTrophyImage(planeswalker.getName()); + } public ISkinImage getPlaneswalkerToken() { return planeswalkerToken;