From 8377d89c847556ac16085e133ad28f9ea5fe67c2 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Sat, 14 Aug 2010 11:28:11 +0000 Subject: [PATCH] menu improvements git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5621 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus_settings.cfg | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index a8aeaf01..d1eeaeb9 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -3,7 +3,8 @@ newmenu settings menuitem "Video settings" "showmenu video" menuitem "Head-Up Display settings" "showmenu HUD" menuitem "Gameplay settings" "showmenu gameplay" -menuitem "Input controls" "showmenu controls" +menuitem "Keyboard settings" "showmenu Keyboard" +menuitem "Mouse settings" "showmenu Mouse" menuitem "Sound settings" "showmenu sound" menuitem "Misc settings" "showmenu Misc" menuitem "" -1 @@ -43,14 +44,15 @@ menuitem "Police" "skin_rvsf 5" "chmenumdl RVSF playermodels/RVSF/06 a newmenu "QUICK setup" -menuitemtextinput "Nickname: " "" "name $arg1" -menuitemtextinput "Resolution (Width): " "$scr_w" "scr_w $arg1" -menuitemtextinput "Resolution (Height): " "$scr_h" "scr_h $arg1" -menuitemtextinput "Mouse sensitivity " "$sensitivity" "sensitivity $arg1" +menuitemtextinput "Nickname:" "" "name $arg1" +menuitemtextinput "Resolution (Width): " "$scr_w" "scr_w $arg1" +menuitemtextinput "Resolution (Height): " "$scr_h" "scr_h $arg1" +menuitemtextinput "Mouse sensitivity: " "$sensitivity" "sensitivity $arg1" +menuitemcheckbox "Reduced violence mode: " "$poniesmodeon" "reducedviolencemode $arg1" menuitemslider "Graphics detail: " 1 6 "$gfxqualityalias" 1 [ Horrible Low Medium Good "High (Performs slow)" "INSANE! (Performs really slow)"] "new_gfx_quality $arg1" menuitemslider "Sound detail: " 1 3 "$soundqualityalias" 1 "Low Medium High" "new_sound_quality $arg1" menuitem "" -1 -menuitem " 2 [ OK ]" [ closemenu "QUICK setup"; resetgl ] +menuitem " 2 [ OK ]" [ closemenu "QUICK setup"; resetgl ] alias new_gfx_quality [ @@ -226,7 +228,7 @@ menuitemcheckbox "Yes, reset all settings: " "alias resetyes 1" "alias resetyes menuitem " 2 [ Apply! ] " [ if $resetyes [ resetcfg 1; quit ] [ showmenu "" ] ] [ echo " 3If the above option is ticked, AssaultCube will now quit and your settings will be reset." ] //If checkbox is ticked, reset settings and quit, otherwise, close menus. -newmenu controls +newmenu Keyboard menuitem "Select an action and press ENTER to bind a new key:" -1 menuitem "" -1 @@ -251,20 +253,21 @@ menuitemkeyinput "Screenshot: " screenshot menuitemkeyinput "Map overview: " toggleshowmap menuitemkeyinput "Drop CTF flag: " dropflag menuitemkeyinput "Fullscreen: " fullscreenscript -menuitem "" -1 // Invert mouse is a slider instead of a checkbox so the 2 sensitivity textboxes don't look weird. -menuitemslider "Invert mouse: " 0 1 "$invmouse" 1 "Disabled Enabled" "invmouse $arg1" +menuitem "" -1 +menuitem "Reset keybinds to default settings..." [ showmenu "Reset Binds" ] + +newmenu "Mouse" +menuitemcheckbox "Invert mouse: " "$invmouse" "invmouse $arg1" +menuitemcheckbox "Automatic Sniper-scope sensitivity: " "$autoscopesens" "autoscopesens $arg1" menuitemtextinput "Mouse Sensitivity: " "$sensitivity" "sensitivity $arg1" menuitemtextinput "Mouse Acceleration: " "$mouseaccel" "mouseaccel $arg1" menuitemtextinput "Filter mouse (for bad ones): " "$mfilter" "mfilter $arg1" menuitemtextinput "Sniper-scope sensitivity scale: " "$scopesensscale" "scopesensscale $arg1" -menuitemcheckbox "Automatic Sniper-scope sensitivity: " "$autoscopesens" "autoscopesens $arg1" -menuitem "" -1 -menuitem "Reset keybinds to default settings..." [ showmenu "Reset Binds" ] newmenu "Reset Binds" menuinit [ alias resetbindsyes 0 ] // Ensures this menu works correctly. menuitemcheckbox "Yes, reset all binds: " "alias resetbindsyes 1" "alias resetbindsyes $arg1" -menuitem " 2 [ Apply! ] " [ if $resetbindsyes [ resetbinds ] [ showmenu "" ] ] +menuitem " 2 [ Apply! ] " [ if $resetbindsyes [ resetbinds ] [ showmenu "" ] ] newmenu video @@ -332,7 +335,7 @@ menuitem "Enable 0.93 FOV compatiblity..." [ fovcompat; sleep 100 [ fovcompatmen menuitem "" -1 menuitem "FPS Range..." [ showmenu "FPS Range" ] menuitem "" -1 -menuitem " 2 [ Apply now! ] " "resetgl" +menuitem " 2 [ Apply now! ]" "resetgl" alias fovcompatmenu [ showmenu settings; showmenu video; showmenu "Advanced video settings" ] @@ -377,13 +380,13 @@ alias reducedviolencemode [ blood 0 gib 0 mutesound 48 0; loop i 8 [ mutesound (+ $i 26) 0 ] // Mute pain sounds: 26 to 33 and 48 - echo "OMG!PWNIES! mode enabled - Violent game content has now been reduced." + echo " 2OMG! 8PW 1NI 3ES 5! mode enabled - Violent game content has now been reduced." ] [ // Violent alias poniesmodeon 0 blood 1 gib 1 mutesound 48 1; loop i 8 [ mutesound (+ $i 26) 1 ] // Un-mute pain sounds - echo "OMG!PWNIES! mode disabled." + echo " 2OMG! 8PW 1NI 3ES 5! mode has been disabled." ] ] @@ -427,9 +430,9 @@ menuitem "" -1 menuitem "Mute/Un-mute specific sounds..." [ showmenu "Mute specific sounds" ] menuitem "" -1 menuitem "Advanced settings:" -1 -menuitemslider " Sounds at once: " 0 100 "$maxsoundsatonce" 2 "" "maxsoundsatonce $arg1" menuitemcheckbox " Footsteps: " "$footsteps" "footsteps $arg1" menuitemcheckbox " Disable own footsteps: " "(= $localfootsteps)" "localfootsteps (! $arg1)" +menuitemslider " Sounds at once: " 0 100 "$maxsoundsatonce" 2 "" "maxsoundsatonce $arg1" menuitemslider " Voice-coms: " 0 2 "$voicecomsounds" 1 [Off On "Team only"] "voicecomsounds $arg1" newmenu "Mute specific sounds"