diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 960980ae456..23c8ead1cd3 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -6,7 +6,7 @@ jar -Xms128m -Xmx1024m - 1.5.51.001 + 1.5.51.002 keystore alias storepass diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 05700044139..f503809d9fa 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -39,7 +39,7 @@ import forge.util.FileUtil; import forge.util.Utils; public class Forge implements ApplicationListener { - public static final String CURRENT_VERSION = "1.5.51.001"; + public static final String CURRENT_VERSION = "1.5.51.002"; private static final ApplicationListener app = new Forge(); private static Clipboard clipboard; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 9a1581c6871..03255c1d4aa 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -258,8 +258,9 @@ public final class ConquestData { } public boolean exileCard(PaperCard card, int value) { + final String title = "Exile Card"; if (planeswalker == card) { - SOptionPane.showMessageDialog("Current planeswalker cannot be exiled.", "Exile Card", SOptionPane.INFORMATION_ICON); + SOptionPane.showMessageDialog("Current planeswalker cannot be exiled.", title, SOptionPane.INFORMATION_ICON); return false; } String commandersUsingCard = ""; @@ -267,7 +268,7 @@ public final class ConquestData { for (ConquestCommander commander : commanders) { if (commander.getCard() == card) { if (!commander.getDeck().getMain().isEmpty()) { - SOptionPane.showMessageDialog("Cannot exile a commander with a defined deck.", "Exile Card", SOptionPane.INFORMATION_ICON); + SOptionPane.showMessageDialog("Cannot exile a commander with a defined deck.", title, SOptionPane.INFORMATION_ICON); return false; } commanderBeingExiled = commander; //cache commander to make it easier to remove later @@ -277,10 +278,10 @@ public final class ConquestData { } } if (!commandersUsingCard.isEmpty()) { - SOptionPane.showMessageDialog("Card is in use by the following commanders and cannot be exiled:\n" + commandersUsingCard, "Exile Card", SOptionPane.INFORMATION_ICON); + SOptionPane.showMessageDialog("Card is in use by the following commanders and cannot be exiled:\n" + commandersUsingCard, title, SOptionPane.INFORMATION_ICON); return false; } - if (SOptionPane.showConfirmDialog("Exile the following card to receive {AE}" + value + "?\n\n" + card.getName(), "Exile Card", "OK", "Cancel")) { + if (SOptionPane.showConfirmDialog("Exile the following card to receive {AE}" + value + "?\n\n" + card.getName(), title, "OK", "Cancel")) { if (exiledCards.add(card)) { if (commanderBeingExiled != null) { commanders.remove(commanderBeingExiled); @@ -294,7 +295,12 @@ public final class ConquestData { } public boolean retrieveCardFromExile(PaperCard card, int cost) { - if (SOptionPane.showConfirmDialog("Spend {AE}" + cost + " to retrieve the following card from exile?\n\n" + card.getName(), "Retrieve Card", "OK", "Cancel")) { + final String title = "Retrieve Card"; + if (aetherShards < cost) { + SOptionPane.showMessageDialog("Not enough shards to retrieve card.", title, SOptionPane.INFORMATION_ICON); + return false; + } + if (SOptionPane.showConfirmDialog("Spend {AE}" + cost + " to retrieve the following card from exile?\n\n" + card.getName(), title, "OK", "Cancel")) { if (exiledCards.remove(card)) { if (card.getRules().canBeCommander()) { //add back commander for card if needed commanders.add(new ConquestCommander(card));