external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix for Quest Reward Multiplier Issue

See merge request core-developers/forge!820
This commit is contained in:
Michael Kamensky
2018-08-02 03:50:49 +00:00
parent ac4d476ab3 e2e0123d2b
commit 001a51a070
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/quest/QuestWinLoseController.java
View File

@@ -226,9 +226,9 @@ public class QuestWinLoseController {
sb.append(StringUtils.capitalize(qEvent.getDifficulty().getTitle())); sb.append(StringUtils.capitalize(qEvent.getDifficulty().getTitle()));
sb.append(" opponent: ").append(credBase).append(" credits.\n"); sb.append(" opponent: ").append(credBase).append(" credits.\n");
int multiplayer = 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() final int creditsForPreviousWins = (int) ((Double.parseDouble(FModel.getQuestPreferences()
.getPref(QPref.REWARDS_WINS_MULTIPLIER)) * multiplier)); .getPref(QPref.REWARDS_WINS_MULTIPLIER)) * winMultiplier));
credBase += creditsForPreviousWins; credBase += creditsForPreviousWins;