tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add looc and emote focus binds (#15588)

Browse Source
This commit is contained in:
Vasilis The Pikachu
2023-04-29 08:15:42 +02:00
committed by GitHub
parent 0623d7d0e3
commit e4dced38fc
6 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Input/ContentContexts.cs
View File

@@ -14,8 +14,10 @@ namespace Content.Client.Input
var common = contexts.GetContext("common"); var common = contexts.GetContext("common");
common.AddFunction(ContentKeyFunctions.FocusChat); common.AddFunction(ContentKeyFunctions.FocusChat);
common.AddFunction(ContentKeyFunctions.FocusLocalChat); common.AddFunction(ContentKeyFunctions.FocusLocalChat);
common.AddFunction(ContentKeyFunctions.FocusEmote);
common.AddFunction(ContentKeyFunctions.FocusWhisperChat); common.AddFunction(ContentKeyFunctions.FocusWhisperChat);
common.AddFunction(ContentKeyFunctions.FocusRadio); common.AddFunction(ContentKeyFunctions.FocusRadio);
common.AddFunction(ContentKeyFunctions.FocusLOOC);
common.AddFunction(ContentKeyFunctions.FocusOOC); common.AddFunction(ContentKeyFunctions.FocusOOC);
common.AddFunction(ContentKeyFunctions.FocusAdminChat); common.AddFunction(ContentKeyFunctions.FocusAdminChat);
common.AddFunction(ContentKeyFunctions.FocusConsoleChat); common.AddFunction(ContentKeyFunctions.FocusConsoleChat);

2
Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
View File

@@ -129,8 +129,10 @@ namespace Content.Client.Options.UI.Tabs
AddHeader("ui-options-header-ui"); AddHeader("ui-options-header-ui");
AddButton(ContentKeyFunctions.FocusChat); AddButton(ContentKeyFunctions.FocusChat);
AddButton(ContentKeyFunctions.FocusLocalChat); AddButton(ContentKeyFunctions.FocusLocalChat);
AddButton(ContentKeyFunctions.FocusEmote);
AddButton(ContentKeyFunctions.FocusWhisperChat); AddButton(ContentKeyFunctions.FocusWhisperChat);
AddButton(ContentKeyFunctions.FocusRadio); AddButton(ContentKeyFunctions.FocusRadio);
AddButton(ContentKeyFunctions.FocusLOOC);
AddButton(ContentKeyFunctions.FocusOOC); AddButton(ContentKeyFunctions.FocusOOC);
AddButton(ContentKeyFunctions.FocusAdminChat); AddButton(ContentKeyFunctions.FocusAdminChat);
AddButton(ContentKeyFunctions.FocusDeadChat); AddButton(ContentKeyFunctions.FocusDeadChat);

6
Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
View File

@@ -161,9 +161,15 @@ public sealed class ChatUIController : UIController
_input.SetInputCommand(ContentKeyFunctions.FocusLocalChat, _input.SetInputCommand(ContentKeyFunctions.FocusLocalChat,
InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Local))); InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Local)));
_input.SetInputCommand(ContentKeyFunctions.FocusEmote,
InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Emotes)));
_input.SetInputCommand(ContentKeyFunctions.FocusWhisperChat, _input.SetInputCommand(ContentKeyFunctions.FocusWhisperChat,
InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Whisper))); InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Whisper)));
_input.SetInputCommand(ContentKeyFunctions.FocusLOOC,
InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.LOOC)));
_input.SetInputCommand(ContentKeyFunctions.FocusOOC, _input.SetInputCommand(ContentKeyFunctions.FocusOOC,
InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.OOC))); InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.OOC)));

2
Content.Shared/Input/ContentKeyFunctions.cs
View File

@@ -13,8 +13,10 @@ namespace Content.Shared.Input
public static readonly BoundKeyFunction ExamineEntity = "ExamineEntity"; public static readonly BoundKeyFunction ExamineEntity = "ExamineEntity";
public static readonly BoundKeyFunction FocusChat = "FocusChatInputWindow"; public static readonly BoundKeyFunction FocusChat = "FocusChatInputWindow";
public static readonly BoundKeyFunction FocusLocalChat = "FocusLocalChatWindow"; public static readonly BoundKeyFunction FocusLocalChat = "FocusLocalChatWindow";
public static readonly BoundKeyFunction FocusEmote = "FocusEmote";
public static readonly BoundKeyFunction FocusWhisperChat = "FocusWhisperChatWindow"; public static readonly BoundKeyFunction FocusWhisperChat = "FocusWhisperChatWindow";
public static readonly BoundKeyFunction FocusRadio = "FocusRadioWindow"; public static readonly BoundKeyFunction FocusRadio = "FocusRadioWindow";
public static readonly BoundKeyFunction FocusLOOC = "FocusLOOCWindow";
public static readonly BoundKeyFunction FocusOOC = "FocusOOCWindow"; public static readonly BoundKeyFunction FocusOOC = "FocusOOCWindow";
public static readonly BoundKeyFunction FocusAdminChat = "FocusAdminChatWindow"; public static readonly BoundKeyFunction FocusAdminChat = "FocusAdminChatWindow";
public static readonly BoundKeyFunction FocusDeadChat = "FocusDeadChatWindow"; public static readonly BoundKeyFunction FocusDeadChat = "FocusDeadChatWindow";

2
Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
View File

@@ -118,8 +118,10 @@ ui-options-function-point = Point at location
ui-options-function-focus-chat-input-window = Focus chat ui-options-function-focus-chat-input-window = Focus chat
ui-options-function-focus-local-chat-window = Focus chat (IC) ui-options-function-focus-local-chat-window = Focus chat (IC)
ui-options-function-focus-emote = Focus chat (Emote)
ui-options-function-focus-whisper-chat-window = Focus chat (Whisper) ui-options-function-focus-whisper-chat-window = Focus chat (Whisper)
ui-options-function-focus-radio-window = Focus chat (Radio) ui-options-function-focus-radio-window = Focus chat (Radio)
ui-options-function-focus-looc-window = Focus chat (LOOC)
ui-options-function-focus-ooc-window = Focus chat (OOC) ui-options-function-focus-ooc-window = Focus chat (OOC)
ui-options-function-focus-admin-chat-window = Focus chat (Admin) ui-options-function-focus-admin-chat-window = Focus chat (Admin)
ui-options-function-focus-dead-chat-window = Focus chat (Dead) ui-options-function-focus-dead-chat-window = Focus chat (Dead)

8
Resources/keybinds.yml
View File

@@ -103,12 +103,20 @@ binds:
- function: FocusLocalChatWindow - function: FocusLocalChatWindow
type: State type: State
key: Period key: Period
- function: FocusEmote
type: State
mod1: Shift
key: Apostrophe
- function: FocusWhisperChatWindow - function: FocusWhisperChatWindow
type: State type: State
key: Comma key: Comma
- function: FocusRadioWindow - function: FocusRadioWindow
type: State type: State
key: SemiColon key: SemiColon
- function: FocusLOOCWindow
type: State
mod1: Shift
key: Num9
- function: FocusOOCWindow - function: FocusOOCWindow
type: State type: State
key: LBracket key: LBracket