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

Fix so existing conquest can be loaded

Browse Source
This commit is contained in:
drdev
2016-01-02 03:04:17 +00:00
parent fef533e3ce
commit f3b528cfa7
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ public class LoadConquestScreen extends LaunchScreen {
ConquestData conquest = lstConquests.getSelectedConquest(); ConquestData conquest = lstConquests.getSelectedConquest();
if (conquest == null) { return; } if (conquest == null) { return; }
FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquest.getName() + ".dat"); FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquest.getName());
FModel.getConquestPreferences().save(); FModel.getConquestPreferences().save();
ConquestMenu.launchPlanarConquest(LaunchReason.LoadConquest); ConquestMenu.launchPlanarConquest(LaunchReason.LoadConquest);
} }

11
forge-gui/src/main/java/forge/planarconquest/ConquestData.java
View File

@@ -73,9 +73,8 @@ public final class ConquestData {
xmlFilename = directory.getPath() + ForgeConstants.PATH_SEPARATOR + XML_FILE; xmlFilename = directory.getPath() + ForgeConstants.PATH_SEPARATOR + XML_FILE;
aetherShards = FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_START_SHARDS); aetherShards = FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_START_SHARDS);
currentLocation = new ConquestLocation(startingPlane0, 0, 0, Region.START_COL); currentLocation = new ConquestLocation(startingPlane0, 0, 0, Region.START_COL);
planeswalker = planeswalker0; setPlaneswalker(planeswalker0);
planeswalkerToken = PlaneswalkerAchievements.getTrophyImage(planeswalker.getName()); unlockCard(planeswalker0);
unlockCard(planeswalker);
//generate deck for starting commander and add all cards to collection //generate deck for starting commander and add all cards to collection
ConquestCommander commander = new ConquestCommander(startingCommander0, startingPlane0.getCardPool(), false); ConquestCommander commander = new ConquestCommander(startingCommander0, startingPlane0.getCardPool(), false);
@@ -93,7 +92,7 @@ public final class ConquestData {
try { try {
XmlReader xml = new XmlReader(xmlFilename); XmlReader xml = new XmlReader(xmlFilename);
CardDb cardDb = FModel.getMagicDb().getCommonCards(); CardDb cardDb = FModel.getMagicDb().getCommonCards();
planeswalker = xml.read("planeswalker", cardDb); setPlaneswalker(xml.read("planeswalker", cardDb));
aetherShards = xml.read("aetherShards", aetherShards); aetherShards = xml.read("aetherShards", aetherShards);
currentLocation = xml.read("currentLocation", ConquestLocation.class); currentLocation = xml.read("currentLocation", ConquestLocation.class);
xml.read("unlockedCards", unlockedCards, cardDb); xml.read("unlockedCards", unlockedCards, cardDb);
@@ -113,6 +112,10 @@ public final class ConquestData {
public PaperCard getPlaneswalker() { public PaperCard getPlaneswalker() {
return planeswalker; return planeswalker;
} }
public void setPlaneswalker(PaperCard planeswalker0) {
planeswalker = planeswalker0;
planeswalkerToken = PlaneswalkerAchievements.getTrophyImage(planeswalker.getName());
}
public ISkinImage getPlaneswalkerToken() { public ISkinImage getPlaneswalkerToken() {
return planeswalkerToken; return planeswalkerToken;