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

Merge branch 'LifeTotalBonusOption' into 'master'

Browse Source 
Life total bonus option

See merge request core-developers/forge!176
This commit is contained in:
Sol
2018-02-13 02:57:25 +00:00
parent dc11fad342 5dc5082c4e
commit 5e5fca9722
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
View File

@@ -263,6 +263,9 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
pnlRewards.add(new FLabel.Builder().text("First Turn Win").fontAlign(SwingConstants.RIGHT).build(), labelConstraints); 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 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_MAX, QuestPreferencesErrType.REWARDS), fieldConstraints);
} }
private void populateDifficulty() { private void populateDifficulty() {

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

@@ -324,7 +324,7 @@ public class QuestWinLoseController {
} }
if (game.getLifeDelta() >= 50) { 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_MAX)), 0);
} }
} // End for(game) } // End for(game)

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

@@ -63,6 +63,9 @@ public class QuestPreferences extends PreferencesStore<QuestPreferences.QPref> i
REWARDS_MILLED("40"), REWARDS_MILLED("40"),
REWARDS_ALTERNATIVE("100"), REWARDS_ALTERNATIVE("100"),
// Max Bonus for health difference
REWARDS_HEALTH_DIFF_MAX("750"),
// If you Mulligan to 0 to start a game // If you Mulligan to 0 to start a game
REWARDS_MULLIGAN0("500"), REWARDS_MULLIGAN0("500"),
@@ -321,6 +324,7 @@ public class QuestPreferences extends PreferencesStore<QuestPreferences.QPref> i
case REWARDS_ALTERNATIVE: case REWARDS_ALTERNATIVE:
case REWARDS_TURN5: case REWARDS_TURN5:
case REWARDS_TURN1: case REWARDS_TURN1:
case REWARDS_HEALTH_DIFF_MAX:
case SHOP_MIN_PACKS: case SHOP_MIN_PACKS:
case SHOP_STARTING_PACKS: case SHOP_STARTING_PACKS:
case SHOP_SINGLES_COMMON: case SHOP_SINGLES_COMMON: