diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java index d2532bc81e5..d16fbda0343 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java @@ -1,6 +1,7 @@ package forge.screens.planarconquest; import forge.FThreads; +import forge.model.FModel; import forge.quest.QuestUtil; import forge.screens.LaunchScreen; import forge.screens.LoadingOverlay; @@ -47,7 +48,7 @@ public class ConquestMapScreen extends LaunchScreen { } public void update() { - + setHeaderCaption(FModel.getConquest().getName() + "\n" + FModel.getConquest().getCurrentPlane()); } @Override diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java index c919d12c938..d6532e3a622 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java @@ -40,6 +40,10 @@ public class ConquestController { return model == null ? null : model.getName(); } + public String getCurrentPlane() { + return model == null ? null : model.getCurrentPlane().getName(); + } + public CardPool getCardPool() { return cardPool; } diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index d26adcb982d..94e53956567 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -55,7 +55,13 @@ public final class ConquestData { difficulty = difficulty0; startingPlane = 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() {