From 615584e7e4bc7498854552b9e78f7f4d17c1826f Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Sat, 19 Apr 2025 02:45:20 +0400 Subject: [PATCH] extend hotbar hotkeys to 20 keys via shift (#33872) shift+ keys in hotbar --- Content.Shared/Input/ContentKeyFunctions.cs | 13 +++++- .../en-US/escape-menu/ui/options-menu.ftl | 20 ++++++++++ Resources/keybinds.yml | 40 +++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 863d9da970..76f30646b0 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -87,11 +87,22 @@ namespace Content.Shared.Input public static readonly BoundKeyFunction Hotbar7 = "Hotbar7"; public static readonly BoundKeyFunction Hotbar8 = "Hotbar8"; public static readonly BoundKeyFunction Hotbar9 = "Hotbar9"; + public static readonly BoundKeyFunction HotbarShift0 = "HotbarShift0"; + public static readonly BoundKeyFunction HotbarShift1 = "HotbarShift1"; + public static readonly BoundKeyFunction HotbarShift2 = "HotbarShift2"; + public static readonly BoundKeyFunction HotbarShift3 = "HotbarShift3"; + public static readonly BoundKeyFunction HotbarShift4 = "HotbarShift4"; + public static readonly BoundKeyFunction HotbarShift5 = "HotbarShift5"; + public static readonly BoundKeyFunction HotbarShift6 = "HotbarShift6"; + public static readonly BoundKeyFunction HotbarShift7 = "HotbarShift7"; + public static readonly BoundKeyFunction HotbarShift8 = "HotbarShift8"; + public static readonly BoundKeyFunction HotbarShift9 = "HotbarShift9"; public static BoundKeyFunction[] GetHotbarBoundKeys() => new[] { - Hotbar1, Hotbar2, Hotbar3, Hotbar4, Hotbar5, Hotbar6, Hotbar7, Hotbar8, Hotbar9, Hotbar0 + Hotbar1, Hotbar2, Hotbar3, Hotbar4, Hotbar5, Hotbar6, Hotbar7, Hotbar8, Hotbar9, Hotbar0, + HotbarShift1, HotbarShift2, HotbarShift3, HotbarShift4, HotbarShift5, HotbarShift6, HotbarShift7, HotbarShift8, HotbarShift9, HotbarShift0 }; public static readonly BoundKeyFunction Vote0 = "Vote0"; diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index 95c002b745..357f551bc4 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -227,6 +227,16 @@ ui-options-function-hotbar7 = Hotbar slot 7 ui-options-function-hotbar8 = Hotbar slot 8 ui-options-function-hotbar9 = Hotbar slot 9 ui-options-function-hotbar0 = Hotbar slot 0 +ui-options-function-hotbarshift1 = Hotbar slot Shift+1 +ui-options-function-hotbarshift2 = Hotbar slot Shift+2 +ui-options-function-hotbarshift3 = Hotbar slot Shift+3 +ui-options-function-hotbarshift4 = Hotbar slot Shift+4 +ui-options-function-hotbarshift5 = Hotbar slot Shift+5 +ui-options-function-hotbarshift6 = Hotbar slot Shift+6 +ui-options-function-hotbarshift7 = Hotbar slot Shift+7 +ui-options-function-hotbarshift8 = Hotbar slot Shift+8 +ui-options-function-hotbarshift9 = Hotbar slot Shift+9 +ui-options-function-hotbarshift0 = Hotbar slot Shift+0 ui-options-function-loadout1 = Hotbar Loadout 1 ui-options-function-loadout2 = Hotbar Loadout 2 ui-options-function-loadout3 = Hotbar Loadout 3 @@ -237,6 +247,16 @@ ui-options-function-loadout7 = Hotbar Loadout 7 ui-options-function-loadout8 = Hotbar Loadout 8 ui-options-function-loadout9 = Hotbar Loadout 9 ui-options-function-loadout0 = Hotbar Loadout 0 +ui-options-function-loadoutshift1 = Hotbar Loadout Shift+1 +ui-options-function-loadoutshift2 = Hotbar Loadout Shift+2 +ui-options-function-loadoutshift3 = Hotbar Loadout Shift+3 +ui-options-function-loadoutshift4 = Hotbar Loadout Shift+4 +ui-options-function-loadoutshift5 = Hotbar Loadout Shift+5 +ui-options-function-loadoutshift6 = Hotbar Loadout Shift+6 +ui-options-function-loadoutshift7 = Hotbar Loadout Shift+7 +ui-options-function-loadoutshift8 = Hotbar Loadout Shift+8 +ui-options-function-loadoutshift9 = Hotbar Loadout Shift+9 +ui-options-function-loadoutshift0 = Hotbar Loadout Shift+0 ui-options-function-shuttle-strafe-up = Strafe up ui-options-function-shuttle-strafe-right = Strafe right diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 3b8158b7c7..8d4df5b92f 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -554,6 +554,46 @@ binds: - function: Hotbar9 type: State key: Num9 +- function: HotbarShift0 + type: State + key: Num0 + mod1: Shift +- function: HotbarShift1 + type: State + key: Num1 + mod1: Shift +- function: HotbarShift2 + type: State + key: Num2 + mod1: Shift +- function: HotbarShift3 + type: State + key: Num3 + mod1: Shift +- function: HotbarShift4 + type: State + key: Num4 + mod1: Shift +- function: HotbarShift5 + type: State + key: Num5 + mod1: Shift +- function: HotbarShift6 + type: State + key: Num6 + mod1: Shift +- function: HotbarShift7 + type: State + key: Num7 + mod1: Shift +- function: HotbarShift8 + type: State + key: Num8 + mod1: Shift +- function: HotbarShift9 + type: State + key: Num9 + mod1: Shift - function: MappingUnselect type: State key: MouseRight -- 2.51.2