diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index 5f54b1d7eeb..3938f363365 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -299,11 +299,15 @@ public class LoadConquestScreen extends LaunchScreen { float iconOffset = SettingsScreen.SETTING_PADDING - Utils.scale(2); String cards = String.valueOf(value.getUnlockedCount()); + String credits = String.valueOf(value.getCredits()); font = FSkinFont.get(12); float cardsWidth = font.getBounds(cards).width + iconSize + SettingsScreen.SETTING_PADDING; - g.drawText(value.getPlaneswalker().getName() + " - " + value.getCurrentPlane().getName(), font, SettingsScreen.DESC_COLOR, x, y, w - cardsWidth, h, false, HAlignment.LEFT, false); - g.drawImage(FSkinImage.HAND, x + w - cardsWidth + iconOffset, y - SettingsScreen.SETTING_PADDING, iconSize, iconSize); - g.drawText(cards, font, SettingsScreen.DESC_COLOR, x + w - cardsWidth + iconSize + SettingsScreen.SETTING_PADDING, y, w, h, false, HAlignment.LEFT, false); + float creditsWidth = font.getBounds(credits).width + iconSize + SettingsScreen.SETTING_PADDING; + g.drawText(value.getPlaneswalker().getName() + " - " + value.getCurrentPlane().getName(), font, SettingsScreen.DESC_COLOR, x, y, w - creditsWidth - cardsWidth, h, false, HAlignment.LEFT, false); + g.drawImage(FSkinImage.HAND, x + w - creditsWidth - cardsWidth + iconOffset, y - SettingsScreen.SETTING_PADDING, iconSize, iconSize); + g.drawText(cards, font, SettingsScreen.DESC_COLOR, x + w - creditsWidth - cardsWidth + iconSize + SettingsScreen.SETTING_PADDING, y, w, h, false, HAlignment.LEFT, false); + g.drawImage(FSkinImage.QUEST_COINSTACK, x + w - creditsWidth + iconOffset, y - SettingsScreen.SETTING_PADDING, iconSize, iconSize); + g.drawText(credits, font, SettingsScreen.DESC_COLOR, x + w - creditsWidth + iconSize + SettingsScreen.SETTING_PADDING, y, w, h, false, HAlignment.LEFT, false); } }); } diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 0827a5eac8d..cef66300c14 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -57,6 +57,7 @@ public final class ConquestData { private PaperCard planeswalker; private ISkinImage planeswalkerToken; private ConquestLocation currentLocation; + private int credits; private transient ConquestCollection collection; //don't serialize this @@ -175,6 +176,10 @@ public final class ConquestData { getOrCreatePlaneData(event.getLocation().getPlane()).addLoss(event); } + public int getCredits() { + return credits; + } + public String getProgress() { int conquered = 0; int total = 0; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestRecord.java b/forge-gui/src/main/java/forge/planarconquest/ConquestRecord.java index e3f26653c79..bf42e564c59 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestRecord.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestRecord.java @@ -1,7 +1,7 @@ package forge.planarconquest; public class ConquestRecord { - private int wins, losses; + private int wins, losses, level; public int getWins() { return wins; @@ -11,6 +11,10 @@ public class ConquestRecord { return losses; } + public int getLevel() { + return level; + } + public void addWin() { wins++; } @@ -18,4 +22,8 @@ public class ConquestRecord { public void addLoss() { losses++; } + + public void levelUp() { + level++; + } }