From cce270ba72fb5b56458b3ce07d380dac7710ff70 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 14 Feb 2019 21:15:46 +0700 Subject: [PATCH] moved controls to submenus in "Customize Controls" menu What is done: D1. Controls are separated by existing sections, each section is now a submenu; D2. The original sections are preserved; D3. The original controls order is preserved; D4. "Controls" section is renamed to "Game", because "Controls" submenu of "Customize Controls" would be too confusing; D5. Map (automap) controls are added as a section, map controls submenu is unchanged; D6. Missing controls are added to "Other" section; D7. Sections are given a title following the scheme "Customize
Controls", except N4 (see below). D8. Inside the sections, spaces are added to group the related controls. Things that I'm not sure about: N1. "Game" controls section name is too generic - I'll gladly change it to something more suitable; N2. "Other" controls section name is too generic - I'll gladly change it to something more suitable; N3. Map controls submenu could use some spacing, and internal title ("Map Controls") is redundant; N4. "Strife Popup Screens" section name is too long to fit in scheme described in D7, therefore the title is "Strife Popup Screens Controls"; N5. "Game" section could be divided further, but this will break the original menu structure. --- wadsrc/static/language.enu | 21 +++ wadsrc/static/menudef.txt | 259 ++++++++++++++++++++++++++----------- 2 files changed, 206 insertions(+), 74 deletions(-) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 14f7aa74b..7e1ac20ae 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -1778,6 +1778,27 @@ CNTRLMNU_TOGGLERUN = "Toggle Run"; CNTRLMNU_STRAFE = "Strafe"; CNTRLMNU_SCOREBOARD = "Show Scoreboard"; CNTRLMNU_TOGGLESCOREBOARD = "Toggle Scoreboard"; +CNTRLMNU_ACTION = "Action"; +CNTRLMNU_ACTION_TITLE = "Customize Action Controls"; +CNTRLMNU_CHAT_TITLE = "Customize Chat Controls"; +CNTRLMNU_WEAPONS_TITLE = "Customize Weapon Controls"; +CNTRLMNU_INVENTORY_TITLE = "Customize Inventory Controls"; +CNTRLMNU_OTHER_TITLE = "Customize Other Controls"; +CNTRLMNU_POPUPS_TITLE = "Strife Popup Screens Controls"; +CNTRLMNU_PAUSE = "Pause"; +CNTRLMNU_DISPLAY_INC = "Increase Display Size"; +CNTRLMNU_DISPLAY_DEC = "Decrease Display Size"; +CNTRLMNU_OPEN_HELP = "Open Help"; +CNTRLMNU_OPEN_SAVE = "Open Save Menu"; +CNTRLMNU_OPEN_LOAD = "Open Load Menu"; +CNTRLMNU_OPEN_OPTIONS = "Open Options Menu"; +CNTRLMNU_OPEN_DISPLAY = "Open Display Menu"; +CNTRLMNU_QUICKSAVE = "Quicksave"; +CNTRLMNU_QUICKLOAD = "Quickload"; +CNTRLMNU_EXIT_TO_MAIN = "Exit to Main Menu"; +CNTRLMNU_TOGGLE_MESSAGES = "Toggle Messages"; +CNTRLMNU_MENU_QUIT = "Quit Game"; +CNTRLMNU_ADJUST_GAMMA = "Adjust Gamma"; CNTRLMNU_CHAT = "Chat"; CNTRLMNU_SAY = "Say"; CNTRLMNU_TEAMSAY = "Team say"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index d90160f92..f24b139fc 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -425,81 +425,192 @@ ListMenu "PlayerMenu" OptionMenu "CustomizeControls" protected { Title "$CNTRLMNU_TITLE" + + StaticText "" + Submenu "$CNTRLMNU_ACTION" , "ActionControlsMenu" + + StaticText "" + Submenu "$CNTRLMNU_CHAT" , "ChatControlsMenu" + + StaticText "" + Submenu "$CNTRLMNU_WEAPONS" , "WeaponsControlMenu" + + StaticText "" + Submenu "$CNTRLMNU_INVENTORY" , "InventoryControlsMenu" + + StaticText "" + Submenu "$CNTRLMNU_OTHER" , "OtherControlsMenu" + + StaticText "" + Submenu "$CNTRLMNU_POPUPS" , "StrifeControlsMenu" + + StaticText "" + Submenu "$MAPCNTRLMNU_CONTROLS" , "MapControlsMenu" +} + +OptionMenu "ActionControlsMenu" protected +{ + Title "$CNTRLMNU_ACTION_TITLE" ScrollTop 2 - StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" - StaticText "" - StaticText "$CNTRLMNU_CONTROLS", 1 - Control "$CNTRLMNU_ATTACK", "+attack" - Control "$CNTRLMNU_ALTATTACK", "+altattack" - Control "$CNTRLMNU_RELOAD", "+reload" - Control "$CNTRLMNU_ZOOM", "+zoom" - Control "$CNTRLMNU_USER1", "+user1" - Control "$CNTRLMNU_USER2", "+user2" - Control "$CNTRLMNU_USER3", "+user3" - Control "$CNTRLMNU_USER4", "+user4" - Control "$CNTRLMNU_USE", "+use" - Control "$CNTRLMNU_FORWARD", "+forward" - Control "$CNTRLMNU_BACK", "+back" - Control "$CNTRLMNU_MOVELEFT", "+moveleft" - Control "$CNTRLMNU_MOVERIGHT", "+moveright" - Control "$CNTRLMNU_TURNLEFT", "+left" - Control "$CNTRLMNU_TURNRIGHT", "+right" - Control "$CNTRLMNU_TURN180", "turn180" - Control "$CNTRLMNU_JUMP", "+jump" - Control "$CNTRLMNU_CROUCH", "+crouch" - Control "$CNTRLMNU_TOGGLECROUCH", "crouch" - Control "$CNTRLMNU_MOVEUP", "+moveup" - Control "$CNTRLMNU_MOVEDOWN", "+movedown" - Control "$CNTRLMNU_LAND", "land" - Control "$CNTRLMNU_MOUSELOOK", "+mlook" - Control "$CNTRLMNU_KEYBOARDLOOK", "+klook" - Control "$CNTRLMNU_LOOKUP", "+lookup" - Control "$CNTRLMNU_LOOKDOWN", "+lookdown" - Control "$CNTRLMNU_CENTERVIEW", "centerview" - Control "$CNTRLMNU_RUN", "+speed" - Control "$CNTRLMNU_TOGGLERUN", "toggle cl_run" - Control "$CNTRLMNU_STRAFE", "+strafe" - Control "$CNTRLMNU_SCOREBOARD", "+showscores" - Control "$CNTRLMNU_TOGGLESCOREBOARD", "togglescoreboard" - StaticText "" - StaticText "$CNTRLMNU_CHAT", 1 - Control "$CNTRLMNU_SAY", "messagemode" - Control "$CNTRLMNU_TEAMSAY", "messagemode2" - StaticText "" - StaticText "$CNTRLMNU_WEAPONS", 1 - Control "$CNTRLMNU_NEXTWEAPON", "weapnext" - Control "$CNTRLMNU_PREVIOUSWEAPON", "weapprev" - Control "$CNTRLMNU_SLOT1", "slot 1" - Control "$CNTRLMNU_SLOT2", "slot 2" - Control "$CNTRLMNU_SLOT3", "slot 3" - Control "$CNTRLMNU_SLOT4", "slot 4" - Control "$CNTRLMNU_SLOT5", "slot 5" - Control "$CNTRLMNU_SLOT6", "slot 6" - Control "$CNTRLMNU_SLOT7", "slot 7" - Control "$CNTRLMNU_SLOT8", "slot 8" - Control "$CNTRLMNU_SLOT9", "slot 9" - Control "$CNTRLMNU_SLOT0", "slot 0" - StaticText "" - StaticText "$CNTRLMNU_INVENTORY", 1 - Control "$CNTRLMNU_USEITEM", "invuse" - Control "$CNTRLMNU_USEALLITEMS", "invuseall" - Control "$CNTRLMNU_NEXTITEM", "invnext" - Control "$CNTRLMNU_PREVIOUSITEM", "invprev" - Control "$CNTRLMNU_DROPITEM", "invdrop" - Control "$CNTRLMNU_QUERYITEM", "invquery" - Control "$CNTRLMNU_DROPWEAPON", "weapdrop" - StaticText "" - StaticText "$CNTRLMNU_OTHER", 1 - Control "$CNTRLMNU_AUTOMAP", "togglemap" - Control "$CNTRLMNU_CHASECAM", "chase" - Control "$CNTRLMNU_COOPSPY", "spynext" - Control "$CNTRLMNU_SCREENSHOT", "screenshot" - Control "$CNTRLMNU_CONSOLE", "toggleconsole" - StaticText "" - StaticText "$CNTRLMNU_POPUPS", 1 - Control "$CNTRLMNU_MISSION", "showpop 1" - Control "$CNTRLMNU_KEYS", "showpop 2" - Control "$CNTRLMNU_STATS", "showpop 3" + StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" + + StaticText "" + Control "$CNTRLMNU_ATTACK" , "+attack" + Control "$CNTRLMNU_ALTATTACK" , "+altattack" + Control "$CNTRLMNU_RELOAD" , "+reload" + Control "$CNTRLMNU_ZOOM" , "+zoom" + + StaticText "" + Control "$CNTRLMNU_USE" , "+use" + + StaticText "" + Control "$CNTRLMNU_FORWARD" , "+forward" + Control "$CNTRLMNU_BACK" , "+back" + Control "$CNTRLMNU_MOVELEFT" , "+moveleft" + Control "$CNTRLMNU_MOVERIGHT" , "+moveright" + + StaticText "" + Control "$CNTRLMNU_TURNLEFT" , "+left" + Control "$CNTRLMNU_TURNRIGHT" , "+right" + Control "$CNTRLMNU_TURN180" , "turn180" + + StaticText "" + Control "$CNTRLMNU_JUMP" , "+jump" + Control "$CNTRLMNU_CROUCH" , "+crouch" + Control "$CNTRLMNU_TOGGLECROUCH" , "crouch" + + StaticText "" + Control "$CNTRLMNU_MOVEUP" , "+moveup" + Control "$CNTRLMNU_MOVEDOWN" , "+movedown" + Control "$CNTRLMNU_LAND" , "land" + + StaticText "" + Control "$CNTRLMNU_MOUSELOOK" , "+mlook" + Control "$CNTRLMNU_KEYBOARDLOOK" , "+klook" + Control "$CNTRLMNU_LOOKUP" , "+lookup" + Control "$CNTRLMNU_LOOKDOWN" , "+lookdown" + Control "$CNTRLMNU_CENTERVIEW" , "centerview" + + StaticText "" + Control "$CNTRLMNU_RUN" , "+speed" + Control "$CNTRLMNU_TOGGLERUN" , "toggle cl_run" + Control "$CNTRLMNU_STRAFE" , "+strafe" + + StaticText "" + Control "$CNTRLMNU_SCOREBOARD" , "+showscores" + Control "$CNTRLMNU_TOGGLESCOREBOARD" , "togglescoreboard" + + StaticText "" + Control "$CNTRLMNU_USER1" , "+user1" + Control "$CNTRLMNU_USER2" , "+user2" + Control "$CNTRLMNU_USER3" , "+user3" + Control "$CNTRLMNU_USER4" , "+user4" +} + +OptionMenu "ChatControlsMenu" protected +{ + Title "$CNTRLMNU_CHAT_TITLE" + ScrollTop 2 + StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" + + StaticText "" + Control "$CNTRLMNU_SAY" , "messagemode" + Control "$CNTRLMNU_TEAMSAY" , "messagemode2" +} + +OptionMenu "WeaponsControlMenu" protected +{ + Title "$CNTRLMNU_WEAPONS_TITLE" + ScrollTop 2 + StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" + + StaticText "" + Control "$CNTRLMNU_NEXTWEAPON" , "weapnext" + Control "$CNTRLMNU_PREVIOUSWEAPON" , "weapprev" + + StaticText "" + Control "$CNTRLMNU_SLOT1" , "slot 1" + Control "$CNTRLMNU_SLOT2" , "slot 2" + Control "$CNTRLMNU_SLOT3" , "slot 3" + Control "$CNTRLMNU_SLOT4" , "slot 4" + Control "$CNTRLMNU_SLOT5" , "slot 5" + Control "$CNTRLMNU_SLOT6" , "slot 6" + Control "$CNTRLMNU_SLOT7" , "slot 7" + Control "$CNTRLMNU_SLOT8" , "slot 8" + Control "$CNTRLMNU_SLOT9" , "slot 9" + Control "$CNTRLMNU_SLOT0" , "slot 0" +} + +OptionMenu "InventoryControlsMenu" protected +{ + Title "$CNTRLMNU_INVENTORY_TITLE" + ScrollTop 2 + StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" + + StaticText "" + Control "$CNTRLMNU_USEITEM" , "invuse" + Control "$CNTRLMNU_USEALLITEMS" , "invuseall" + + StaticText "" + Control "$CNTRLMNU_NEXTITEM" , "invnext" + Control "$CNTRLMNU_PREVIOUSITEM" , "invprev" + + StaticText "" + Control "$CNTRLMNU_DROPITEM" , "invdrop" + Control "$CNTRLMNU_QUERYITEM" , "invquery" + + StaticText "" + Control "$CNTRLMNU_DROPWEAPON" , "weapdrop" +} + +OptionMenu "OtherControlsMenu" protected +{ + Title "$CNTRLMNU_OTHER_TITLE" + ScrollTop 2 + StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" + + StaticText "" + Control "$CNTRLMNU_AUTOMAP" , "togglemap" + + StaticText "" + Control "$CNTRLMNU_CHASECAM" , "chase" + Control "$CNTRLMNU_COOPSPY" , "spynext" + + StaticText "" + Control "$CNTRLMNU_SCREENSHOT" , "screenshot" + Control "$CNTRLMNU_CONSOLE" , "toggleconsole" + Control "$CNTRLMNU_PAUSE" , "pause" + + StaticText "" + Control "$CNTRLMNU_DISPLAY_INC" , "sizeup" + Control "$CNTRLMNU_DISPLAY_DEC" , "sizedown" + Control "$CNTRLMNU_TOGGLE_MESSAGES" , "togglemessages" + Control "$CNTRLMNU_ADJUST_GAMMA" , "bumpgamma" + + StaticText "" + Control "$CNTRLMNU_OPEN_HELP" , "menu_help" + Control "$CNTRLMNU_OPEN_SAVE" , "menu_save" + Control "$CNTRLMNU_OPEN_LOAD" , "menu_load" + Control "$CNTRLMNU_OPEN_OPTIONS" , "menu_options" + Control "$CNTRLMNU_OPEN_DISPLAY" , "menu_display" + Control "$CNTRLMNU_EXIT_TO_MAIN" , "menu_endgame" + Control "$CNTRLMNU_MENU_QUIT" , "menu_quit" + + StaticText "" + Control "$CNTRLMNU_QUICKSAVE" , "quicksave" + Control "$CNTRLMNU_QUICKLOAD" , "quickload" +} + +OptionMenu "StrifeControlsMenu" protected +{ + Title "$CNTRLMNU_POPUPS_TITLE" + ScrollTop 2 + StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" + + StaticText "" + Control "$CNTRLMNU_MISSION" , "showpop 1" + Control "$CNTRLMNU_KEYS" , "showpop 2" + Control "$CNTRLMNU_STATS" , "showpop 3" } //-------------------------------------------------------------------------------------------