From 1adceb82ef93bdfc9c2bc306d68382bb6046369b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 26 Nov 2019 21:06:43 +0100 Subject: [PATCH] - consolidation of defbinds definitions. Putting all the generic definitions in files used by all games greatly reduces the clutter and chance for errors. --- source/common/console/c_bind.cpp | 16 ++-- source/common/console/c_bind.h | 3 +- source/common/menu/listmenu.cpp | 2 +- wadsrc/static/demolition/commonbinds.txt | 64 ++++++++++++++++ wadsrc/static/demolition/defbinds.all | 15 ---- wadsrc/static/demolition/defbinds.txt | 18 +++++ wadsrc/static/demolition/leftbinds.txt | 14 ++++ .../filter/blood/demolition/defbinds.txt | 69 +---------------- .../filter/blood/demolition/leftbinds.txt | 68 +---------------- .../filter/blood/demolition/origbinds.txt | 69 +---------------- .../filter/duke/demolition/defbinds.txt | 68 +---------------- .../filter/duke/demolition/leftbinds.txt | 64 +--------------- .../filter/duke/demolition/origbinds.txt | 75 ++----------------- .../filter/ionfury/demolition/defbinds.txt | 64 +--------------- .../filter/ionfury/demolition/leftbinds.txt | 64 ---------------- .../filter/ionfury/demolition/origbinds.txt | 65 ---------------- .../static/filter/nam/demolition/defbinds.txt | 68 +---------------- .../filter/nam/demolition/leftbinds.txt | 68 +---------------- .../filter/nam/demolition/origbinds.txt | 73 ++---------------- .../filter/redneck/demolition/defbinds.txt | 69 +---------------- .../filter/redneck/demolition/leftbinds.txt | 71 +----------------- .../filter/redneck/demolition/origbinds.txt | 72 ++---------------- .../shadowwarrior/demolition/defbinds.txt | 41 +--------- .../shadowwarrior/demolition/leftbinds.txt | 59 --------------- .../shadowwarrior/demolition/origbinds.txt | 64 +--------------- .../filter/ww2gi/demolition/defbinds.txt | 68 +---------------- .../filter/ww2gi/demolition/leftbinds.txt | 69 +---------------- .../filter/ww2gi/demolition/origbinds.txt | 74 ++---------------- 28 files changed, 167 insertions(+), 1367 deletions(-) create mode 100644 wadsrc/static/demolition/commonbinds.txt delete mode 100644 wadsrc/static/demolition/defbinds.all create mode 100644 wadsrc/static/demolition/defbinds.txt create mode 100644 wadsrc/static/demolition/leftbinds.txt diff --git a/source/common/console/c_bind.cpp b/source/common/console/c_bind.cpp index b504bb41e..bae950673 100644 --- a/source/common/console/c_bind.cpp +++ b/source/common/console/c_bind.cpp @@ -649,7 +649,7 @@ CCMD(rebind) // //============================================================================= -void ReadBindings(int lump) +void ReadBindings(int lump, bool override) { FScanner sc(lump); @@ -675,20 +675,26 @@ void ReadBindings(int lump) } key = GetConfigKeyFromName(sc.String); sc.MustGetString(); - dest->SetBind(key, sc.String); + dest->SetBind(key, sc.String, override); } } void CONFIG_SetDefaultKeys(const char* baseconfig) { - auto lump = fileSystem.GetFile(baseconfig); - ReadBindings(lump); + auto lump = fileSystem.GetFile("demolition/commonbinds.txt", ELookupMode::FullName, 0); + if (lump >= 0) ReadBindings(lump, true); int lastlump = 0; + while ((lump = fileSystem.Iterate(baseconfig, &lastlump)) != -1) + { + if (fileSystem.GetFileContainer(lump) > 0) break; + ReadBindings(lump, true); + } + while ((lump = fileSystem.Iterate("defbinds.txt", &lastlump)) != -1) { - ReadBindings(lump); + ReadBindings(lump, false); } } diff --git a/source/common/console/c_bind.h b/source/common/console/c_bind.h index 9fbd32f41..11f5bd6d7 100644 --- a/source/common/console/c_bind.h +++ b/source/common/console/c_bind.h @@ -61,8 +61,9 @@ public: void DoBind (const char *key, const char *bind); void DefaultBind(const char *keyname, const char *cmd); - void SetBind(unsigned int key, const char *bind) + void SetBind(unsigned int key, const char *bind, bool override = true) { + if (!override && Binds[key].IsNotEmpty()) return; if (key < NUM_KEYS) Binds[key] = bind; } diff --git a/source/common/menu/listmenu.cpp b/source/common/menu/listmenu.cpp index 39e68cc67..86ceb66d4 100644 --- a/source/common/menu/listmenu.cpp +++ b/source/common/menu/listmenu.cpp @@ -578,7 +578,7 @@ void FListMenuItemNativeText::Drawer(DListMenu* menu, const DVector2& origin, bo { if (*text == '$') text = GStrings(text + 1); auto state = selected ? NIT_SelectedState : mEnabled ? NIT_ActiveState : NIT_InactiveState; - gi->DrawNativeMenuText(mFontnum, state, int((origin.X + mXpos) / 65536) , int((origin.Y + mYpos) / 65536), 1.f, text, menu->Descriptor()->mFlags); + gi->DrawNativeMenuText(mFontnum, state, int((origin.X + mXpos) * 65536) , int((origin.Y + mYpos) * 65536), 1.f, text, menu->Descriptor()->mFlags); } } diff --git a/wadsrc/static/demolition/commonbinds.txt b/wadsrc/static/demolition/commonbinds.txt new file mode 100644 index 000000000..e9babc5c6 --- /dev/null +++ b/wadsrc/static/demolition/commonbinds.txt @@ -0,0 +1,64 @@ +// These bindings are valid for all configurationas + +F1 "openhelpmenu" +F2 "opensavemenu" +F3 "openloadmenu" +F4 "openmenu SoundOptions" +F5 "openmeun OptionMenu" //this key performs some fuckery with the music in Duke Nukem,so the default here is Blood's. +F6 "+Quick_Save" +F7 "+Third_Person_View" +//F8 "toggle hud_messages" // this one needs a means to print the status to the quote display. +F9 "+Quick_Load" +F10 "openmenu QuitIngame" +F11 "openmenu ColorCorrection" +F12 "screenshot" +1 "+Weapon_1" +2 "+Weapon_2" +3 "+Weapon_3" +4 "+Weapon_4" +5 "+Weapon_5" +6 "+Weapon_6" +7 "+Weapon_7" +8 "+Weapon_8" +9 "+Weapon_9" +0 "+Weapon_10" +Ins "+Look_Left" +KP0 "+Look_Left" +Del "+Look_Right" +leftarrow "+Turn_Left" +rightarrow "+Turn_Right" +KP8 "+Move_Forward" +KP2 "+Move_Backward" +KP4 "+Turn_Left" +KP6 "+Turn_Right" +LAlt "+Strafe" +RAlt "+Strafe" +LShift "+Run" +RShift "+Run" +Capslock "+AutoRun" +PgUp "+Look_Up" +PgDn "+Look_Down" +Home "+Aim_Up" +End "+Aim_Down" +RCtrl "+Fire" + +Enter "+Inventory" +KP-Enter "+Inventory" +[ "+Inventory_Left" +] "+Inventory_Right" + +' "+Next_Weapon" +; "+Previous_Weapon" +` "toggleconsole" + +Backspace "+Turn_Around" +T "+Send_Message" +Tab "+Map" +F "+Map_Follow_Mode" +- "+Shrink_Screen" += "+Enlarge_Screen" +K "+See_Coop_View" + +Mouse1 "+Fire" +MWheelUp "+Previous_Weapon" +MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/demolition/defbinds.all b/wadsrc/static/demolition/defbinds.all deleted file mode 100644 index 83c9546b9..000000000 --- a/wadsrc/static/demolition/defbinds.all +++ /dev/null @@ -1,15 +0,0 @@ -// These bindings are valid for all configurationas - -F1 "openhelpmenu" -F2 "opensavemenu" -F3 "openloadmenu" -F4 "openmenu SoundOptions" -F5 "openmeun OptionMenu" //this key performs some fuckery with the music in Duke Nukem,so the default here is Blood's. -F6 "+Quick_Save" -F7 "+Third_Person_View" -//F8 "toggle hud_messages" // this one needs a means to print the status to the quote display. -F9 "+Quick_Load" -F10 "openmenu QuitIngame" -F11 "openmenu ColorCorrection" -F12 "screenshot" - diff --git a/wadsrc/static/demolition/defbinds.txt b/wadsrc/static/demolition/defbinds.txt new file mode 100644 index 000000000..eb5a41054 --- /dev/null +++ b/wadsrc/static/demolition/defbinds.txt @@ -0,0 +1,18 @@ +// Common bindings for all games (some may not be active everywhere, though) +W "+Move_Forward" +S "+Move_Backward" +E "+Open" +A "+Strafe_Left" +D "+Strafe_Right" +Space "+Jump" +/ "+Jump" +LCtrl "+Crouch" +KP7 "+Aim_Up" +KP1 "+Aim_Down" +KP5 "+Center_View" +KP9 "+Look_Up" +KP3 "+Look_Down" +KP. "+Look_Right" +KP- "+Shrink_Screen" +KP+ "+Enlarge_Screen" +Y "+Show_Opponents_Weapon" diff --git a/wadsrc/static/demolition/leftbinds.txt b/wadsrc/static/demolition/leftbinds.txt new file mode 100644 index 000000000..6f7f79710 --- /dev/null +++ b/wadsrc/static/demolition/leftbinds.txt @@ -0,0 +1,14 @@ +// Left handed config (puts as many controls as possible on the numpad. Also more useful actions on the mouse.) +uparrow "+Move_Forward" +downarrow "+Move_Backward" +LCtrl "+Fire" +Space "+Open" +A "+Jump" +KP- "+Jump" +Z "+Crouch" +KP. "+Look_Right" +KP7 "+Strafe_Left" +KP9 "+Strafe_Right" +KP. "+Look_Right" +Mouse2 "+Open" +Mouse3 "+Run" diff --git a/wadsrc/static/filter/blood/demolition/defbinds.txt b/wadsrc/static/filter/blood/demolition/defbinds.txt index 1f10c0029..22fb508cd 100644 --- a/wadsrc/static/filter/blood/demolition/defbinds.txt +++ b/wadsrc/static/filter/blood/demolition/defbinds.txt @@ -1,75 +1,10 @@ -W "+Move_Forward" -KP8 "+Move_Forward" -S "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -Backspace "+Turn_Around" -LAlt "+Strafe" -RAlt "+Strafe" -A "+Strafe_Left" -D "+Strafe_Right" -Space "+Jump" -/ "+Jump" -LCtrl "+Crouch" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -E "+Open" -RCtrl "+Fire" -X "+Alt_Fire" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -KP5 "+Center_View" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" -Tab "+Map" -F "+Map_Follow_Mode" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -T "+Send_Message" -K "+See_Coop_View" -F7 "+See_Chase_View" +// U "+Mouse_Aiming" I "+Toggle_Crosshair" -' "+Next_Weapon" -; "+Previous_Weapon" Scroll "+Holster_Weapon" -Y "+Show_Opponents_Weapon" B "+BeastVision" C "+CrystalBall" -J "+JetPack" -M "+MedKit" P "+ProximityBombs" R "+RemoteBombs" -` "toggleconsole" -Mouse1 "+Fire" +X "+Alt_Fire" Mouse2 "+Alt_Fire" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/blood/demolition/leftbinds.txt b/wadsrc/static/filter/blood/demolition/leftbinds.txt index 17101dbe1..463332ea4 100644 --- a/wadsrc/static/filter/blood/demolition/leftbinds.txt +++ b/wadsrc/static/filter/blood/demolition/leftbinds.txt @@ -1,72 +1,8 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -Backspace "+Turn_Around" -LAlt "+Strafe" -RAlt "+Strafe" -, "+Strafe_Left" -KP7 "+Strafe_Left" -. "+Strafe_Right" -KP9 "+Strafe_Right" -A "+Jump" -KP- "+Jump" -Z "+Crouch" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -Space "+Open" -LCtrl "+Fire" -RCtrl "+Fire" -X "+Alt_Fire" -Home "+Aim_Up" -End "+Aim_Down" -PgUp "+Look_Up" -PgDn "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" -Tab "+Map" -F "+Map_Follow_Mode" -- "+Shrink_Screen" -= "+Enlarge_Screen" -T "+Send_Message" -K "+See_Coop_View" -F7 "+Third_Person_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -' "+Next_Weapon" -; "+Previous_Weapon" +// Scroll "+Holster_Weapon" W "+Show_Opponents_Weapon" B "+BeastVision" C "+CrystalBall" -J "+JetPack" -M "+MedKit" P "+ProximityBombs" R "+RemoteBombs" -` "toggleconsole" -Mouse1 "+Fire" -Mouse2 "+Open" -Mouse3 "+Run" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" +X "+Alt_Fire" diff --git a/wadsrc/static/filter/blood/demolition/origbinds.txt b/wadsrc/static/filter/blood/demolition/origbinds.txt index 192221292..5fe54e583 100644 --- a/wadsrc/static/filter/blood/demolition/origbinds.txt +++ b/wadsrc/static/filter/blood/demolition/origbinds.txt @@ -1,67 +1,6 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -Backspace "+Turn_Around" -LAlt "+Strafe" -RAlt "+Strafe" -, "+Strafe_Left" -. "+Strafe_Right" -A "+Jump" -/ "+Jump" -Z "+Crouch" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -Space "+Open" -LCtrl "+Fire" -RCtrl "+Fire" -X "+Alt_Fire" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -KP5 "+Center_View" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" -Tab "+Map" -F "+Map_Follow_Mode" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -T "+Send_Message" -K "+See_Coop_View" -F7 "+Third_Person_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -' "+Next_Weapon" -; "+Previous_Weapon" +// Scroll "+Holster_Weapon" +X "+Alt_Fire" W "+Show_Opponents_Weapon" B "+BeastVision" C "+CrystalBall" @@ -69,8 +8,4 @@ J "+JetPack" M "+MedKit" P "+ProximityBombs" R "+RemoteBombs" -` "toggleconsole" -Mouse1 "+Fire" Mouse2 "+Alt_Fire" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/duke/demolition/defbinds.txt b/wadsrc/static/filter/duke/demolition/defbinds.txt index 07c52db2b..c92a8f972 100644 --- a/wadsrc/static/filter/duke/demolition/defbinds.txt +++ b/wadsrc/static/filter/duke/demolition/defbinds.txt @@ -1,74 +1,12 @@ -W "+Move_Forward" -KP8 "+Move_Forward" -S "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -RCtrl "+Fire" -E "+Open" -LShift "+Run" -RShift "+Run" -Space "+Jump" -/ "+Jump" -LCtrl "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -A "+Strafe_Left" -D "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +R "+Steroids" +Q "+Quick_Kick" H "+Holo_Duke" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" Scroll "+Holster_Weapon" -Y "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -R "+Steroids" -Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" X "+Last_Used_Weapon" C "+Toggle_Crouch" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/duke/demolition/leftbinds.txt b/wadsrc/static/filter/duke/demolition/leftbinds.txt index 8d08af393..85e0ad3fc 100644 --- a/wadsrc/static/filter/duke/demolition/leftbinds.txt +++ b/wadsrc/static/filter/duke/demolition/leftbinds.txt @@ -1,68 +1,8 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -Space "+Open" -LShift "+Run" -RShift "+Run" -A "+Jump" -KP- "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -PgDn "+Look_Down" -Ins "+Look_Left" -Del "+Look_Right" -, "+Strafe_Left" -KP7 "+Strafe_Left" -. "+Strafe_Right" -KP9 "+Strafe_Right" -Home "+Aim_Up" -End "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" H "+Holo_Duke" +R "+Steroids" +Q "+Quick_Kick" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -= "+Enlarge_Screen" Scroll "+Holster_Weapon" W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -R "+Steroids" -Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" -Mouse2 "+Open" -Mouse3 "+Run" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/duke/demolition/origbinds.txt b/wadsrc/static/filter/duke/demolition/origbinds.txt index 3cd17cb62..795737df9 100644 --- a/wadsrc/static/filter/duke/demolition/origbinds.txt +++ b/wadsrc/static/filter/duke/demolition/origbinds.txt @@ -1,75 +1,14 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -Space "+Open" -LShift "+Run" -RShift "+Run" -A "+Jump" -/ "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -. "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +R "+Steroids" +` "+Quick_Kick" +Scroll "+Holster_Weapon" +W "+Show_Opponents_Weapon" H "+Holo_Duke" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" -Scroll "+Holster_Weapon" -W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -R "+Steroids" -` "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" C "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" + + \ No newline at end of file diff --git a/wadsrc/static/filter/ionfury/demolition/defbinds.txt b/wadsrc/static/filter/ionfury/demolition/defbinds.txt index f65bbcbfb..760257501 100644 --- a/wadsrc/static/filter/ionfury/demolition/defbinds.txt +++ b/wadsrc/static/filter/ionfury/demolition/defbinds.txt @@ -1,68 +1,6 @@ -W "+Move_Forward" -KP8 "+Move_Forward" -S "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -RCtrl "+Fire" -E "+Open" -LShift "+Run" -RShift "+Run" -Space "+Jump" -/ "+Jump" -LCtrl "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -A "+Strafe_Left" -D "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" +// Scroll "+Holster_Weapon" -Y "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" X "+Last_Used_Weapon" C "+Toggle_Crouch" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/ionfury/demolition/leftbinds.txt b/wadsrc/static/filter/ionfury/demolition/leftbinds.txt index 39d507542..529143e4b 100644 --- a/wadsrc/static/filter/ionfury/demolition/leftbinds.txt +++ b/wadsrc/static/filter/ionfury/demolition/leftbinds.txt @@ -1,66 +1,2 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -Space "+Open" -LShift "+Run" -RShift "+Run" -A "+Jump" -KP- "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -KP7 "+Strafe_Left" -. "+Strafe_Right" -KP9 "+Strafe_Right" -Home "+Aim_Up" -End "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -= "+Enlarge_Screen" Scroll "+Holster_Weapon" W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" -Mouse2 "+Open" -Mouse3 "+Run" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/ionfury/demolition/origbinds.txt b/wadsrc/static/filter/ionfury/demolition/origbinds.txt index a2162df89..e46a2a16e 100644 --- a/wadsrc/static/filter/ionfury/demolition/origbinds.txt +++ b/wadsrc/static/filter/ionfury/demolition/origbinds.txt @@ -1,69 +1,4 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -Space "+Open" -LShift "+Run" -RShift "+Run" -A "+Jump" -/ "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -. "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" Scroll "+Holster_Weapon" W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -' "+Next_Weapon" -; "+Previous_Weapon" -C "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/nam/demolition/defbinds.txt b/wadsrc/static/filter/nam/demolition/defbinds.txt index 07c52db2b..c92a8f972 100644 --- a/wadsrc/static/filter/nam/demolition/defbinds.txt +++ b/wadsrc/static/filter/nam/demolition/defbinds.txt @@ -1,74 +1,12 @@ -W "+Move_Forward" -KP8 "+Move_Forward" -S "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -RCtrl "+Fire" -E "+Open" -LShift "+Run" -RShift "+Run" -Space "+Jump" -/ "+Jump" -LCtrl "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -A "+Strafe_Left" -D "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +R "+Steroids" +Q "+Quick_Kick" H "+Holo_Duke" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" Scroll "+Holster_Weapon" -Y "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -R "+Steroids" -Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" X "+Last_Used_Weapon" C "+Toggle_Crouch" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/nam/demolition/leftbinds.txt b/wadsrc/static/filter/nam/demolition/leftbinds.txt index ae728a200..85e0ad3fc 100644 --- a/wadsrc/static/filter/nam/demolition/leftbinds.txt +++ b/wadsrc/static/filter/nam/demolition/leftbinds.txt @@ -1,72 +1,8 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -Space "+Open" -LShift "+Run" -RShift "+Run" -A "+Jump" -KP- "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -KP7 "+Strafe_Left" -. "+Strafe_Right" -KP9 "+Strafe_Right" -Home "+Aim_Up" -End "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" H "+Holo_Duke" +R "+Steroids" +Q "+Quick_Kick" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -= "+Enlarge_Screen" Scroll "+Holster_Weapon" W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -R "+Steroids" -Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" -Mouse2 "+Open" -Mouse3 "+Run" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/nam/demolition/origbinds.txt b/wadsrc/static/filter/nam/demolition/origbinds.txt index 3cd17cb62..c97488acd 100644 --- a/wadsrc/static/filter/nam/demolition/origbinds.txt +++ b/wadsrc/static/filter/nam/demolition/origbinds.txt @@ -1,75 +1,12 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -Space "+Open" -LShift "+Run" -RShift "+Run" -A "+Jump" -/ "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -. "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +R "+Steroids" +` "+Quick_Kick" +Scroll "+Holster_Weapon" +W "+Show_Opponents_Weapon" H "+Holo_Duke" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" -Scroll "+Holster_Weapon" -W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -R "+Steroids" -` "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" C "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/redneck/demolition/defbinds.txt b/wadsrc/static/filter/redneck/demolition/defbinds.txt index 092a05cf9..a322d4009 100644 --- a/wadsrc/static/filter/redneck/demolition/defbinds.txt +++ b/wadsrc/static/filter/redneck/demolition/defbinds.txt @@ -1,74 +1,13 @@ -W "+Move_Forward" -KP8 "+Move_Forward" -S "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -RCtrl "+Fire" -E "+Open" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -Space "+Jump" -/ "+Jump" -LCtrl "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -A "+Strafe_Left" -D "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +Scroll "+Holster_Weapon" +E "+Show_Opponents_Weapon" B "+Holo_Duke" C "+Jetpack" Y "+NightVision" R "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" -Scroll "+Holster_Weapon" -E "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" ++ "+Dpad_Select" M "+Steroids" Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -+ "+Dpad_Select" X "+Last_Used_Weapon" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/redneck/demolition/leftbinds.txt b/wadsrc/static/filter/redneck/demolition/leftbinds.txt index d7def8ae0..2f58d2cb6 100644 --- a/wadsrc/static/filter/redneck/demolition/leftbinds.txt +++ b/wadsrc/static/filter/redneck/demolition/leftbinds.txt @@ -1,71 +1,8 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -LCtrl "+Fire" -RCtrl "+Fire" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -A "+Jump" -KP- "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -PgDn "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -KP7 "+Strafe_Left" -. "+Strafe_Right" -KP9 "+Strafe_Right" -Home "+Aim_Up" -End "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +Scroll "+Holster_Weapon" +E "+Show_Opponents_Weapon" +M "+Steroids" +Q "+Quick_Kick" B "+Holo_Duke" C "+Jetpack" Y "+NightVision" W "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -= "+Enlarge_Screen" -Scroll "+Holster_Weapon" -E "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -M "+Steroids" -Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Mouse1 "+Fire" -Mouse2 "+Open" -Mouse3 "+Run" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/redneck/demolition/origbinds.txt b/wadsrc/static/filter/redneck/demolition/origbinds.txt index 9144ec6a4..ba9d9f2e9 100644 --- a/wadsrc/static/filter/redneck/demolition/origbinds.txt +++ b/wadsrc/static/filter/redneck/demolition/origbinds.txt @@ -1,71 +1,9 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -LCtrl "+Fire" -RCtrl "+Fire" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -A "+Jump" -/ "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -. "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +V "toggleconsole" +Scroll "+Holster_Weapon" +E "+Show_Opponents_Weapon" +M "+Steroids" +` "+Quick_Kick" B "+Holo_Duke" C "+Jetpack" Y "+NightVision" W "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" -Scroll "+Holster_Weapon" -E "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -M "+Steroids" -` "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -V "toggleconsole" diff --git a/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt b/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt index e3d8597b0..50b79abaf 100644 --- a/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt +++ b/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt @@ -1,43 +1,10 @@ -W "+Move_Forward" -S "+Move_Backward" -E "+Open" -LShift "+Run" -Capslock "+AutoRun" -Space "+Jump" -LAlt "+Crouch" -A "+Strafe_Left" -D "+Strafe_Right" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +I "+Toggle_Crosshair" +Mouse2 "+MediKit" +H "+Holster_Weapon" M "+MedKit" B "+Smoke_Bomb" N "+Nightvision" G "+Gas_Bomb" F "+Flash_Bomb" C "+Caltrops" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -= "+Enlarge_Screen" -H "+Holster_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -` "toggleconsole" -Mouse1 "+Fire" -Mouse2 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt b/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt index 9395911f3..a7122a63d 100644 --- a/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt +++ b/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt @@ -1,66 +1,7 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -LCtrl "+Fire" -RCtrl "+Fire" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -A "+Jump" -KP- "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -PgDn "+Look_Down" -, "+Strafe_Left" -KP7 "+Strafe_Left" -. "+Strafe_Right" -KP9 "+Strafe_Right" -Home "+Aim_Up" -End "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" M "+MedKit" S "+Smoke_Bomb" N "+Nightvision" G "+Gas_Bomb" F "+Flash_Bomb" C "+Caltrops" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -= "+Enlarge_Screen" Scroll "+Holster_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Mouse1 "+Fire" -Mouse2 "+Open" -Mouse3 "+Run" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt b/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt index b4c02a99e..677ef1342 100644 --- a/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt +++ b/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt @@ -1,70 +1,8 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -LCtrl "+Fire" -RCtrl "+Fire" -LShift "+Run" -RShift "+Run" -Capslock "+AutoRun" -A "+Jump" -/ "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -, "+Strafe_Left" -. "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" M "+MedKit" S "+Smoke_Bomb" N "+Nightvision" G "+Gas_Bomb" F "+Flash_Bomb" C "+Caltrops" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" -Scroll "+Holster_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Mouse1 "+Fire" Mouse2 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" +Scroll "+Holster_Weapon" diff --git a/wadsrc/static/filter/ww2gi/demolition/defbinds.txt b/wadsrc/static/filter/ww2gi/demolition/defbinds.txt index 07c52db2b..c92a8f972 100644 --- a/wadsrc/static/filter/ww2gi/demolition/defbinds.txt +++ b/wadsrc/static/filter/ww2gi/demolition/defbinds.txt @@ -1,74 +1,12 @@ -W "+Move_Forward" -KP8 "+Move_Forward" -S "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -RCtrl "+Fire" -E "+Open" -LShift "+Run" -RShift "+Run" -Space "+Jump" -/ "+Jump" -LCtrl "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -A "+Strafe_Left" -D "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +R "+Steroids" +Q "+Quick_Kick" H "+Holo_Duke" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" Scroll "+Holster_Weapon" -Y "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -R "+Steroids" -Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" X "+Last_Used_Weapon" C "+Toggle_Crouch" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt b/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt index 957df7637..85e0ad3fc 100644 --- a/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt +++ b/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt @@ -1,73 +1,8 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -LCtrl "+Fire" -RCtrl "+Fire" -LShift "+Run" -RShift "+Run" -A "+Jump" -KP- "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -KP7 "+Strafe_Left" -. "+Strafe_Right" -KP9 "+Strafe_Right" -Home "+Aim_Up" -End "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" H "+Holo_Duke" +R "+Steroids" +Q "+Quick_Kick" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -= "+Enlarge_Screen" Scroll "+Holster_Weapon" W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -R "+Steroids" -Q "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" -` "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" -Mouse2 "+Open" -Mouse3 "+Run" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon" diff --git a/wadsrc/static/filter/ww2gi/demolition/origbinds.txt b/wadsrc/static/filter/ww2gi/demolition/origbinds.txt index 44d4a1eaa..c97488acd 100644 --- a/wadsrc/static/filter/ww2gi/demolition/origbinds.txt +++ b/wadsrc/static/filter/ww2gi/demolition/origbinds.txt @@ -1,76 +1,12 @@ -uparrow "+Move_Forward" -KP8 "+Move_Forward" -downarrow "+Move_Backward" -KP2 "+Move_Backward" -leftarrow "+Turn_Left" -KP4 "+Turn_Left" -rightarrow "+Turn_Right" -KP6 "+Turn_Right" -LAlt "+Strafe" -RAlt "+Strafe" -LCtrl "+Fire" -RCtrl "+Fire" -LCtrl "+Fire" -RCtrl "+Fire" -LShift "+Run" -RShift "+Run" -A "+Jump" -/ "+Jump" -Z "+Crouch" -PgUp "+Look_Up" -KP9 "+Look_Up" -PgDn "+Look_Down" -KP3 "+Look_Down" -Ins "+Look_Left" -KP0 "+Look_Left" -Del "+Look_Right" -KP. "+Look_Right" -, "+Strafe_Left" -. "+Strafe_Right" -Home "+Aim_Up" -KP7 "+Aim_Up" -End "+Aim_Down" -KP1 "+Aim_Down" -1 "+Weapon_1" -2 "+Weapon_2" -3 "+Weapon_3" -4 "+Weapon_4" -5 "+Weapon_5" -6 "+Weapon_6" -7 "+Weapon_7" -8 "+Weapon_8" -9 "+Weapon_9" -0 "+Weapon_10" -Enter "+Inventory" -KP-Enter "+Inventory" -[ "+Inventory_Left" -] "+Inventory_Right" +// +R "+Steroids" +` "+Quick_Kick" +Scroll "+Holster_Weapon" +W "+Show_Opponents_Weapon" H "+Holo_Duke" J "+Jetpack" N "+NightVision" M "+MedKit" -Backspace "+Turn_Around" -T "+Send_Message" -Tab "+Map" -- "+Shrink_Screen" -KP- "+Shrink_Screen" -= "+Enlarge_Screen" -KP+ "+Enlarge_Screen" -KP5 "+Center_View" -Scroll "+Holster_Weapon" -W "+Show_Opponents_Weapon" -F "+Map_Follow_Mode" -K "+See_Coop_View" -U "+Mouse_Aiming" -I "+Toggle_Crosshair" -R "+Steroids" -` "+Quick_Kick" -' "+Next_Weapon" -; "+Previous_Weapon" C "toggleconsole" -Capslock "+AutoRun" -Mouse1 "+Fire" Mouse2 "+Jetpack" Mouse3 "+MediKit" -MWheelUp "+Previous_Weapon" -MWheelDown "+Next_Weapon"