From a24cffa9df3d4b4efd76ade4a4ec60d6a51eeafb Mon Sep 17 00:00:00 2001 From: Seravy Date: Thu, 8 Feb 2018 13:12:35 +0100 Subject: [PATCH] Makes the maximal amount of bonus for life total difference optional --- .../java/forge/screens/home/quest/VSubmenuQuestPrefs.java | 3 +++ .../src/main/java/forge/quest/QuestWinLoseController.java | 2 +- .../src/main/java/forge/quest/data/QuestPreferences.java | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) 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 45dcec5ef92..c284309870a 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 @@ -253,6 +253,9 @@ public enum VSubmenuQuestPrefs implements IVSubmenu { pnlRewards.add(new FLabel.Builder().text("First Turn Win").fontAlign(SwingConstants.RIGHT).build(), labelConstraints); pnlRewards.add(new PrefInput(QPref.REWARDS_TURN1, QuestPreferencesErrType.REWARDS), fieldConstraints); + + pnlRewards.add(new FLabel.Builder().text("Max Life Diff. Bonus").fontAlign(SwingConstants.RIGHT).build(), labelConstraints); + pnlRewards.add(new PrefInput(QPref.REWARDS_HEALTH_DIFF, QuestPreferencesErrType.REWARDS), fieldConstraints); } private void populateDifficulty() { diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index 92a99abf01f..5808e007f58 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -322,7 +322,7 @@ public class QuestWinLoseController { } if (game.getLifeDelta() >= 50) { - lifeDifferenceCredits += Math.max(Math.min((game.getLifeDelta() - 46) / 4, 750), 0); + lifeDifferenceCredits += Math.max(Math.min((game.getLifeDelta() - 46) / 4, FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_HEALTH_DIFF)), 0); } } // End for(game) 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 910fa9e2c4e..c0cf42896ba 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java @@ -61,6 +61,9 @@ public class QuestPreferences extends PreferencesStore i REWARDS_MILLED("40"), REWARDS_ALTERNATIVE("100"), + // Max Bonus for health difference + REWARDS_HEALTH_DIFF("750"), + // If you Mulligan to 0 to start a game REWARDS_MULLIGAN0("500"), @@ -316,6 +319,7 @@ public class QuestPreferences extends PreferencesStore i case REWARDS_ALTERNATIVE: case REWARDS_TURN5: case REWARDS_TURN1: + case REWARDS_HEALTH_DIFF: case SHOP_MIN_PACKS: case SHOP_STARTING_PACKS: case SHOP_SINGLES_COMMON: