From 9725fd30ee7bf3bfd2a5a8cb6ad5cd87149682ff Mon Sep 17 00:00:00 2001 From: Sol Date: Mon, 8 Sep 2014 23:55:28 +0000 Subject: [PATCH] - Adding a Minimum amount of Packs Field for Quest mode. - Slight increase to Quest Packs available in the Spell Shop --- .../forge/screens/home/quest/QuestPreferencesHandler.java | 3 +++ .../java/forge/screens/home/quest/VSubmenuQuestPrefs.java | 3 +++ forge-gui/src/main/java/forge/quest/QuestUtilCards.java | 3 ++- .../src/main/java/forge/quest/data/QuestPreferences.java | 7 ++++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestPreferencesHandler.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestPreferencesHandler.java index ff172491218..29fc2572e1b 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestPreferencesHandler.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestPreferencesHandler.java @@ -213,6 +213,9 @@ public class QuestPreferencesHandler extends SkinnedPanel { pnlShop.add(new FLabel.Builder().text("Maximum Packs").build(), constraints2); pnlShop.add(new PrefInput(QPref.SHOP_MAX_PACKS, ErrType.SHOP), constraints1); + pnlShop.add(new FLabel.Builder().text("Minimum Packs").build(), constraints2); + pnlShop.add(new PrefInput(QPref.SHOP_MIN_PACKS, ErrType.SHOP), constraints1); + pnlShop.add(new FLabel.Builder().text("Starting Packs").build(), constraints2); pnlShop.add(new PrefInput(QPref.SHOP_STARTING_PACKS, ErrType.SHOP), constraints1); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java index 7a63e35fc10..3f33e6143b6 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java @@ -351,6 +351,9 @@ public enum VSubmenuQuestPrefs implements IVSubmenu { pnlShop.add(new FLabel.Builder().text("Maximum Packs").fontAlign(SwingConstants.RIGHT).build(), constraints2); pnlShop.add(new PrefInput(QPref.SHOP_MAX_PACKS, QuestPreferencesErrType.SHOP), constraints1); + pnlShop.add(new FLabel.Builder().text("Minimum Packs").fontAlign(SwingConstants.RIGHT).build(), constraints2); + pnlShop.add(new PrefInput(QPref.SHOP_MIN_PACKS, QuestPreferencesErrType.SHOP), constraints1); + pnlShop.add(new FLabel.Builder().text("Starting Packs").fontAlign(SwingConstants.RIGHT).build(), constraints2); pnlShop.add(new PrefInput(QPref.SHOP_STARTING_PACKS, QuestPreferencesErrType.SHOP), constraints1); diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java index 55f4ec20ecd..d576020ab0a 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java @@ -665,11 +665,12 @@ public final class QuestUtilCards { final int startPacks = this.qpref.getPrefInt(QPref.SHOP_STARTING_PACKS); final int winsForPack = this.qpref.getPrefInt(QPref.SHOP_WINS_FOR_ADDITIONAL_PACK); final int maxPacks = this.qpref.getPrefInt(QPref.SHOP_MAX_PACKS); + final int minPacks = this.qpref.getPrefInt(QPref.SHOP_MIN_PACKS); int level = this.qc.getAchievements().getLevel(); final int levelPacks = level > 0 ? startPacks / level : startPacks; final int winPacks = this.qc.getAchievements().getWin() / winsForPack; - final int totalPacks = Math.min(levelPacks + winPacks, maxPacks); + final int totalPacks = Math.min(Math.max(levelPacks + winPacks, minPacks), maxPacks); SealedProduct.Template tpl = getShopBoosterTemplate(); diff --git a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java index 8a37372003e..a9595a2b1bf 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java @@ -135,7 +135,8 @@ public class QuestPreferences extends PreferencesStore i WINS_UNLOCK_SET("20"), // Maximum amount of "Packs" opened by the Shop and available as singles - SHOP_MAX_PACKS("6"), + SHOP_MAX_PACKS("7"), + SHOP_MIN_PACKS("3"), // Rarity distribution of Singles in an Opened Shop Pack SHOP_SINGLES_COMMON("7"), @@ -145,7 +146,7 @@ public class QuestPreferences extends PreferencesStore i // How many wins it takes to open an additional pack in the shop SHOP_WINS_FOR_ADDITIONAL_PACK("10"), // How many packs the shop start with. - SHOP_STARTING_PACKS("4"); + SHOP_STARTING_PACKS("5"); private final String strDefaultVal; @@ -313,7 +314,7 @@ public class QuestPreferences extends PreferencesStore i return "Value too large (maximum 15)."; } break; - case SHOP_WINS_FOR_ADDITIONAL_PACK: case SHOP_MAX_PACKS: + case SHOP_WINS_FOR_ADDITIONAL_PACK: case SHOP_MAX_PACKS: case SHOP_MIN_PACKS: if (val < 1) { return "Value too small (minimum 1)."; } else if (val > 25) {