From dbfa90e95678e7e593e6e25bc6085de47b4dde47 Mon Sep 17 00:00:00 2001
From: Vigers Ray <vigersray@gmail.com>
Date: Fri, 29 Nov 2024 04:35:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B2=D1=83=D0=BA=D0=BE=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B5=20=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5=D1=89=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B8=D0=B7?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BA=D0=BE=D0=B2=20=D0=B8=20=D0=B2=D1=8B=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D1=83.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Client/Ghost/GhostSystem.cs           |  14 +++++++
 .../Roles/GhostRoleButtonsBox.xaml.cs         |   2 +
 .../Controls/Roles/GhostRoleEntryButtons.xaml |  11 ++++-
 .../Controls/Roles/GhostRoleRulesWindow.xaml  |   6 ---
 .../Roles/GhostRoleRulesWindow.xaml.cs        |  38 +-----------------
 .../Ghost/Controls/Roles/GhostRolesEui.cs     |  23 +++++------
 .../Controls/Roles/GhostRolesWindow.xaml.cs   |   2 +
 .../Systems/Ghost/GhostUIController.cs        |   2 +-
 Resources/Audio/_Sunrise/Misc/ping.ogg        | Bin 0 -> 9903 bytes
 Resources/Changelog/ChangelogSunrise.yml      |  17 ++++++++
 .../Locale/ru-RU/_strings/ghost/ghost-gui.ftl |   1 +
 11 files changed, 57 insertions(+), 59 deletions(-)
 create mode 100644 Resources/Audio/_Sunrise/Misc/ping.ogg

diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs
index f4f7e3459f..24210187db 100644
--- a/Content.Client/Ghost/GhostSystem.cs
+++ b/Content.Client/Ghost/GhostSystem.cs
@@ -1,9 +1,11 @@
 using Content.Client.Movement.Systems;
 using Content.Shared.Actions;
 using Content.Shared.Ghost;
+using Robust.Client.Audio;
 using Robust.Client.Console;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
+using Robust.Shared.Audio;
 using Robust.Shared.Player;
 
 namespace Content.Client.Ghost
@@ -14,6 +16,7 @@ namespace Content.Client.Ghost
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
+        [Dependency] private readonly AudioSystem _audioSystem = default!;
 
         public int AvailableGhostRoleCount { get; private set; }
 
@@ -156,6 +159,17 @@ namespace Content.Client.Ghost
 
         private void OnUpdateGhostRoleCount(GhostUpdateGhostRoleCountEvent msg)
         {
+
+            if (msg.AvailableGhostRoles > AvailableGhostRoleCount && IsGhost)
+            {
+                _audioSystem.PlayGlobal(
+                    "/Audio/_Sunrise/Misc/ping.ogg",
+                    Filter.Local(),
+                    false,
+                    new AudioParams().WithVolume(10f)
+                );
+            }
+
             AvailableGhostRoleCount = msg.AvailableGhostRoles;
             GhostRoleCountUpdated?.Invoke(msg);
         }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs
index 7df0243416..830e91cbce 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs
@@ -14,6 +14,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
     {
         private SpriteSystem _spriteSystem;
         public event Action<GhostRoleInfo>? OnRoleSelected;
+        public event Action<GhostRoleInfo>? OnRoleRules;
         public event Action<GhostRoleInfo>? OnRoleFollow;
 
         public GhostRoleButtonsBox(bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem)
@@ -25,6 +26,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             {
                 var button = new GhostRoleEntryButtons(role);
                 button.RequestButton.OnPressed += _ => OnRoleSelected?.Invoke(role);
+                button.RulesButton.OnPressed += _ => OnRoleRules?.Invoke(role);
                 button.FollowButton.OnPressed += _ => OnRoleFollow?.Invoke(role);
 
                 if (!hasAccess)
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
index 05c52deef1..917c3929e1 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
@@ -6,10 +6,17 @@
             Text="{Loc 'ghost-roles-window-request-role-button'}"
             StyleClasses="OpenRight"
             HorizontalExpand="True"
-            SizeFlagsStretchRatio="3"/>
+            SizeFlagsStretchRatio="2"/>
+    <Button Name="RulesButton"
+            Access="Public"
+            Text="{Loc 'ghost-roles-window-rules-role-button'}"
+            StyleClasses="OpenBoth"
+            HorizontalExpand="True"
+            SizeFlagsStretchRatio="1"/>
     <Button Name="FollowButton"
             Access="Public"
             Text="{Loc 'ghost-roles-window-follow-role-button'}"
             StyleClasses="OpenLeft"
-            HorizontalExpand="True"/>
+            HorizontalExpand="True"
+            SizeFlagsStretchRatio="1"/>
 </BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml
index 5223894a07..2c4f51c1a5 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml
@@ -5,11 +5,5 @@
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True">
         <RichTextLabel Name="TopBanner" VerticalExpand="True"/>
-        <Button Name="RequestButton"
-                Text="{Loc 'ghost-roles-window-request-role-button'}"
-                Disabled="True"
-                TextAlign="Center"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs
index fa4337accb..4b1071b9a1 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs
@@ -1,10 +1,6 @@
-using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
@@ -12,40 +8,10 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
     [GenerateTypedNameReferences]
     public sealed partial class GhostRoleRulesWindow : DefaultWindow
     {
-        [Dependency] private readonly IConfigurationManager _cfg = IoCManager.Resolve<IConfigurationManager>();
-        private float _timer;
-
-        public GhostRoleRulesWindow(string rules, Action<BaseButton.ButtonEventArgs> requestAction)
+        public GhostRoleRulesWindow(string rules)
         {
             RobustXamlLoader.Load(this);
-            var ghostRoleTime = _cfg.GetCVar(CCVars.GhostRoleTime);
-            _timer = ghostRoleTime;
-
-            if (ghostRoleTime > 0f)
-            {
-                RequestButton.Text = Loc.GetString("ghost-roles-window-request-role-button-timer", ("time", $"{_timer:0.0}"));
-                TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer", ("time", ghostRoleTime))));
-                RequestButton.Disabled = true;
-            }
-
-            RequestButton.OnPressed += requestAction;
-        }
-
-
-        protected override void FrameUpdate(FrameEventArgs args)
-        {
-            base.FrameUpdate(args);
-            if (!RequestButton.Disabled) return;
-            if (_timer > 0.0)
-            {
-                _timer -= args.DeltaSeconds;
-                RequestButton.Text = Loc.GetString("ghost-roles-window-request-role-button-timer", ("time", $"{_timer:0.0}"));
-            }
-            else
-            {
-                RequestButton.Disabled = false;
-                RequestButton.Text = Loc.GetString("ghost-roles-window-request-role-button");
-            }
+            TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(rules));
         }
     }
 }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
index 2aa0803cd1..e7fe2783d5 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
@@ -16,33 +16,28 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
         private GhostRoleRulesWindow? _windowRules = null;
         private uint _windowRulesId = 0;
 
-        private ISharedSponsorsManager? _sponsorsManager; // Sunrise-Sponsors
-
         public GhostRolesEui()
         {
-            IoCManager.Instance!.TryResolveType(out _sponsorsManager); // Sunrise-Sponsors
-
             _window = new GhostRolesWindow();
 
             _window.OnRoleRequestButtonClicked += info =>
             {
-                _windowRules?.Close();
-
                 if (info.Kind == GhostRoleKind.RaffleJoined)
                 {
                     SendMessage(new LeaveGhostRoleRaffleMessage(info.Identifier));
                     return;
                 }
 
-                _windowRules = new GhostRoleRulesWindow(info.Rules, _ =>
-                {
-                    SendMessage(new RequestGhostRoleMessage(info.Identifier));
+                SendMessage(new RequestGhostRoleMessage(info.Identifier));
 
-                    // if raffle role, close rules window on request, otherwise do
-                    // old behavior of waiting for the server to close it
-                    if (info.Kind != GhostRoleKind.FirstComeFirstServe)
-                        _windowRules?.Close();
-                });
+                if (info.Kind != GhostRoleKind.FirstComeFirstServe)
+                    _windowRules?.Close();
+            };
+
+            _window.OnRoleRulesButtonClicked += info =>
+            {
+                _windowRules?.Close();
+                _windowRules = new GhostRoleRulesWindow(info.Rules);
                 _windowRulesId = info.Identifier;
                 _windowRules.OnClose += () =>
                 {
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
index f10ab7d95b..f26da639bb 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
@@ -13,6 +13,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
     public sealed partial class GhostRolesWindow : DefaultWindow
     {
         public event Action<GhostRoleInfo>? OnRoleRequestButtonClicked;
+        public event Action<GhostRoleInfo>? OnRoleRulesButtonClicked;
         public event Action<GhostRoleInfo>? OnRoleFollow;
 
         private Dictionary<string, Collapsible> _collapsibleBoxes = new();
@@ -60,6 +61,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             var info = new GhostRoleInfoBox(name, description);
             var buttons = new GhostRoleButtonsBox(hasAccess, reason, ghostRoleInfos, spriteSystem);
             buttons.OnRoleSelected += OnRoleRequestButtonClicked;
+            buttons.OnRoleRules += OnRoleRulesButtonClicked;
             buttons.OnRoleFollow += OnRoleFollow;
 
             EntryContainer.AddChild(info);
diff --git a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs
index c641544237..63b12cd224 100644
--- a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs
@@ -9,7 +9,7 @@ using Content.Client._Sunrise.ServersHub;
 using Content.Shared._Sunrise.SunriseCCVars;
 using Content.Sunrise.Interfaces.Shared;
 using Robust.Shared.Configuration;
-using Content.Shared._Sunrise.NewLife; // Sunrise-Edit
+using Content.Shared._Sunrise.NewLife;
 
 namespace Content.Client.UserInterface.Systems.Ghost;
 
diff --git a/Resources/Audio/_Sunrise/Misc/ping.ogg b/Resources/Audio/_Sunrise/Misc/ping.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..cff482cc9a9fd32e9833b77f0bd47813667d23db
GIT binary patch
literal 9903
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

literal 0
HcmV?d00001

diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
index 3dbca0fc7f..b1e84ed8d3 100644
--- a/Resources/Changelog/ChangelogSunrise.yml
+++ b/Resources/Changelog/ChangelogSunrise.yml
@@ -6721,3 +6721,20 @@
     type: Tweak
   id: 468
   time: '2024-11-29T00:05:43.211310+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043D\u0443\u0436\
+      \u043D\u043E \u0447\u0438\u0442\u0430\u0442\u044C \u043F\u0440\u0430\u0432\u0438\
+      \u043B\u0430 \u043A\u0430\u0436\u0434\u044B\u0439 \u0440\u0430\u0437 \u043F\u0440\
+      \u0438 \u0437\u0430\u043F\u0440\u043E\u0441\u0435 \u0440\u043E\u043B\u0438 \u0434\
+      \u043B\u044F \u043F\u0440\u0438\u0437\u0440\u0430\u043A\u043E\u0432."
+    type: Tweak
+  - message: "\u041F\u0440\u0438 \u043F\u043E\u044F\u0432\u043B\u0435\u043D\u0438\u0438\
+      \ \u043D\u043E\u0432\u044B\u0445 \u0440\u043E\u043B\u0435\u0439 \u0434\u043B\
+      \u044F \u043F\u0440\u0438\u0437\u0440\u0430\u043A\u043E\u0432 \u043E\u043D\u0438\
+      \ \u0431\u0443\u0434\u0443\u0442 \u043F\u043E\u043B\u0443\u0447\u0430\u0442\u044C\
+      \ \u0437\u0432\u0443\u043A\u043E\u0432\u043E\u0435 \u043E\u043F\u043E\u0432\u0435\
+      \u0449\u0435\u043D\u0438\u0435."
+    type: Tweak
+  id: 469
+  time: '2024-11-29T01:35:03.138795+00:00'
diff --git a/Resources/Locale/ru-RU/_strings/ghost/ghost-gui.ftl b/Resources/Locale/ru-RU/_strings/ghost/ghost-gui.ftl
index 97834cc36c..397a585e99 100644
--- a/Resources/Locale/ru-RU/_strings/ghost/ghost-gui.ftl
+++ b/Resources/Locale/ru-RU/_strings/ghost/ghost-gui.ftl
@@ -27,6 +27,7 @@ ghost-roles-window-leave-raffle-button =
     })
 ghost-roles-window-request-role-button = Запросить
 ghost-roles-window-request-role-button-timer = Запросить ({ $time }сек.)
+ghost-roles-window-rules-role-button = Правила
 ghost-roles-window-follow-role-button = Следовать
 ghost-roles-window-no-roles-available-label = В настоящее время нет доступных ролей призраков.
 ghost-roles-window-rules-footer = Кнопка станет доступна через { $time } секунд (эта задержка нужна, чтобы убедиться, что вы прочитали правила).