From f8ccf0a91ee6366b14e0ddddde067d45e4208358 Mon Sep 17 00:00:00 2001 From: Seravy Date: Fri, 9 Feb 2018 10:25:35 +0100 Subject: [PATCH] Adding suggested simplification --- .../java/forge/quest/QuestWinLoseController.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index 72bf63ab945..c76bcd4d4c5 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -229,17 +229,10 @@ public class QuestWinLoseController { sb.append(StringUtils.capitalize(qEvent.getDifficulty().getTitle())); sb.append(" opponent: ").append(credBase).append(" credits.\n"); - final int creditsForPreviousWins; - if (FModel.getQuestPreferences() - .getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX) > qData.getAchievements().getWin()) { - creditsForPreviousWins = (int) ((Double.parseDouble(FModel.getQuestPreferences() - .getPref(QPref.REWARDS_WINS_MULTIPLIER)) * qData.getAchievements().getWin())); - } else { - creditsForPreviousWins = (int) ((Double.parseDouble(FModel.getQuestPreferences() - .getPref(QPref.REWARDS_WINS_MULTIPLIER)) * FModel.getQuestPreferences() - .getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX))); - } - + int multiplayer = 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)); + credBase += creditsForPreviousWins; sb.append("Bonus for previous wins: ").append(creditsForPreviousWins).append(