[Port] Log Actions In The Chat / Логирование Действий В Чат (#57)

* add: log chat action * add: Loc * ашч * fix
WWhiteDreamProject · Sep 15, 2024 · 1705179 · 1705179
1 parent 4cfbc4e
commit 1705179
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 4 deletions.
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -53,6 +53,7 @@
                 <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
                 <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
                 <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
+                <CheckBox Name="LogInChatCheckBox" Text="{Loc 'ui-options-log-in-chat'}" /> <!-- WD EDIT -->
                 <Label Text="{Loc 'ui-options-general-cursor'}"
                        FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>

diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.UserInterface.Screens;
+using Content.Shared._White;
 using Content.Shared.CCVar;
 using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
@@ -80,6 +81,7 @@ public MiscTab()
             ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
             StaticStorageUI.OnToggled += OnCheckBoxToggled;
+            LogInChatCheckBox.OnToggled += OnCheckBoxToggled; // WD EDIT
 
             HudThemeOption.SelectId(_hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
             DiscordRich.Pressed = _cfg.GetCVar(CVars.DiscordEnabled);
@@ -98,6 +100,7 @@ public MiscTab()
             ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
             // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
             StaticStorageUI.Pressed = _cfg.GetCVar(CCVars.StaticStorageUI);
+            LogInChatCheckBox.Pressed = _cfg.GetCVar(WhiteCVars.LogInChat); // WD EDIT
 
 
             ApplyButton.OnPressed += OnApplyButtonPressed;
@@ -154,6 +157,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
             _cfg.SetCVar(CCVars.StaticStorageUI, StaticStorageUI.Pressed);
+            _cfg.SetCVar(WhiteCVars.LogInChat, LogInChatCheckBox.Pressed); // WD EDIT
 
             if (HudLayoutOption.SelectedMetadata is string opt)
             {
@@ -184,6 +188,7 @@ private void UpdateApplyButton()
             var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
             var isStaticStorageUISame = StaticStorageUI.Pressed == _cfg.GetCVar(CCVars.StaticStorageUI);
+            var isLogInChatCheckBoxSame = LogInChatCheckBox.Pressed == _cfg.GetCVar(WhiteCVars.LogInChat); // WD EDIT
 
             ApplyButton.Disabled = isHudThemeSame &&
                                    isLayoutSame &&
@@ -202,7 +207,8 @@ private void UpdateApplyButton()
                                    isChatWindowOpacitySame &&
                                    isScreenShakeIntensitySame &&
                                    // isToggleWalkSame &&
-                                   isStaticStorageUISame;
+                                   isStaticStorageUISame &&
+                                   isLogInChatCheckBoxSame; // WD EDIT
         }
 
     }

diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
@@ -1,4 +1,7 @@
 using System.Linq;
+using Content.Client.UserInterface.Systems.Chat;
+using Content.Shared._White;
+using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.GameTicking;
 using Content.Shared.Popups;
@@ -40,6 +43,18 @@ public sealed class PopupSystem : SharedPopupSystem
         public const float MaximumPopupLifetime = 5f;
         public const float PopupLifetimePerCharacter = 0.04f;
 
+        // WD EDIT START
+        private static readonly Dictionary<PopupType, string> FontSizeDict = new()
+        {
+            { PopupType.Medium, "12" },
+            { PopupType.MediumCaution, "12" },
+            { PopupType.Large, "15" },
+            { PopupType.LargeCaution, "15" }
+        };
+
+        private bool _shouldLogInChat;
+        // WD EDIT END
+
         public override void Initialize()
         {
             SubscribeNetworkEvent<PopupCursorEvent>(OnPopupCursorEvent);
@@ -57,6 +72,11 @@ public override void Initialize()
                     _examine,
                     _transform,
                     this));
+
+            // WD EDIT START
+            _shouldLogInChat = _configManager.GetCVar(WhiteCVars.LogInChat);
+            _configManager.OnValueChanged(WhiteCVars.LogInChat, log => { _shouldLogInChat = log; });
+            // WD EDIT END
         }
 
         public override void Shutdown()
@@ -86,6 +106,26 @@ private void PopupMessage(string? message, PopupType type, EntityCoordinates coo
             };
 
             _aliveWorldLabels.Add(label);
+
+            // WD EDIT START
+            if (!_shouldLogInChat)
+                return;
+
+            if (_playerManager.LocalEntity == null)
+                return;
+
+            if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity.Value, coordinates, 10))
+                return;
+
+            var fontsize = FontSizeDict.GetValueOrDefault(type, "10");
+            var fontcolor = type is PopupType.LargeCaution or PopupType.MediumCaution or PopupType.SmallCaution
+                ? "#C62828"
+                : "#AEABC4";
+
+            var wrappedMessage = $"[font size={fontsize}][color={fontcolor}]{message}[/color][/font]";
+            var chatMsg = new ChatMessage(ChatChannel.Emotes, message, wrappedMessage, GetNetEntity(EntityUid.Invalid), null);
+            _uiManager.GetUIController<ChatUIController>().ProcessChatMessage(chatMsg);
+            // WD EDIT END
         }
 
         #region Abstract Method Implementations

diff --git a/Content.Shared/_White/CVars.cs b/Content.Shared/_White/CVars.cs
@@ -12,7 +12,7 @@ public sealed class WhiteCVars
 
     public static readonly CVarDef<double> AspectChance =
         CVarDef.Create("aspects.chance", 0.1d, CVar.SERVERONLY);
-  
+
     #endregion
 
     #region Keybind
@@ -31,4 +31,11 @@ public static readonly CVarDef<string>
         ServerCulture = CVarDef.Create("white.culture", "ru-RU", CVar.REPLICATED | CVar.SERVER);
 
     #endregion
+
+    #region OptionsMisc
+
+    public static readonly CVarDef<bool> LogInChat =
+        CVarDef.Create("white.log_in_chat", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED);
+
+    #endregion
 }
diff --git a/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl b/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl
@@ -1,5 +1,6 @@
-ui-options-function-open-emotions-menu = Open emotions menu
+ui-options-log-in-chat = Log actions in the chat
 
+ui-options-function-open-emotions-menu = Open emotions menu
 ui-options-function-look-up = Look up/Take aim
 ui-options-function-auto-get-up = Automatically get up after falling
 ui-options-function-hold-look-up = Hold down the key to aim
diff --git a/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl b/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl
@@ -1,5 +1,6 @@
-ui-options-function-open-emotions-menu = Открыть меню эмоций
+ui-options-log-in-chat = Логировать действия в чат
 
+ui-options-function-open-emotions-menu = Открыть меню эмоций
 ui-options-function-look-up = Присмотреться/Прицелиться
 ui-options-function-auto-get-up = Автоматически вставать при падении
 ui-options-function-hold-look-up = Удерживать клавишу для прицеливания