Merge branch 'starlight-dev' into duty-officer-rebirth

Author: wonderfulnewworld

Content.Client/Input/ContentContexts.cs

@@ -27,7 +27,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             common.AddFunction(ContentKeyFunctions.EscapeContext);
             common.AddFunction(ContentKeyFunctions.ExamineEntity);
             common.AddFunction(ContentKeyFunctions.OpenAHelp);
-            common.AddFunction(ContentKeyFunctions.OpenMHelp);
             common.AddFunction(ContentKeyFunctions.TakeScreenshot);
             common.AddFunction(ContentKeyFunctions.TakeScreenshotNoUI);
             common.AddFunction(ContentKeyFunctions.ToggleFullscreen);

Content.Client/Lobby/UI/LobbyGui.xaml

@@ -91,8 +91,6 @@
                     <BoxContainer Orientation="Horizontal" MinSize="0 40" HorizontalAlignment="Right">
                         <Button Name="AHelpButton" Access="Public" Text="{Loc 'ui-lobby-ahelp-button'}"
                                 StyleClasses="ButtonBig" />
-                        <Button Name="MHelpButton" Access="Public" Text="{Loc 'ui-lobby-mhelp-button'}"
-                                StyleClasses="ButtonBig" />
                         <vote:VoteCallMenuButton Name="CallVoteButton" StyleClasses="ButtonBig" />
                         <Button Name="OptionsButton" Access="Public" StyleClasses="ButtonBig"
                                 Text="{Loc 'ui-lobby-options-button'}" />

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -223,7 +223,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.OpenInventoryMenu);
             AddButton(ContentKeyFunctions.OpenLanguageMenu); // Starlight
             AddButton(ContentKeyFunctions.OpenAHelp);
-            AddButton(ContentKeyFunctions.OpenMHelp);
             AddButton(ContentKeyFunctions.OpenActionsMenu);
             AddButton(ContentKeyFunctions.OpenEmotesMenu);
             AddButton(ContentKeyFunctions.ToggleRoundEndSummaryWindow);

Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs

@@ -28,6 +28,7 @@
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using Content.Client._Starlight.MHelp;
 
 namespace Content.Client.UserInterface.Systems.Bwoink;
 
@@ -41,13 +42,14 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
     [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
     [Dependency] private readonly IInputManager _input = default!;
     [UISystemDependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly StaffHelpUIController _staffHelp = default!;
 
     private BwoinkSystem? _bwoinkSystem;
-    private Controls.MenuButton? GameAHelpButton => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>()?.AHelpButton;
-    private Button? LobbyAHelpButton => (UIManager.ActiveScreen as LobbyGui)?.AHelpButton;
+    public Controls.MenuButton? GameAHelpButton => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>()?.AHelpButton;
+    public Button? LobbyAHelpButton => (UIManager.ActiveScreen as LobbyGui)?.AHelpButton;
     public IAHelpUIHandler? UIHelper;
     private bool _discordRelayActive;
-    private bool _hasUnreadAHelp;
+    public bool _hasUnreadAHelp;
     private bool _bwoinkSoundEnabled;
     private string? _aHelpSound;
 
@@ -92,8 +94,10 @@ private void OnAdminStatusUpdated()
 
     private void AHelpButtonPressed(BaseButton.ButtonEventArgs obj)
     {
-        EnsureUIHelper();
-        UIHelper!.ToggleWindow();
+        // EnsureUIHelper();
+        // UIHelper!.ToggleWindow();
+
+        _staffHelp.ToggleWindow();
     }
 
     public void OnSystemLoaded(BwoinkSystem system)
@@ -102,7 +106,7 @@ public void OnSystemLoaded(BwoinkSystem system)
         _bwoinkSystem.OnBwoinkTextMessageRecieved += ReceivedBwoink;
 
         _input.SetInputCommand(ContentKeyFunctions.OpenAHelp,
-            InputCmdHandler.FromDelegate(_ => ToggleWindow()));
+            InputCmdHandler.FromDelegate(_ => _staffHelp.ToggleWindow()));
     }
 
     public void OnSystemUnloaded(BwoinkSystem system)
@@ -249,18 +253,20 @@ public void PopOut()
         helper.Control.PopOut.Visible = false;
     }
 
-    private void UnreadAHelpReceived()
+    public void UnreadAHelpReceived()
     {
-        GameAHelpButton?.StyleClasses.Add(StyleClass.Negative);
-        LobbyAHelpButton?.StyleClasses.Add(StyleClass.Negative);
+        // GameAHelpButton?.StyleClasses.Add(StyleClass.Negative);
+        // LobbyAHelpButton?.StyleClasses.Add(StyleClass.Negative);
         _hasUnreadAHelp = true;
+        _staffHelp.RefreshAhelpButton();
     }
 
     private void UnreadAHelpRead()
     {
-        GameAHelpButton?.StyleClasses.Remove(StyleClass.Negative);
-        LobbyAHelpButton?.StyleClasses.Remove(StyleClass.Negative);
+        // GameAHelpButton?.StyleClasses.Remove(StyleClass.Negative);
+        // LobbyAHelpButton?.StyleClasses.Remove(StyleClass.Negative);
         _hasUnreadAHelp = false;
+        _staffHelp.RefreshAhelpButton();
     }
 
     public void OnStateEntered(GameplayState state)

Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs

@@ -22,7 +22,6 @@ public sealed class GameTopMenuBarUIController : UIController
     [Dependency] private readonly CharacterUIController _character = default!;
     [Dependency] private readonly CraftingUIController _crafting = default!;
     [Dependency] private readonly AHelpUIController _ahelp = default!;
-    [Dependency] private readonly MHelpUIController _mhelp = default!; //🌟Starlight🌟
     [Dependency] private readonly ActionUIController _action = default!;
     [Dependency] private readonly SandboxUIController _sandbox = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
@@ -49,7 +48,6 @@ public void UnloadButtons()
         _character.UnloadButton();
         _crafting.UnloadButton();
         _ahelp.UnloadButton();
-        _mhelp.UnloadButton(); //🌟Starlight🌟
         _action.UnloadButton();
         _sandbox.UnloadButton();
         _emotes.UnloadButton();
@@ -65,7 +63,6 @@ public void LoadButtons()
         _character.LoadButton();
         _crafting.LoadButton();
         _ahelp.LoadButton();
-        _mhelp.LoadButton(); //🌟Starlight🌟
         _action.LoadButton();
         _sandbox.LoadButton();
         _emotes.LoadButton();

Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

@@ -115,16 +115,6 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
-  <ui:MenuButton
-        Name="MHelpButton"
-        Access="Internal"
-        Icon="{xe:Tex '/Textures/Interface/mhelp.svg.192dpi.png'}"
-        BoundKey = "{x:Static is:ContentKeyFunctions.OpenMHelp}"
-        ToolTip="{Loc 'ui-options-function-open-m-help'}"
-        MinSize="42 64"
-        HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
-        />
     <!-- Starlight end -->
     <ui:MenuButton
         Name="AHelpButton"

Content.Client/_Starlight/MHelp/MHelpUIController.cs

@@ -1,53 +1,41 @@
-using System.Linq;
-using Content.Client._Starlight.Managers;
 using Content.Client._Starlight.MHelp;
 using Content.Client.Administration.Managers;
-using Content.Client.Administration.Systems;
-using Content.Client.Gameplay;
-using Content.Client.Lobby;
-using Content.Client.Lobby.UI;
-using Content.Client.Stylesheets;
-using Content.Client.UserInterface.Controls;
-using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Shared.Starlight.MHelp;
 using Content.Shared.Starlight.CCVar;
 using Content.Shared.Administration;
-using Content.Shared.CCVar;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.Audio;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
-using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using Content.Shared._NullLink;
+using Content.Client.Stylesheets;
 
 namespace Content.Client.UserInterface.Systems.Bwoink;
 
 [UsedImplicitly]
-public sealed class MHelpUIController : UIController, IOnSystemChanged<MentorSystem>, IOnStateChanged<GameplayState>, IOnStateChanged<LobbyState>
+public sealed class MHelpUIController : UIController, IOnSystemChanged<MentorSystem>
 {
     [Dependency] private readonly INullLinkPlayerRolesManager _playerRoles = default!;
     [Dependency] private readonly ISharedNullLinkPlayerRolesReqManager _playerRolesReq = default!;
     [Dependency] private readonly IClientAdminManager _adminManager = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IClyde _clyde = default!;
-    [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+    [Dependency] private readonly StaffHelpUIController _staffhelp = default!;
+    [Dependency] private readonly AHelpUIController _aHelp = default!;
     [UISystemDependency] private readonly AudioSystem _audio = default!;
 
     private MentorSystem? _mentorSystem;
-    private Controls.MenuButton? GameMHelpButton => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>()?.MHelpButton;
-    private Button? LobbyMHelpButton => (UIManager.ActiveScreen as LobbyGui)?.MHelpButton;
-
     public IMHelpUIHandler? UIHelper;
-    private bool _hasUnreadMHelp;
+    public bool _hasUnreadMHelp;
     private string? _mHelpSound;
 
     public override void Initialize()
@@ -59,23 +47,6 @@ public override void Initialize()
         _playerRoles.PlayerRolesChanged += OnPlayerStatusUpdated;
         _config.OnValueChanged(StarlightCCVars.MHelpSound, v => _mHelpSound = v, true);
     }
-    public void UnloadButton()
-    {
-        if (GameMHelpButton != null)
-            GameMHelpButton.OnPressed -= MHelpButtonPressed;
-
-        if (LobbyMHelpButton != null)
-            LobbyMHelpButton.OnPressed -= MHelpButtonPressed;
-    }
-
-    public void LoadButton()
-    {
-        if (GameMHelpButton != null)
-            GameMHelpButton.OnPressed += MHelpButtonPressed;
-
-        if (LobbyMHelpButton != null)
-            LobbyMHelpButton.OnPressed += MHelpButtonPressed;
-    }
 
     private void OnPlayerStatusUpdated()
     {
@@ -84,21 +55,10 @@ private void OnPlayerStatusUpdated()
         EnsureUIHelper();
     }
 
-    private void MHelpButtonPressed(BaseButton.ButtonEventArgs obj)
-    {
-        EnsureUIHelper();
-        UIHelper!.ToggleWindow();
-    }
-
     public void OnSystemLoaded(MentorSystem system)
     {
         _mentorSystem = system;
         _mentorSystem.OnMentoringTextMessageReceived += ReceivedMentoring;
-
-        CommandBinds.Builder
-            .Bind(ContentKeyFunctions.OpenMHelp,
-                InputCmdHandler.FromDelegate(_ => ToggleWindow()))
-            .Register<MHelpUIController>();
     }
 
     public void OnSystemUnloaded(MentorSystem system)
@@ -110,22 +70,6 @@ public void OnSystemUnloaded(MentorSystem system)
         _mentorSystem = null;
     }
 
-    private void SetMHelpPressed(bool pressed)
-    {
-        if (GameMHelpButton != null)
-        {
-            GameMHelpButton.Pressed = pressed;
-        }
-
-        if (LobbyMHelpButton != null)
-        {
-            LobbyMHelpButton.Pressed = pressed;
-        }
-
-        UIManager.ClickSound();
-        UnreadMHelpRead();
-    }
-
     private void ReceivedMentoring(object? sender, SharedMentorSystem.MHelpTextMessage message)
     {
         var localPlayer = _playerManager.LocalSession;
@@ -170,9 +114,6 @@ public void EnsureUIHelper()
         UIHelper.OnInputTextChanged += (ticket, text) => _mentorSystem?.SendInputTextUpdated(ticket,  text.Length > 0);
         UIHelper.OnTicketClosed += ticket => _mentorSystem?.SendCloseTicket(ticket);
         UIHelper.OnTptoPressed += ticket => _mentorSystem?.SentTpto(ticket);
-        UIHelper.OnClose += () => SetMHelpPressed(false);
-        UIHelper.OnOpen += () => SetMHelpPressed(true);
-        SetMHelpPressed(UIHelper.IsOpen);
     }
 
     public void Open()
@@ -202,65 +143,7 @@ public void ToggleWindow()
 
     private void UnreadMHelpReceived()
     {
-        GameMHelpButton?.StyleClasses.Add(StyleClass.Negative);
-        LobbyMHelpButton?.StyleClasses.Add(StyleClass.Negative);
         _hasUnreadMHelp = true;
-    }
-
-    private void UnreadMHelpRead()
-    {
-        GameMHelpButton?.StyleClasses.Remove(StyleClass.Negative);
-        LobbyMHelpButton?.StyleClasses.Remove(StyleClass.Negative);
-        _hasUnreadMHelp = false;
-    }
-
-    public void OnStateEntered(GameplayState state)
-    {
-        if (GameMHelpButton != null)
-        {
-            GameMHelpButton.OnPressed -= MHelpButtonPressed;
-            GameMHelpButton.OnPressed += MHelpButtonPressed;
-            GameMHelpButton.Pressed = UIHelper?.IsOpen ?? false;
-
-            if (_hasUnreadMHelp)
-            {
-                UnreadMHelpReceived();
-            }
-            else
-            {
-                UnreadMHelpRead();
-            }
-        }
-    }
-
-    public void OnStateExited(GameplayState state)
-    {
-        if (GameMHelpButton != null)
-            GameMHelpButton.OnPressed -= MHelpButtonPressed;
-    }
-
-    public void OnStateEntered(LobbyState state)
-    {
-        if (LobbyMHelpButton != null)
-        {
-            LobbyMHelpButton.OnPressed -= MHelpButtonPressed;
-            LobbyMHelpButton.OnPressed += MHelpButtonPressed;
-            LobbyMHelpButton.Pressed = UIHelper?.IsOpen ?? false;
-
-            if (_hasUnreadMHelp)
-            {
-                UnreadMHelpReceived();
-            }
-            else
-            {
-                UnreadMHelpRead();
-            }
-        }
-    }
-
-    public void OnStateExited(LobbyState state)
-    {
-        if (LobbyMHelpButton != null)
-            LobbyMHelpButton.OnPressed -= MHelpButtonPressed;
+        _staffhelp.RefreshAhelpButton();
     }
 }