Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganized settings

Browse Source
This commit is contained in:
Anuken
2021-07-12 15:06:41 -04:00
parent f36d47c13f
commit ce6c39b7aa
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -287,7 +287,8 @@ public class SettingsMenuDialog extends Dialog{
sound.sliderPref("sfxvol", bundle.get("setting.sfxvol.name", "SFX Volume"), 100, 0, 100, 1, i -> i + "%"); sound.sliderPref("sfxvol", bundle.get("setting.sfxvol.name", "SFX Volume"), 100, 0, 100, 1, i -> i + "%");
sound.sliderPref("ambientvol", bundle.get("setting.ambientvol.name", "Ambient Volume"), 100, 0, 100, 1, i -> i + "%"); sound.sliderPref("ambientvol", bundle.get("setting.ambientvol.name", "Ambient Volume"), 100, 0, 100, 1, i -> i + "%");
game.screenshakePref(); game.sliderPref("saveinterval", 60, 10, 5 * 120, 10, i -> Core.bundle.format("setting.seconds", i));
if(mobile){ if(mobile){
game.checkPref("autotarget", true); game.checkPref("autotarget", true);
game.checkPref("keyboard", false, val -> { game.checkPref("keyboard", false, val -> {
@@ -308,7 +309,6 @@ public class SettingsMenuDialog extends Dialog{
control.setInput(new MobileInput()); control.setInput(new MobileInput());
} }
}*/ }*/
game.sliderPref("saveinterval", 60, 10, 5 * 120, 10, i -> Core.bundle.format("setting.seconds", i));
if(!mobile){ if(!mobile){
game.checkPref("crashreport", true); game.checkPref("crashreport", true);
@@ -351,6 +351,8 @@ public class SettingsMenuDialog extends Dialog{
Core.settings.put("uiscalechanged", s != lastUiScale[0]); Core.settings.put("uiscalechanged", s != lastUiScale[0]);
return s + "%"; return s + "%";
}); });
graphics.sliderPref("screenshake", 4, 0, 8, i -> (i / 4f) + "x");
graphics.sliderPref("fpscap", 240, 15, 245, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s))); graphics.sliderPref("fpscap", 240, 15, 245, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%"); graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%");
graphics.sliderPref("lasersopacity", 100, 0, 100, 5, s -> { graphics.sliderPref("lasersopacity", 100, 0, 100, 5, s -> {
@@ -560,10 +562,6 @@ public class SettingsMenuDialog extends Dialog{
rebuild(); rebuild();
} }
public void screenshakePref(){
sliderPref("screenshake", bundle.get("setting.screenshake.name", "Screen Shake"), 4, 0, 8, i -> (i / 4f) + "x");
}
public SliderSetting sliderPref(String name, String title, int def, int min, int max, StringProcessor s){ public SliderSetting sliderPref(String name, String title, int def, int min, int max, StringProcessor s){
return sliderPref(name, title, def, min, max, 1, s); return sliderPref(name, title, def, min, max, 1, s);
} }
@@ -701,7 +699,7 @@ public class SettingsMenuDialog extends Dialog{
slider.change(); slider.change();
table.stack(slider, value).width(420f).left().padTop(4); table.stack(slider, value).width(Math.min(Core.graphics.getWidth() / 1.2f, 460f)).left().padTop(4);
table.row(); table.row();
} }
} }