From bded1d604a0aec7b67b0e72a1263bd18111d560e Mon Sep 17 00:00:00 2001 From: Wario Date: Wed, 1 Aug 2018 11:21:07 +0000 Subject: [PATCH 1/3] Fix for Quest Reward Multiplier Issue --- forge-gui/src/main/java/forge/quest/QuestWinLoseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index 06226569840..70a8fb81c6d 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -226,7 +226,7 @@ public class QuestWinLoseController { sb.append(StringUtils.capitalize(qEvent.getDifficulty().getTitle())); sb.append(" opponent: ").append(credBase).append(" credits.\n"); - int multiplayer = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX)); + int multiplier = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX)); final int creditsForPreviousWins = (int) ((Double.parseDouble(FModel.getQuestPreferences() .getPref(QPref.REWARDS_WINS_MULTIPLIER)) * multiplier)); From 33d7596cacc70c78316e0289ec00eac867e62f92 Mon Sep 17 00:00:00 2001 From: Wario Date: Wed, 1 Aug 2018 12:25:11 +0000 Subject: [PATCH 2/3] Update QuestWinLoseController.java --- forge-gui/src/main/java/forge/quest/QuestWinLoseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index 70a8fb81c6d..621c2b74e3e 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -226,7 +226,7 @@ public class QuestWinLoseController { sb.append(StringUtils.capitalize(qEvent.getDifficulty().getTitle())); sb.append(" opponent: ").append(credBase).append(" credits.\n"); - int multiplier = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX)); + multiplier = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX)); final int creditsForPreviousWins = (int) ((Double.parseDouble(FModel.getQuestPreferences() .getPref(QPref.REWARDS_WINS_MULTIPLIER)) * multiplier)); From e2e0123d2b78e38738cec7182b6fe3ac9f9d44d1 Mon Sep 17 00:00:00 2001 From: Wario Date: Wed, 1 Aug 2018 20:37:58 +0000 Subject: [PATCH 3/3] Update QuestWinLoseController.java --- .../src/main/java/forge/quest/QuestWinLoseController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index 621c2b74e3e..2e93e7d4fec 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -226,9 +226,9 @@ public class QuestWinLoseController { sb.append(StringUtils.capitalize(qEvent.getDifficulty().getTitle())); sb.append(" opponent: ").append(credBase).append(" credits.\n"); - multiplier = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX)); + final int winMultiplier = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX)); final int creditsForPreviousWins = (int) ((Double.parseDouble(FModel.getQuestPreferences() - .getPref(QPref.REWARDS_WINS_MULTIPLIER)) * multiplier)); + .getPref(QPref.REWARDS_WINS_MULTIPLIER)) * winMultiplier)); credBase += creditsForPreviousWins;