Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add LOOC and change OOC color (#5841)

Browse Source
This commit is contained in:
Morbo
2022-01-11 16:29:55 +03:00
committed by GitHub
parent 2b26f36fe5
commit 62221d7b92
15 changed files with 200 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Administration/UI/Tabs/ServerTab.xaml
View File

@@ -8,5 +8,6 @@
<cc:CommandButton Command="restart" Text="{Loc server-reboot}" />
<cc:CommandButton Command="shutdown" Text="{Loc server-shutdown}" />
<cc:CommandButton Command="setooc" Text="{Loc server-ooc-toggle}" />
<cc:CommandButton Command="setlooc" Text="{Loc server-looc-toggle}" />
</GridContainer>
</Control>

3
Content.Client/Chat/ChatHelper.cs
View File

@@ -10,7 +10,8 @@ namespace Content.Client.Chat
{
ChatChannel.Server => Color.Orange,
ChatChannel.Radio => Color.LimeGreen,
ChatChannel.OOC => Color.LightSkyBlue,
ChatChannel.LOOC => Color.LightSkyBlue,
ChatChannel.OOC => Color.RoyalBlue,
ChatChannel.Dead => Color.MediumPurple,
ChatChannel.Admin => Color.Red,
_ => Color.DarkGray

6
Content.Client/Chat/Managers/ChatManager.cs
View File

@@ -188,6 +188,8 @@ namespace Content.Client.Chat.Managers
// can always send/recieve OOC
SelectableChannels |= ChatSelectChannel.OOC;
FilterableChannels |= ChatChannel.OOC;
SelectableChannels |= ChatSelectChannel.LOOC;
FilterableChannels |= ChatChannel.LOOC;
// can always hear server (nobody can actually send server messages).
FilterableChannels |= ChatChannel.Server;
@@ -318,6 +320,10 @@ namespace Content.Client.Chat.Managers
_consoleHost.ExecuteCommand(text.ToString());
break;
case ChatSelectChannel.LOOC:
_consoleHost.ExecuteCommand($"looc \"{CommandParsing.Escape(str)}\"");
break;
case ChatSelectChannel.OOC:
_consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(str)}\"");
break;

4
Content.Client/Chat/UI/ChatBox.xaml.cs
View File

@@ -44,6 +44,7 @@ namespace Content.Client.Chat.UI
ChatSelectChannel.Local,
ChatSelectChannel.Emotes,
ChatSelectChannel.Radio,
ChatSelectChannel.LOOC,
ChatSelectChannel.OOC,
ChatSelectChannel.Dead,
ChatSelectChannel.Admin
@@ -491,7 +492,8 @@ namespace Content.Client.Chat.UI
return channel switch
{
ChatSelectChannel.Radio => Color.LimeGreen,
ChatSelectChannel.OOC => Color.LightSkyBlue,
ChatSelectChannel.LOOC => Color.LightSkyBlue,
ChatSelectChannel.OOC => Color.RoyalBlue,
ChatSelectChannel.Dead => Color.MediumPurple,
ChatSelectChannel.Admin => Color.Red,
_ => Color.DarkGray