diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index a1b52d68cbe..adef4735adb 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -270,7 +270,7 @@ public class LoadConquestScreen extends FScreen { float iconSize = h + Utils.scale(1); float iconOffset = SettingsScreen.SETTING_PADDING - Utils.scale(2); - String cards = String.valueOf(value.getCardPool().countAll()); + String cards = String.valueOf(value.getCollection().countAll()); font = FSkinFont.get(12); float cardsWidth = font.getBounds(cards).width + iconSize + SettingsScreen.SETTING_PADDING; g.drawImage(FSkinImage.HAND, x + w - cardsWidth + iconOffset, y - SettingsScreen.SETTING_PADDING, iconSize, iconSize); diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java index 15f5df8fef8..466d02512fd 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java @@ -50,7 +50,7 @@ public class ConquestController { public void load(final ConquestData model0) { model = model0; - cardPool = model == null ? null : model.getCardPool(); + cardPool = model == null ? null : model.getCollection(); decks = model == null ? null : model.getDeckStorage(); } diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 94e53956567..8bcfb1dbcd9 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -44,7 +44,7 @@ public final class ConquestData { private ConquestPlane startingPlane, currentPlane; private List commanders = new ArrayList(); - private final CardPool cardPool = new CardPool(); + private final CardPool collection = new CardPool(); private final HashMap decks = new HashMap(); public ConquestData() { //needed for XML serialization @@ -62,6 +62,8 @@ public final class ConquestData { ConquestCommander commander = new ConquestCommander(card, currentPlane.getCardPool()); commanders.add(commander); decks.put(commander.getDeck().getName(), commander.getDeck()); + collection.addAll(commander.getDeck().getMain()); + collection.add(card); } public String getName() { @@ -80,8 +82,8 @@ public final class ConquestData { return currentPlane; } - public CardPool getCardPool() { - return cardPool; + public CardPool getCollection() { + return collection; } public ConquestDeckMap getDeckStorage() {