Поправка для спонсорки (#303)

* улучшение спонсорки

* Update ChatManager.cs

забыл убрать лишнее

* доработка спонсорки

Content.Client/Lobby/LobbyUIController.cs

@@ -16,6 +16,11 @@
 using Robust.Client.UserInterface.Controllers;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
+using Robust.Client.Player;
+#if LPP_Sponsors
+using Content.Client._LostParadise.Sponsors;
+#endif
 
 namespace Content.Client.Lobby;
 
@@ -28,6 +33,7 @@ public sealed partial class LobbyUIController : UIController, IOnStateEntered<Lo
     [UISystemDependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
     [UISystemDependency] private readonly ClientInventorySystem _inventory = default!;
     [UISystemDependency] private readonly LoadoutSystem _loadouts = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     private LobbyCharacterPanel? _previewPanel;
     private HumanoidProfileEditor? _profileEditor;
@@ -118,15 +124,25 @@ public void UpdateCharacterUI()
         _previewPanel?.SetSummaryText(maybeProfile.Summary);
         _humanoid.LoadProfile(_previewDummy.Value, maybeProfile);
 
-
+#if LPP_Sponsors
+        var sys = IoCManager.Resolve<SponsorsManager>();
+        var sponsorTier = 0;
+        if (sys.TryGetInfo(out var sponsorInfo))
+            sponsorTier = sponsorInfo.Tier;
+        var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
+#endif
         if (UpdateClothes)
         {
             RemoveDummyClothes(_previewDummy.Value);
             if (ShowClothes)
                 GiveDummyJobClothes(_previewDummy.Value, GetPreferredJob(maybeProfile), maybeProfile);
             if (ShowLoadouts)
                 _loadouts.ApplyCharacterLoadout(_previewDummy.Value, GetPreferredJob(maybeProfile), maybeProfile,
-                    _jobRequirements.GetRawPlayTimeTrackers(), _jobRequirements.IsWhitelisted());
+                    _jobRequirements.GetRawPlayTimeTrackers(), _jobRequirements.IsWhitelisted()
+#if LPP_Sponsors
+            , sponsorTier, uuid
+#endif
+                    );
             UpdateClothes = false;
         }
 
@@ -171,9 +187,20 @@ public void RemoveDummyClothes(EntityUid dummy)
     /// </summary>
     public void GiveDummyJobClothesLoadout(EntityUid dummy, HumanoidCharacterProfile profile)
     {
+#if LPP_Sponsors
+        var sys = IoCManager.Resolve<SponsorsManager>();
+        var sponsorTier = 0;
+        if (sys.TryGetInfo(out var sponsorInfo))
+            sponsorTier = sponsorInfo.Tier;
+        var uuid = _playerManager.LocalUser != null ? _playerManager.LocalUser.ToString() ?? "" : "";
+#endif
         var job = GetPreferredJob(profile);
         GiveDummyJobClothes(dummy, job, profile);
-        _loadouts.ApplyCharacterLoadout(dummy, job, profile, _jobRequirements.GetRawPlayTimeTrackers(), _jobRequirements.IsWhitelisted());
+        _loadouts.ApplyCharacterLoadout(dummy, job, profile, _jobRequirements.GetRawPlayTimeTrackers(), _jobRequirements.IsWhitelisted()
+#if LPP_Sponsors
+            , sponsorTier, uuid
+#endif
+            );
     }
 
     /// <summary>

Content.Client/Preferences/ClientPreferencesManager.cs

@@ -85,8 +85,8 @@ public void UpdateCharacter(ICharacterProfile profile, int slot)
                 if (sponsorMarkings is not null && sponsorMarkings.Count() > 0)
                     allowedMarkings = allowedMarkings.Concat(sponsorMarkings).ToArray();
             }
-                var session = _playerManager.LocalSession!;
-                profile.EnsureValid(session, collection, allowedMarkings);
+            var session = _playerManager.LocalSession!;
+            profile.EnsureValid(session, collection, allowedMarkings);
 #else
             profile.EnsureValid(_playerManager.LocalSession!, collection);
 #endif

Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

@@ -1474,7 +1474,7 @@ private void UpdateTraits(bool showUnusable)
                     _configurationManager,
                     out _
 #if LPP_Sponsors
-                        , 0, sponsorTier, uuid
+                    , 0, sponsorTier, uuid
 #endif
                 );
                 _traits.Add(trait, usable);

Content.Server/Clothing/Systems/LoadoutSystem.cs

@@ -7,6 +7,9 @@
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.Configuration;
+#if LPP_Sponsors
+using Content.Server._LostParadise.Sponsors;
+#endif
 
 namespace Content.Server.Clothing.Systems;
 
@@ -17,7 +20,9 @@ public sealed class LoadoutSystem : EntitySystem
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly SharedStorageSystem _storage = default!;
     [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
-
+#if LPP_Sponsors
+    [Dependency] private readonly CheckSponsorSystem _checkSponsor = default!;
+#endif
 
     public override void Initialize()
     {
@@ -27,13 +32,22 @@ public override void Initialize()
 
     private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent ev)
     {
+#if LPP_Sponsors
+        var sponsorTier = _checkSponsor.CheckUser(ev.Player.UserId).Item2 ?? 0;
+        var uuid = ev.Player.UserId.ToString();
+#endif
+
         if (ev.JobId == null ||
             !_configurationManager.GetCVar(CCVars.GameLoadoutsEnabled))
             return;
 
         // Spawn the loadout, get a list of items that failed to equip
         var failedLoadouts = _loadout.ApplyCharacterLoadout(ev.Mob, ev.JobId, ev.Profile,
-            _playTimeTracking.GetTrackerTimes(ev.Player), ev.Player.ContentData()?.Whitelisted ?? false);
+            _playTimeTracking.GetTrackerTimes(ev.Player), ev.Player.ContentData()?.Whitelisted ?? false
+#if LPP_Sponsors
+                , sponsorTier, uuid
+#endif
+            );
 
         // Try to find back-mounted storage apparatus
         if (!_inventory.TryGetSlotEntity(ev.Mob, "back", out var item) ||

Content.Server/Traits/TraitSystem.cs

@@ -14,6 +14,9 @@
 using Content.Shared.Psionics;
 using Content.Server.Language;
 using Content.Shared.Mood;
+#if LPP_Sponsors
+using Content.Server._LostParadise.Sponsors;
+#endif
 
 namespace Content.Server.Traits;
 
@@ -28,6 +31,9 @@ public sealed class TraitSystem : EntitySystem
     [Dependency] private readonly PsionicAbilitiesSystem _psionicAbilities = default!;
     [Dependency] private readonly IComponentFactory _componentFactory = default!;
     [Dependency] private readonly LanguageSystem _languageSystem = default!;
+#if LPP_Sponsors
+    [Dependency] private readonly CheckSponsorSystem _checkSponsor = default!;
+#endif
 
     public override void Initialize()
     {
@@ -39,6 +45,11 @@ public override void Initialize()
     // When the player is spawned in, add all trait components selected during character creation
     private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
     {
+
+#if LPP_Sponsors
+        var sponsorTier = _checkSponsor.CheckUser(args.Player.UserId).Item2 ?? 0;
+        var uuid = args.Player.UserId.ToString();
+#endif
         foreach (var traitId in args.Profile.TraitPreferences)
         {
             if (!_prototype.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
@@ -52,7 +63,11 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 _prototype.Index<JobPrototype>(args.JobId ?? _prototype.EnumeratePrototypes<JobPrototype>().First().ID),
                 args.Profile, _playTimeTracking.GetTrackerTimes(args.Player), args.Player.ContentData()?.Whitelisted ?? false, traitPrototype,
                 EntityManager, _prototype, _configuration,
-                out _))
+                out _
+#if LPP_Sponsors
+                , 0, sponsorTier, uuid
+#endif
+                ))
                 continue;
 
             AddTrait(args.Mob, traitPrototype);

Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs

@@ -40,10 +40,18 @@ private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent a
 
 
     public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, ProtoId<JobPrototype> job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, bool whitelisted)
+        Dictionary<string, TimeSpan> playTimes, bool whitelisted
+#if LPP_Sponsors
+        , int sponsorTier = 0, string uuid = ""
+#endif
+        )
     {
         var jobPrototype = _prototype.Index(job);
-        return ApplyCharacterLoadout(uid, jobPrototype, profile, playTimes, whitelisted);
+        return ApplyCharacterLoadout(uid, jobPrototype, profile, playTimes, whitelisted
+#if LPP_Sponsors
+            , sponsorTier, uuid
+#endif
+            );
     }
 
     /// <summary>
@@ -56,7 +64,11 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, ProtoId<JobPrototype
     /// <param name="whitelisted">If the player is whitelisted</param>
     /// <returns>A list of loadout items that couldn't be equipped but passed checks</returns>
     public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, bool whitelisted)
+        Dictionary<string, TimeSpan> playTimes, bool whitelisted
+#if LPP_Sponsors
+        , int sponsorTier = 0, string uuid = ""
+#endif
+        )
     {
         var failedLoadouts = new List<EntityUid>();
 
@@ -72,7 +84,11 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
             if (!_characterRequirements.CheckRequirementsValid(
                 loadoutProto.Requirements, job, profile, playTimes, whitelisted, loadoutProto,
                 EntityManager, _prototype, _configuration,
-                out _))
+                out _
+#if LPP_Sponsors
+                , 0, sponsorTier, uuid
+#endif
+                ))
                 continue;
 
 

Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs

@@ -25,15 +25,14 @@ public bool CheckRequirementValid(CharacterRequirement requirement, JobPrototype
         )
     {
         var validation = false;
-#if LPP_Sponsors
-        validation = requirement.IsValid(job, profile, playTimes, whitelisted, prototype,
-            entityManager, prototypeManager, configManager,
-            out reason, depth, sponsorTier, uuid);
-#else
+
         validation = requirement.IsValid(job, profile, playTimes, whitelisted, prototype,
             entityManager, prototypeManager, configManager,
-            out reason, depth);
+            out reason, depth
+#if LPP_Sponsors
+            , sponsorTier, uuid
 #endif
+            );
 
         // Return false if the requirement is invalid and not inverted
         // If it's inverted return false when it's valid
@@ -56,15 +55,15 @@ public bool CheckRequirementsValid(List<CharacterRequirement> requirements, JobP
         {
             var validation = false;
             FormattedMessage? reason;
-#if LPP_Sponsors
-            validation = requirement.IsValid(job, profile, playTimes, whitelisted, prototype,
-                entityManager, prototypeManager, configManager,
-                out reason, depth, sponsorTier, uuid);
-#else
+
             validation = requirement.IsValid(job, profile, playTimes, whitelisted, prototype,
                 entityManager, prototypeManager, configManager,
-                out reason, depth);
+                out reason, depth
+#if LPP_Sponsors
+                , sponsorTier, uuid
 #endif
+                );
+
             // Set valid to false if the requirement is invalid and not inverted
             // If it's inverted set valid to false when it's valid
             if (!validation)