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

Fix looc prefix (#12603)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-15 17:14:40 +13:00
committed by GitHub
parent 0b5a58001c
commit c6e47c7c61
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,17 +50,19 @@ public sealed class ChatUIController : UIController
public const char AliasLocal = '.'; public const char AliasLocal = '.';
public const char AliasConsole = '/'; public const char AliasConsole = '/';
public const char AliasDead = '\\'; public const char AliasDead = '\\';
public const char AliasLOOC = '(';
public const char AliasOOC = '['; public const char AliasOOC = '[';
public const char AliasEmotes = '@'; public const char AliasEmotes = '@';
public const char AliasAdmin = ']'; public const char AliasAdmin = ']';
public const char AliasRadio = ';'; public const char AliasRadio = ';';
public const char AliasWhisper = ','; public const char AliasWhisper = ',';
private static readonly Dictionary<char, ChatSelectChannel> PrefixToChannel = new() public static readonly Dictionary<char, ChatSelectChannel> PrefixToChannel = new()
{ {
{AliasLocal, ChatSelectChannel.Local}, {AliasLocal, ChatSelectChannel.Local},
{AliasWhisper, ChatSelectChannel.Whisper}, {AliasWhisper, ChatSelectChannel.Whisper},
{AliasConsole, ChatSelectChannel.Console}, {AliasConsole, ChatSelectChannel.Console},
{AliasLOOC, ChatSelectChannel.LOOC},
{AliasOOC, ChatSelectChannel.OOC}, {AliasOOC, ChatSelectChannel.OOC},
{AliasEmotes, ChatSelectChannel.Emotes}, {AliasEmotes, ChatSelectChannel.Emotes},
{AliasAdmin, ChatSelectChannel.Admin}, {AliasAdmin, ChatSelectChannel.Admin},
@@ -68,7 +70,7 @@ public sealed class ChatUIController : UIController
{AliasDead, ChatSelectChannel.Dead} {AliasDead, ChatSelectChannel.Dead}
}; };
private static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes = public static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes =
PrefixToChannel.ToDictionary(kv => kv.Value, kv => kv.Key); PrefixToChannel.ToDictionary(kv => kv.Value, kv => kv.Key);
/// <summary> /// <summary>
@@ -370,23 +372,6 @@ public sealed class ChatUIController : UIController
return channelSelector.ToString(); return channelSelector.ToString();
} }
public static char GetChannelSelectorPrefix(ChatSelectChannel channelSelector)
{
return channelSelector switch
{
ChatSelectChannel.Local => '.',
ChatSelectChannel.Whisper => ',',
ChatSelectChannel.Radio => ';',
ChatSelectChannel.LOOC => '(',
ChatSelectChannel.OOC => '[',
ChatSelectChannel.Emotes => '@',
ChatSelectChannel.Dead => '\\',
ChatSelectChannel.Admin => ']',
ChatSelectChannel.Console => '/',
_ => ' '
};
}
private void UpdateChannelPermissions() private void UpdateChannelPermissions()
{ {
CanSendChannels = default; CanSendChannels = default;

2
Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorItemButton.cs
View File

@@ -15,7 +15,7 @@ public sealed class ChannelSelectorItemButton : Button
Channel = selector; Channel = selector;
AddStyleClass(StyleNano.StyleClassChatChannelSelectorButton); AddStyleClass(StyleNano.StyleClassChatChannelSelectorButton);
Text = ChatUIController.GetChannelSelectorName(selector); Text = ChatUIController.GetChannelSelectorName(selector);
var prefix = ChatUIController.GetChannelSelectorPrefix(selector); var prefix = ChatUIController.ChannelPrefixes[selector];
if (prefix != default) Text = Loc.GetString("hud-chatbox-select-name-prefixed", ("name", Text), ("prefix", prefix)); if (prefix != default) Text = Loc.GetString("hud-chatbox-select-name-prefixed", ("name", Text), ("prefix", prefix));
} }
} }