Fix Loadout and Trait Job Playtime Requirements

Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs

@@ -22,7 +22,7 @@ public sealed partial class JobRequirementsManager : ISharedPlaytimeManager
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
-    private readonly Dictionary<string, TimeSpan> _roles = new();
+    public readonly Dictionary<string, TimeSpan> PlayTimes = new();
     private readonly List<string> _roleBans = new();
 
     private ISawmill _sawmill = default!;
@@ -46,7 +46,7 @@ private void ClientOnRunLevelChanged(object? sender, RunLevelChangedEventArgs e)
         if (e.NewLevel == ClientRunLevel.Initialize)
         {
             // Reset on disconnect, just in case.
-            _roles.Clear();
+            PlayTimes.Clear();
         }
     }
 
@@ -64,12 +64,12 @@ private void RxRoleBans(MsgRoleBans message)
 
     private void RxPlayTime(MsgPlayTime message)
     {
-        _roles.Clear();
+        PlayTimes.Clear();
 
         // NOTE: do not assign _roles = message.Trackers due to implicit data sharing in integration tests.
         foreach (var (tracker, time) in message.Trackers)
         {
-            _roles[tracker] = time;
+            PlayTimes[tracker] = time;
         }
 
         /*var sawmill = Logger.GetSawmill("play_time");
@@ -107,7 +107,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
         var reasons = new List<string>();
         foreach (var requirement in requirements)
         {
-            if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes, _whitelisted, localePrefix))
+            if (JobRequirements.TryRequirementMet(requirement, PlayTimes, out var jobReason, _entManager, _prototypes, _whitelisted, localePrefix))
                 continue;
 
             reasons.Add(jobReason.ToMarkup());
@@ -119,25 +119,30 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
 
     public TimeSpan FetchOverallPlaytime()
     {
-        return _roles.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
+        return PlayTimes.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
     }
 
-    public IEnumerable<KeyValuePair<string, TimeSpan>> FetchPlaytimeByRoles()
+    public Dictionary<string, TimeSpan> FetchPlaytimeByRoles()
     {
         var jobsToMap = _prototypes.EnumeratePrototypes<JobPrototype>();
+        var ret = new Dictionary<string, TimeSpan>();
 
         foreach (var job in jobsToMap)
-        {
-            if (_roles.TryGetValue(job.PlayTimeTracker, out var locJobName))
-            {
-                yield return new KeyValuePair<string, TimeSpan>(job.Name, locJobName);
-            }
-        }
+            if (PlayTimes.TryGetValue(job.PlayTimeTracker, out var locJobName))
+                ret.Add(job.Name, locJobName);
+
+        return ret;
     }
 
 
-    public IReadOnlyDictionary<string, TimeSpan> GetPlayTimes(ICommonSession session)
+    public Dictionary<string, TimeSpan> GetPlayTimes()
     {
-        return session != _playerManager.LocalSession ? new Dictionary<string, TimeSpan>() : _roles;
+        var dict = new Dictionary<string, TimeSpan>();
+
+        dict.Add(PlayTimeTrackingShared.TrackerOverall, FetchOverallPlaytime());
+        foreach (var role in FetchPlaytimeByRoles())
+            dict.Add(role.Key, role.Value);
+
+        return dict;
     }
 }

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

@@ -5,6 +5,7 @@
 using Content.Client.Lobby;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
+using Content.Client.Roles;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing.Loadouts.Prototypes;
@@ -16,16 +17,19 @@
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
 using Content.Shared.Traits;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Physics;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using Direction = Robust.Shared.Maths.Direction;
@@ -1412,7 +1416,7 @@ private void UpdateTraits(bool showUnusable)
                     trait.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
+                    _requirements.GetPlayTimes(),
                     _entityManager,
                     _prototypeManager,
                     _configurationManager,
@@ -1427,7 +1431,7 @@ out _
                     trait.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
+                    _requirements.GetPlayTimes(),
                     _entityManager,
                     _prototypeManager,
                     _configurationManager,
@@ -1671,7 +1675,7 @@ private void UpdateLoadouts(bool showUnusable)
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
+                    _requirements.GetPlayTimes(),
                     _entityManager,
                     _prototypeManager,
                     _configurationManager,
@@ -1686,7 +1690,7 @@ out _
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
+                    _requirements.GetPlayTimes(),
                     _entityManager,
                     _prototypeManager,
                     _configurationManager,

Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs

@@ -209,7 +209,7 @@ private static void FlushSingleTracker(PlayTimeData data, TimeSpan time)
         }
     }
 
-    public IReadOnlyDictionary<string, TimeSpan> GetPlayTimes(ICommonSession session)
+    public Dictionary<string, TimeSpan> GetPlayTimes(ICommonSession session)
     {
         return GetTrackerTimes(session);
     }

Content.Shared/Customization/Systems/CharacterRequirements.cs

@@ -310,7 +310,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-too-high",
-                    ("time", playtime.Minutes - Max.Minutes),
+                    ("time", playtime.TotalMinutes - Max.TotalMinutes),
                     ("department", Loc.GetString($"department-{department.ID}")),
                     ("departmentColor", department.Color)));
             return false;
@@ -322,7 +322,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-insufficient",
-                    ("time", Min.Minutes - playtime.Minutes),
+                    ("time", Min.TotalMinutes - playtime.TotalMinutes),
                     ("department", Loc.GetString($"department-{department.ID}")),
                     ("departmentColor", department.Color)));
             return false;
@@ -367,7 +367,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-too-high",
-                    ("time", overallTime.Minutes - Max.Minutes)));
+                    ("time", overallTime.TotalMinutes - Max.TotalMinutes)));
             return false;
         }
 
@@ -377,7 +377,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-insufficient",
-                    ("time", Min.Minutes - overallTime.Minutes)));
+                    ("time", Min.TotalMinutes - overallTime.TotalMinutes)));
             return false;
         }
 
@@ -424,6 +424,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
 
         // Get the JobPrototype of the Tracker
         var trackerJob = jobSystem.GetJobPrototype(Tracker);
+        var jobStr = prototypeManager.Index<JobPrototype>(trackerJob).LocalizedName;
 
         // Get the primary department of the Tracker
         if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
@@ -444,8 +445,8 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-too-high",
-                    ("time", time.Minutes - Max.Minutes),
-                    ("job", trackerJob),
+                    ("time", time.TotalMinutes - Max.TotalMinutes),
+                    ("job", jobStr),
                     ("departmentColor", department.Color)));
             return false;
         }
@@ -456,8 +457,8 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-insufficient",
-                    ("time", Min.Minutes - time.Minutes),
-                    ("job", trackerJob),
+                    ("time", Min.TotalMinutes - time.TotalMinutes),
+                    ("job", jobStr),
                     ("departmentColor", department.Color)));
             return false;
         }

Content.Shared/Players/PlayTimeTracking/ISharedPlaytimeManager.cs

@@ -1,11 +1,3 @@
-using Robust.Shared.Player;
-
 namespace Content.Shared.Players.PlayTimeTracking;
 
-public interface ISharedPlaytimeManager
-{
-    /// <summary>
-    ///     Gets the playtimes for the session or an empty dictionary if none found.
-    /// </summary>
-    IReadOnlyDictionary<string, TimeSpan> GetPlayTimes(ICommonSession session);
-}
+public interface ISharedPlaytimeManager;