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

Fix display of map screen

Browse Source 
Fix so deck gets saved
This commit is contained in:
drdev
2014-11-23 05:19:04 +00:00
parent 769b5c1b37
commit a17394f36d
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java
View File

@@ -1,6 +1,7 @@
package forge.screens.planarconquest; package forge.screens.planarconquest;
import forge.FThreads; import forge.FThreads;
import forge.model.FModel;
import forge.quest.QuestUtil; import forge.quest.QuestUtil;
import forge.screens.LaunchScreen; import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay; import forge.screens.LoadingOverlay;
@@ -47,7 +48,7 @@ public class ConquestMapScreen extends LaunchScreen {
} }
public void update() { public void update() {
setHeaderCaption(FModel.getConquest().getName() + "\n" + FModel.getConquest().getCurrentPlane());
} }
@Override @Override

4
forge-gui/src/main/java/forge/planarconquest/ConquestController.java
View File

@@ -40,6 +40,10 @@ public class ConquestController {
return model == null ? null : model.getName(); return model == null ? null : model.getName();
} }
public String getCurrentPlane() {
return model == null ? null : model.getCurrentPlane().getName();
}
public CardPool getCardPool() { public CardPool getCardPool() {
return cardPool; return cardPool;
} }

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

@@ -55,7 +55,13 @@ public final class ConquestData {
difficulty = difficulty0; difficulty = difficulty0;
startingPlane = startingPlane0; startingPlane = startingPlane0;
currentPlane = startingPlane0; currentPlane = startingPlane0;
commanders.add(new ConquestCommander(startingCommander0, startingPlane.getCardPool())); addCommander(startingCommander0);
}
private void addCommander(PaperCard card) {
ConquestCommander commander = new ConquestCommander(card, currentPlane.getCardPool());
commanders.add(commander);
decks.put(commander.getDeck().getName(), commander.getDeck());
} }
public String getName() { public String getName() {