Merge branch 'change-quest-starting-difficulties' into 'master'

Change quest difficulties

Closes #1674

See merge request core-developers/forge!3608
This commit is contained in:
Michael Kamensky
2021-01-16 16:34:35 +00:00
9 changed files with 34 additions and 34 deletions

View File

@@ -87,10 +87,10 @@ public class QuestFileLister extends JPanel {
this.add(rowTitle, "w 98%!, h 30px!, gapleft 1%");
Map<Integer, String> difficultyNameMap = new HashMap<>();
difficultyNameMap.put(0, Localizer.getInstance().getMessage("rbEasy"));
difficultyNameMap.put(1, Localizer.getInstance().getMessage("rbMedium"));
difficultyNameMap.put(2, Localizer.getInstance().getMessage("rbHard"));
difficultyNameMap.put(3, Localizer.getInstance().getMessage("rbExpert"));
difficultyNameMap.put(0, Localizer.getInstance().getMessage("questDifficultyEasy"));
difficultyNameMap.put(1, Localizer.getInstance().getMessage("questDifficultyMedium"));
difficultyNameMap.put(2, Localizer.getInstance().getMessage("questDifficultyHard"));
difficultyNameMap.put(3, Localizer.getInstance().getMessage("questDifficultyExpert"));
RowPanel row;
String mode;

View File

@@ -228,10 +228,10 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
pnlDifficulty.removeAll();
pnlDifficulty.add(lblErrDifficulty, "w 100%!, h 30px!, span 5 1");
pnlDifficulty.add(new FLabel.Builder().text("").build(), labelConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("lblEasy")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("lblMedium")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("lblHard")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("lblExpert")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("questDifficultyEasy")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("questDifficultyMedium")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("questDifficultyHard")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("questDifficultyExpert")).build(), fieldConstraints);
pnlDifficulty.add(new FLabel.Builder().text(localizer.getMessage("lblWinsforBooster")).fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
pnlDifficulty.add(new PrefInput(QPref.WINS_BOOSTER_EASY, QuestPreferencesErrType.DIFFICULTY), fieldConstraints);
pnlDifficulty.add(new PrefInput(QPref.WINS_BOOSTER_MEDIUM, QuestPreferencesErrType.DIFFICULTY), fieldConstraints);

View File

@@ -48,10 +48,10 @@ public enum VSubmenuQuestStart implements IVSubmenu<CSubmenuQuestStart> {
private final JPanel pnlOptions = new JPanel();
/* First column */
private final FRadioButton radEasy = new FRadioButton(localizer.getMessage("rbEasy"));
private final FRadioButton radMedium = new FRadioButton(localizer.getMessage("rbMedium"));
private final FRadioButton radHard = new FRadioButton(localizer.getMessage("rbHard"));
private final FRadioButton radExpert = new FRadioButton(localizer.getMessage("rbExpert"));
private final FRadioButton radEasy = new FRadioButton(localizer.getMessage("questDifficultyEasy"));
private final FRadioButton radMedium = new FRadioButton(localizer.getMessage("questDifficultyMedium"));
private final FRadioButton radHard = new FRadioButton(localizer.getMessage("questDifficultyHard"));
private final FRadioButton radExpert = new FRadioButton(localizer.getMessage("questDifficultyExpert"));
private final FCheckBox boxFantasy = new FCheckBox(localizer.getMessage("rbFantasyMode"));
private final FCheckBox boxCommander = new FCheckBox(localizer.getMessage("rbCommanderSubformat"));