Улучшение спонсорки (#282)

* улучшение спонсорки
Lost-Paradise-Project · Oct 16, 2024 · d820d14 · d820d14
1 parent 555ac27
commit d820d14
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 195 deletions.
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
@@ -21,6 +21,7 @@
 using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Robust.Shared.Player;
+using Robust.Client.Player;
 #if LPP_Sponsors
 using Content.Client._LostParadise.Sponsors;
 #endif
@@ -29,6 +30,7 @@ namespace Content.Client.LateJoin
 {
     public sealed class LateJoinGui : DefaultWindow
     {
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IConfigurationManager _configManager = default!;
@@ -95,6 +97,7 @@ private void RebuildUI()
             var sponsorTier = 0;
             if (sys.TryGetInfo(out var sponsorInfo))
                 sponsorTier = sponsorInfo.Tier;
+            var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
 
             if (!_gameTicker.DisallowedLateJoin && _gameTicker.StationNames.Count == 0)
@@ -286,7 +289,7 @@ private void RebuildUI()
                                 _configManager,
                                 out var reasons
 #if LPP_Sponsors
-                                , 0, sponsorTier
+                                , 0, sponsorTier, uuid
 #endif
                                 ))
                         {

diff --git a/Content.Client/Preferences/UI/AntagPreferenceSelector.cs b/Content.Client/Preferences/UI/AntagPreferenceSelector.cs
@@ -2,8 +2,13 @@
 using Content.Shared.Customization.Systems;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using System.Linq;
+using System.Numerics;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
+using Robust.Client.Player;
+
 #if LPP_Sponsors
 using Content.Client._LostParadise.Sponsors;
 #endif
@@ -12,6 +17,7 @@ namespace Content.Client.Preferences.UI;
 
 public sealed class AntagPreferenceSelector : RequirementsSelector<AntagPrototype>
 {
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
     // 0 is yes and 1 is no
     public bool Preference
     {
@@ -48,6 +54,7 @@ public AntagPreferenceSelector(AntagPrototype proto, JobPrototype highJob) : bas
         var sponsorTier = 0;
         if (sys.TryGetInfo(out var sponsorInfo))
             sponsorTier = sponsorInfo.Tier;
+        var uuid = "";//_playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
 
         if (proto.Requirements != null
@@ -63,7 +70,7 @@ public AntagPreferenceSelector(AntagPrototype proto, JobPrototype highJob) : bas
                 configMan,
                 out var reasons
 #if LPP_Sponsors
-                , 0, sponsorTier
+                , 0, sponsorTier, uuid
 #endif
                 ))
             LockRequirements(characterReqs.GetRequirementsText(reasons));

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -31,6 +31,8 @@
 using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using Robust.Shared.Player;
+using Robust.Client.Player;
 using Direction = Robust.Shared.Maths.Direction;
 #if LPP_Sponsors
 using Content.Client._LostParadise.Sponsors;
@@ -41,6 +43,7 @@ namespace Content.Client.Preferences.UI
     [GenerateTypedNameReferences]
     public sealed partial class HumanoidProfileEditor : BoxContainer
     {
+        private readonly IPlayerManager _playerManager;
         private readonly IEntityManager _entityManager;
         private readonly IPrototypeManager _prototypeManager;
         private readonly IClientPreferencesManager _preferencesManager;
@@ -121,6 +124,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             IConfigurationManager configurationManager)
         {
             RobustXamlLoader.Load(this);
+            _playerManager = IoCManager.Resolve<IPlayerManager>();
             _entityManager = IoCManager.Resolve<IEntityManager>();
             _prototypeManager = prototypeManager;
             _preferencesManager = preferencesManager;
@@ -734,6 +738,7 @@ private void UpdateRoleRequirements()
             var sponsorTier = 0;
             if (sys.TryGetInfo(out var sponsorInfo))
                 sponsorTier = sponsorInfo.Tier;
+            var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
 
             var departments = _prototypeManager.EnumeratePrototypes<DepartmentPrototype>().ToArray();
@@ -804,7 +809,7 @@ private void UpdateRoleRequirements()
                         _configurationManager,
                         out var reasons
 #if LPP_Sponsors
-                        , 0, sponsorTier
+                        , 0, sponsorTier, uuid
 #endif
                         ))
                         selector.LockRequirements(_characterRequirementsSystem.GetRequirementsText(reasons));
@@ -854,6 +859,7 @@ private void EnsureJobRequirementsValid()
             var sponsorTier = 0;
             if (sys.TryGetInfo(out var sponsorInfo))
                 sponsorTier = sponsorInfo.Tier;
+            var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
             foreach (var selector in _jobPriorities)
             {
@@ -870,7 +876,7 @@ private void EnsureJobRequirementsValid()
                         _configurationManager,
                         out _
 #if LPP_Sponsors
-                        , 0, sponsorTier
+                        , 0, sponsorTier, uuid
 #endif
                         ))
                     continue;
@@ -1508,6 +1514,7 @@ private void UpdateTraits(bool showUnusable)
             var sponsorTier = 0;
             if (sys.TryGetInfo(out var sponsorInfo))
                 sponsorTier = sponsorInfo.Tier;
+            var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
 
             _traits.Clear();
@@ -1525,7 +1532,7 @@ private void UpdateTraits(bool showUnusable)
                     _configurationManager,
                     out _
 #if LPP_Sponsors
-                        , 0, sponsorTier
+                        , 0, sponsorTier, uuid
 #endif
                 );
                 _traits.Add(trait, usable);
@@ -1824,6 +1831,7 @@ private void UpdateLoadouts(bool showUnusable)
             var sponsorTier = 0;
             if (sys.TryGetInfo(out var sponsorInfo))
                 sponsorTier = sponsorInfo.Tier;
+            var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
 
             // Get the highest priority job to use for loadout filtering
@@ -1844,7 +1852,7 @@ private void UpdateLoadouts(bool showUnusable)
                     _configurationManager,
                     out _
 #if LPP_Sponsors
-                    , 0, sponsorTier
+                    , 0, sponsorTier, uuid
 #endif
                 );
                 _loadouts.Add(loadout, usable);

diff --git a/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs b/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs
@@ -15,6 +15,8 @@
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using Robust.Shared.Player;
+using Robust.Client.Player;
 #if LPP_Sponsors
 using Content.Client._LostParadise.Sponsors;
 #endif
@@ -23,6 +25,7 @@ namespace Content.Client.Preferences.UI;
 
 public sealed class LoadoutPreferenceSelector : Control
 {
+    private readonly IPlayerManager _playerManager;
     public LoadoutPrototype Loadout { get; }
 
     public bool Valid;
@@ -66,6 +69,8 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
         IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
         CharacterRequirementsSystem characterRequirementsSystem, JobRequirementsManager jobRequirementsManager)
     {
+        _playerManager = IoCManager.Resolve<IPlayerManager>();
+
         Loadout = loadout;
 
         SpriteView previewLoadout;
@@ -152,6 +157,7 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
         var sponsorTier = 0;
         if (sys.TryGetInfo(out var sponsorInfo))
             sponsorTier = sponsorInfo.Tier;
+        var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
 
         // Get requirement reasons
@@ -161,7 +167,7 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
             entityManager, prototypeManager, configManager,
             out var reasons
 #if LPP_Sponsors
-                        , 0, sponsorTier
+            , 0, sponsorTier, uuid
 #endif
             );
 

diff --git a/Content.Client/Preferences/UI/TraitPreferenceSelector.cs b/Content.Client/Preferences/UI/TraitPreferenceSelector.cs
@@ -11,6 +11,9 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using Robust.Shared.Player;
+using Robust.Client.Player;
+using System.Linq;
 #if LPP_Sponsors
 using Content.Client._LostParadise.Sponsors;
 #endif
@@ -19,6 +22,8 @@ namespace Content.Client.Preferences.UI;
 
 public sealed class TraitPreferenceSelector : Control
 {
+    private readonly IPlayerManager _playerManager;
+
     public TraitPrototype Trait { get; }
 
     public bool Valid;
@@ -48,6 +53,8 @@ public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob, Human
         IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
         CharacterRequirementsSystem characterRequirementsSystem, JobRequirementsManager jobRequirementsManager)
     {
+        _playerManager = IoCManager.Resolve<IPlayerManager>();
+
         Trait = trait;
 
         // Create a checkbox to get the loadout
@@ -89,6 +96,7 @@ public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob, Human
         var sponsorTier = 0;
         if (sys.TryGetInfo(out var sponsorInfo))
             sponsorTier = sponsorInfo.Tier;
+        var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
 #endif
 
         // Get requirement reasons
@@ -98,7 +106,7 @@ public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob, Human
             entityManager, prototypeManager, configManager,
             out var reasons
 #if LPP_Sponsors
-            , 0, sponsorTier
+            , 0, sponsorTier, uuid
 #endif
             );
 

diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
@@ -243,14 +243,20 @@ private void SendOOC(ICommonSession player, string message)
                 return;
             }
 
-            var wrappedMessage = Loc.GetString("chat-manager-send-ooc-wrap-message", ("playerName",player.Name), ("message", FormattedMessage.EscapeText(message)));
+            Color? colorOverride = null;
+            var wrappedMessage = Loc.GetString("chat-manager-send-ooc-wrap-message", ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+            if (_adminManager.HasAdminFlag(player, AdminFlags.Admin))
+            {
+                var prefs = _preferencesManager.GetPreferences(player.UserId);
+                colorOverride = prefs.AdminOOCColor;
+            }
             if (_netConfigManager.GetClientCVar(player.Channel, CCVars.ShowOocPatronColor) && player.Channel.UserData.PatronTier is { } patron && PatronOocColors.TryGetValue(patron, out var patronColor))
             {
-                wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor),("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+                wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor), ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
             }
 
 #if LPP_Sponsors  // _LostParadise-Sponsors
-            if (_sponsorsManager.TryGetInfo(player.UserId, out var sponsorData) && sponsorData.OOCColor != null)
+            if (_sponsorsManager.TryGetInfo(player.UserId, out var sponsorData) && sponsorData.Tier > 0)
             {
                 wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", sponsorData.OOCColor), ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
             }

diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -187,6 +187,7 @@ public bool IsAllowed(ICommonSession player, string role)
 
 #if LPP_Sponsors
         var sponsorTier = _checkSponsor.CheckUser(player.UserId).Item2 ?? 0;
+        var uuid = player.UserId.ToString();
 #endif
 
         return _characterRequirements.CheckRequirementsValid(
@@ -201,7 +202,7 @@ public bool IsAllowed(ICommonSession player, string role)
             _config,
             out _
 #if LPP_Sponsors
-            , 0, sponsorTier
+            , 0, sponsorTier, uuid
 #endif
             );
     }
@@ -222,6 +223,7 @@ public HashSet<string> GetDisallowedJobs(ICommonSession player)
 
 #if LPP_Sponsors
         var sponsorTier = _checkSponsor.CheckUser(player.UserId).Item2 ?? 0;
+        var uuid = player.UserId.ToString();
 #endif
 
         foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
@@ -240,7 +242,7 @@ public HashSet<string> GetDisallowedJobs(ICommonSession player)
                         _config,
                         out _
 #if LPP_Sponsors
-            , 0, sponsorTier
+                        , 0, sponsorTier, uuid
 #endif
                         ))
                     continue;
@@ -272,6 +274,7 @@ public void RemoveDisallowedJobs(NetUserId userId, ref List<string> jobs)
 
 #if LPP_Sponsors
         var sponsorTier = _checkSponsor.CheckUser(player.UserId).Item2 ?? 0;
+        var uuid = player.UserId.ToString();
 #endif
 
         for (var i = 0; i < jobs.Count; i++)
@@ -295,7 +298,7 @@ public void RemoveDisallowedJobs(NetUserId userId, ref List<string> jobs)
                 _config,
                 out _
 #if LPP_Sponsors
-            , 0, sponsorTier
+                , 0, sponsorTier, uuid
 #endif
                 ))
             {