JobRequirement refactor (#30347)

* refactor JobRequirements

* add profile support

* fix

* Update quartermaster.yml

* sloth fixes

* inport 30208

* Update DepartmentPrototype.cs

* species restriction

* left tweak stick

* stringbuilder is cool!

Content.Client/LateJoin/LateJoinGui.cs

@@ -2,9 +2,11 @@ using System.Linq;
 using System.Numerics;
 using Content.Client.CrewManifest;
 using Content.Client.GameTicking.Managers;
+using Content.Client.Lobby;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Shared.CCVar;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Robust.Client.Console;
@@ -26,6 +28,7 @@ namespace Content.Client.LateJoin
         [Dependency] private readonly IConfigurationManager _configManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
+        [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
 
         public event Action<(NetEntity, string)> SelectedId;
 
@@ -254,7 +257,7 @@ namespace Content.Client.LateJoin
 
                         jobButton.OnPressed += _ => SelectedId.Invoke((id, jobButton.JobId));
 
-                        if (!_jobRequirements.IsAllowed(prototype, out var reason))
+                        if (!_jobRequirements.IsAllowed(prototype, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                         {
                             jobButton.Disabled = true;
 

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

@@ -649,7 +649,7 @@ namespace Content.Client.Lobby.UI
                 selector.Select(Profile?.AntagPreferences.Contains(antag.ID) == true ? 0 : 1);
 
                 var requirements = _entManager.System<SharedRoleSystem>().GetAntagRequirement(antag);
-                if (!_requirements.CheckRoleTime(requirements, out var reason))
+                if (!_requirements.CheckRoleRequirements(requirements, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                 {
                     selector.LockRequirements(reason);
                     Profile = Profile?.WithAntagPreference(antag.ID, false);
@@ -903,7 +903,7 @@ namespace Content.Client.Lobby.UI
                     icon.Texture = jobIcon.Icon.Frame0();
                     selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon, job.Guides);
 
-                    if (!_requirements.IsAllowed(job, out var reason))
+                    if (!_requirements.IsAllowed(job, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                     {
                         selector.LockRequirements(reason);
                     }

Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs

@@ -1,8 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Client.Lobby;
 using Content.Shared.CCVar;
 using Content.Shared.Players;
 using Content.Shared.Players.JobWhitelist;
 using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Client;
 using Robust.Client.Player;
@@ -90,7 +92,7 @@ public sealed partial class JobRequirementsManager : ISharedPlaytimeManager
         Updated?.Invoke();
     }
 
-    public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool IsAllowed(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
 
@@ -107,16 +109,16 @@ public sealed partial class JobRequirementsManager : ISharedPlaytimeManager
         if (player == null)
             return true;
 
-        return CheckRoleTime(job, out reason);
+        return CheckRoleRequirements(job, profile, out reason);
     }
 
-    public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleRequirements(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         var reqs = _entManager.System<SharedRoleSystem>().GetJobRequirement(job);
-        return CheckRoleTime(reqs, out reason);
+        return CheckRoleRequirements(reqs, profile, out reason);
     }
 
-    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleRequirements(HashSet<JobRequirement>? requirements, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
 
@@ -126,7 +128,7 @@ public sealed partial class JobRequirementsManager : ISharedPlaytimeManager
         var reasons = new List<string>();
         foreach (var requirement in requirements)
         {
-            if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes, _whitelisted))
+            if (requirement.Check(_entManager, _prototypes, profile, _roles, out var jobReason, _whitelisted))
                 continue;
 
             reasons.Add(jobReason.ToMarkup());

Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs

@@ -93,7 +93,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
                 bool hasAccess = true;
                 FormattedMessage? reason;
 
-                if (!requirementsManager.CheckRoleTime(group.Key.Requirements, out reason))
+                if (!requirementsManager.CheckRoleRequirements(group.Key.Requirements, null, out reason))
                 {
                     hasAccess = false;
                 }

Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs

@@ -6,6 +6,7 @@ using Content.Server.Afk.Events;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Server.Mind;
+using Content.Server.Preferences.Managers;
 using Content.Server.Station.Events;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
@@ -13,6 +14,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -35,6 +37,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
     [Dependency] private readonly MindSystem _minds = default!;
     [Dependency] private readonly PlayTimeTrackingManager _tracking = default!;
     [Dependency] private readonly IAdminManager _adminManager = default!;
+    [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!;
 
     public override void Initialize()
     {
@@ -209,7 +212,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
 
         var isWhitelisted = player.ContentData()?.Whitelisted ?? false; // DeltaV - Whitelist requirement
 
-        return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, isWhitelisted);
+        return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter, isWhitelisted);
     }
 
     public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
@@ -228,7 +231,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
 
         foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
         {
-            if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, isWhitelisted))
+            if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter, isWhitelisted))
                 roles.Add(job.ID);
         }
 
@@ -253,7 +256,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         for (var i = 0; i < jobs.Count; i++)
         {
             if (_prototypes.TryIndex(jobs[i], out var job)
-                && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, isWhitelisted))
+                && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(userId).SelectedCharacter, isWhitelisted))
             {
                 continue;
             }

Content.Shared/DeltaV/Roles/JobRequirement/WhitelistRequirement.cs

@@ -0,0 +1,29 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the player be globally whitelisted to play a role.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class WhitelistRequirement : JobRequirement
+{
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted)
+    {
+        reason = null;
+        if (isWhitelisted)
+            return true;
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("playtime-deny-reason-not-whitelisted"));
+        return false;
+    }
+}

Content.Shared/DeltaV/Roles/JobRequirements.Whitelist.cs

@@ -1,11 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Roles
-{
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class WhitelistRequirement : JobRequirement
-    {
-    }
-}

Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs

@@ -28,9 +28,11 @@ public sealed partial class JobRequirementLoadoutEffect : LoadoutEffect
         var playtimes = manager.GetPlayTimes(session);
         var isWhitelisted = session.ContentData()?.Whitelisted ?? false; // DeltaV - Whitelist requirement
 
-        return JobRequirements.TryRequirementMet(Requirement, playtimes, out reason,
-            collection.Resolve<IEntityManager>(),
+        return Requirement.Check(collection.Resolve<IEntityManager>(),
             collection.Resolve<IPrototypeManager>(),
+            profile,
+            playtimes,
+            out reason,
             isWhitelisted); // DeltaV
     }
 }

Content.Shared/Roles/DepartmentPrototype.cs

@@ -9,10 +9,16 @@ public sealed partial class DepartmentPrototype : IPrototype
     public string ID { get; } = string.Empty;
 
     /// <summary>
-    /// A description string to display in the character menu as an explanation of the department's function.
+    /// The name LocId of the department that will be displayed in the various menus.
     /// </summary>
     [DataField(required: true)]
-    public string Description = string.Empty;
+    public LocId Name = string.Empty;
+
+    /// <summary>
+    /// A description LocId to display in the character menu as an explanation of the department's function.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Description = string.Empty;
 
     /// <summary>
     /// A color representing this department to use for text.

Content.Shared/Roles/JobRequirement/AgeRequirement.cs

@@ -0,0 +1,51 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the character to be older or younger than a certain age (inclusive)
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class AgeRequirement : JobRequirement
+{
+    [DataField(required: true)]
+    public int RequiredAge;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole
+            return true;
+
+        if (!Inverted)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-young",
+                ("age", RequiredAge)));
+
+            if (profile.Age <= RequiredAge)
+                return false;
+        }
+        else
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-old",
+                ("age", RequiredAge)));
+
+            if (profile.Age >= RequiredAge)
+                return false;
+        }
+
+        return true;
+    }
+}

Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs

@@ -0,0 +1,84 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class DepartmentTimeRequirement : JobRequirement
+{
+    /// <summary>
+    /// Which department needs the required amount of time.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department = default!;
+
+    /// <summary>
+    /// How long (in seconds) this requirement is.
+    /// </summary>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+        var playtime = TimeSpan.Zero;
+
+        // Check all jobs' departments
+        var department = protoManager.Index(Department);
+        var jobs = department.Roles;
+        string proto;
+
+        // Check all jobs' playtime
+        foreach (var other in jobs)
+        {
+            // The schema is stored on the Job role but we want to explode if the timer isn't found anyway.
+            proto = protoManager.Index(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        var deptDiff = Time.TotalMinutes - playtime.TotalMinutes;
+        var nameDepartment = "role-timer-department-unknown";
+
+        if (protoManager.TryIndex(Department, out var departmentIndexed))
+        {
+            nameDepartment = departmentIndexed.Name;
+        }
+
+        if (!Inverted)
+        {
+            if (deptDiff <= 0)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-department-insufficient",
+                ("time", Math.Ceiling(deptDiff)),
+                ("department", Loc.GetString(nameDepartment)),
+                ("departmentColor", department.Color.ToHex())));
+            return false;
+        }
+
+        if (deptDiff <= 0)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-department-too-high",
+                ("time", -deptDiff),
+                ("department", Loc.GetString(nameDepartment)),
+                ("departmentColor", department.Color.ToHex())));
+            return false;
+        }
+
+        return true;
+    }
+}

Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs

@@ -0,0 +1,51 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class OverallPlaytimeRequirement : JobRequirement
+{
+    /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+        var overallDiff = Time.TotalMinutes - overallTime.TotalMinutes;
+
+        if (!Inverted)
+        {
+            if (overallDiff <= 0 || overallTime >= Time)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-overall-insufficient",
+                ("time", Math.Ceiling(overallDiff))));
+            return false;
+        }
+
+        if (overallDiff <= 0 || overallTime >= Time)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high",
+                ("time", -overallDiff)));
+            return false;
+        }
+
+        return true;
+    }
+}

Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs

@@ -0,0 +1,74 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles.Jobs;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class RoleTimeRequirement : JobRequirement
+{
+    /// <summary>
+    /// What particular role they need the time requirement with.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Role = default!;
+
+    /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        string proto = Role;
+
+        playTimes.TryGetValue(proto, out var roleTime);
+        var roleDiff = Time.TotalMinutes - roleTime.TotalMinutes;
+        var departmentColor = Color.Yellow;
+
+        if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            var jobProto = jobSystem.GetJobPrototype(proto);
+
+            if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
+                departmentColor = departmentProto.Color;
+        }
+
+        if (!Inverted)
+        {
+            if (roleDiff <= 0)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-role-insufficient",
+                ("time", Math.Ceiling(roleDiff)),
+                ("job", Loc.GetString(proto)),
+                ("departmentColor", departmentColor.ToHex())));
+            return false;
+        }
+
+        if (roleDiff <= 0)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-role-too-high",
+                ("time", -roleDiff),
+                ("job", Loc.GetString(proto)),
+                ("departmentColor", departmentColor.ToHex())));
+            return false;
+        }
+
+        return true;
+    }
+}

Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs

@@ -0,0 +1,60 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the character to be or not be on the list of specified species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class SpeciesRequirement : JobRequirement
+{
+    [DataField(required: true)]
+    public HashSet<ProtoId<SpeciesPrototype>> Species = new();
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole
+            return true;
+
+        var sb = new StringBuilder();
+        sb.Append("[color=yellow]");
+        foreach (var s in Species)
+        {
+            sb.Append(Loc.GetString(protoManager.Index(s).Name) + " ");
+        }
+
+        sb.Append("[/color]");
+
+        if (!Inverted)
+        {
+            reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-whitelisted-species")}\n{sb}");
+
+            if (!Species.Contains(profile.Species))
+                return false;
+        }
+        else
+        {
+            reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-blacklisted-species")}\n{sb}");
+
+            if (Species.Contains(profile.Species))
+                return false;
+        }
+
+        return true;
+    }
+}

Content.Shared/Roles/JobRequirements.cs

@@ -1,239 +1,53 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Roles.Jobs;
-using JetBrains.Annotations;
+using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Roles
+namespace Content.Shared.Roles;
+
+public static class JobRequirements
 {
-    /// <summary>
-    /// Abstract class for playtime and other requirements for role gates.
-    /// </summary>
-    [ImplicitDataDefinitionForInheritors]
-    [Serializable, NetSerializable]
-    public abstract partial class JobRequirement{}
-
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class DepartmentTimeRequirement : JobRequirement
+    public static bool TryRequirementsMet(
+        JobPrototype job,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        bool isWhitelisted) // DeltaV
     {
-        /// <summary>
-        /// Which department needs the required amount of time.
-        /// </summary>
-        [DataField("department", customTypeSerializer: typeof(PrototypeIdSerializer<DepartmentPrototype>))]
-        public string Department = default!;
-
-        /// <summary>
-        /// How long (in seconds) this requirement is.
-        /// </summary>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <summary>
-        /// If true, requirement will return false if playtime above the specified time.
-        /// </summary>
-        /// <value>
-        /// <c>False</c> by default.<br />
-        /// <c>True</c> for invert general requirement
-        /// </value>
-        [DataField("inverted")] public bool Inverted;
-    }
-
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class RoleTimeRequirement : JobRequirement
-    {
-        /// <summary>
-        /// What particular role they need the time requirement with.
-        /// </summary>
-        [DataField("role", customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
-        public string Role = default!;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Inverted"/>
-        [DataField("inverted")] public bool Inverted;
-    }
-
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class OverallPlaytimeRequirement : JobRequirement
-    {
-        /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Inverted"/>
-        [DataField("inverted")] public bool Inverted;
-    }
-
-    public static class JobRequirements
-    {
-        public static bool TryRequirementsMet(
-            JobPrototype job,
-            IReadOnlyDictionary<string, TimeSpan> playTimes,
-            [NotNullWhen(false)] out FormattedMessage? reason,
-            IEntityManager entManager,
-            IPrototypeManager prototypes,
-            bool isWhitelisted)
-        {
-            var sys = entManager.System<SharedRoleSystem>();
-            var requirements = sys.GetJobRequirement(job);
-            reason = null;
-            if (requirements == null)
-                return true;
-
-            foreach (var requirement in requirements)
-            {
-                if (!TryRequirementMet(requirement, playTimes, out reason, entManager, prototypes, isWhitelisted))
-                    return false;
-            }
-
+        var sys = entManager.System<SharedRoleSystem>();
+        var requirements = sys.GetJobRequirement(job);
+        reason = null;
+        if (requirements == null)
             return true;
-        }
 
-        /// <summary>
-        /// Returns a string with the reason why a particular requirement may not be met.
-        /// </summary>
-        public static bool TryRequirementMet(
-            JobRequirement requirement,
-            IReadOnlyDictionary<string, TimeSpan> playTimes,
-            [NotNullWhen(false)] out FormattedMessage? reason,
-            IEntityManager entManager,
-            IPrototypeManager prototypes,
-            bool isWhitelisted)
+        foreach (var requirement in requirements)
         {
-            reason = null;
-
-            switch (requirement)
-            {
-                case DepartmentTimeRequirement deptRequirement:
-                    var playtime = TimeSpan.Zero;
-
-                    // Check all jobs' departments
-                    var department = prototypes.Index<DepartmentPrototype>(deptRequirement.Department);
-                    var jobs = department.Roles;
-                    string proto;
-
-                    // Check all jobs' playtime
-                    foreach (var other in jobs)
-                    {
-                        // The schema is stored on the Job role but we want to explode if the timer isn't found anyway.
-                        proto = prototypes.Index<JobPrototype>(other).PlayTimeTracker;
-
-                        playTimes.TryGetValue(proto, out var otherTime);
-                        playtime += otherTime;
-                    }
-
-                    var deptDiff = deptRequirement.Time.TotalMinutes - playtime.TotalMinutes;
-
-                    if (!deptRequirement.Inverted)
-                    {
-                        if (deptDiff <= 0)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                            "role-timer-department-insufficient",
-                            ("time", Math.Ceiling(deptDiff)),
-                            ("department", Loc.GetString(deptRequirement.Department)),
-                            ("departmentColor", department.Color.ToHex())));
-                        return false;
-                    }
-                    else
-                    {
-                        if (deptDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                                "role-timer-department-too-high",
-                                ("time", -deptDiff),
-                                ("department", Loc.GetString(deptRequirement.Department)),
-                                ("departmentColor", department.Color.ToHex())));
-                            return false;
-                        }
-
-                        return true;
-                    }
-
-                case OverallPlaytimeRequirement overallRequirement:
-                    var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
-                    var overallDiff = overallRequirement.Time.TotalMinutes - overallTime.TotalMinutes;
-
-                    if (!overallRequirement.Inverted)
-                    {
-                        if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                              "role-timer-overall-insufficient",
-                              ("time", Math.Ceiling(overallDiff))));
-                        return false;
-                    }
-                    else
-                    {
-                        if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff)));
-                            return false;
-                        }
-
-                        return true;
-                    }
-
-                case RoleTimeRequirement roleRequirement:
-                    proto = roleRequirement.Role;
-
-                    playTimes.TryGetValue(proto, out var roleTime);
-                    var roleDiff = roleRequirement.Time.TotalMinutes - roleTime.TotalMinutes;
-                    var departmentColor = Color.Yellow;
-
-                    if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
-                    {
-                        var jobProto = jobSystem.GetJobPrototype(proto);
-
-                        if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
-                            departmentColor = departmentProto.Color;
-                    }
-
-                    if (!roleRequirement.Inverted)
-                    {
-                        if (roleDiff <= 0)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                            "role-timer-role-insufficient",
-                            ("time", Math.Ceiling(roleDiff)),
-                            ("job", Loc.GetString(proto)),
-                            ("departmentColor", departmentColor.ToHex())));
-                        return false;
-                    }
-                    else
-                    {
-                        if (roleDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                                "role-timer-role-too-high",
-                                ("time", -roleDiff),
-                                ("job", Loc.GetString(proto)),
-                                ("departmentColor", departmentColor.ToHex())));
-                            return false;
-                        }
-
-                        return true;
-                    }
-                case WhitelistRequirement _: // DeltaV - Whitelist requirement
-                    if (isWhitelisted == null)
-                        throw new ArgumentNullException(nameof(isWhitelisted), "isWhitelisted cannot be null.");
-
-                    if (isWhitelisted)
-                        return true;
-
-                    reason = FormattedMessage.FromMarkup(Loc.GetString("playtime-deny-reason-not-whitelisted"));
-                    return false;
-                default:
-                    throw new NotImplementedException();
-            }
+            if (!requirement.Check(entManager, protoManager, profile, playTimes, out reason, isWhitelisted))
+                return false;
         }
+
+        return true;
     }
 }
+
+/// <summary>
+/// Abstract class for playtime and other requirements for role gates.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[Serializable, NetSerializable]
+public abstract partial class JobRequirement
+{
+    [DataField]
+    public bool Inverted;
+
+    public abstract bool Check(
+        IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted); // DeltaV
+}

Resources/Locale/en-US/deltav/job/department-desc.ftl

@@ -1,2 +1,3 @@
+department-Epistemics-description = Research artifacts and anomalies to invent new equipment for the station, while trying to keep glimmer tame.
+department-Logistics-description = Complete bounties, earn Spesos, and deliver useful supplies to the crew.
 department-Justice-description = Uphold justice on the station.
-

Resources/Locale/en-US/deltav/job/department.ftl

@@ -1,4 +1,3 @@
 department-Epistemics = Epistemics
 department-Logistics = Logistics
 department-Justice = Justice
-

Resources/Locale/en-US/job/role-requirements.ftl

@@ -4,7 +4,13 @@ role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0"
 role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
 role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role.
 role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?)
+role-timer-age-to-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-age-to-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-whitelisted-species = Your character must be one of the following species to play this role:
+role-timer-blacklisted-species = Your character must not be one of the following species to play this role:
 
 role-timer-locked = Locked (hover for details)
 
+role-timer-department-unknown = Unknown Department
+
 role-ban = You have been banned from this role.

Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml

@@ -1,6 +1,6 @@
 - type: department
   id: Justice
-  description: department-justice-description
+  description: department-Justice-description
   color: "#701442"
   roles:
   - ChiefJustice

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -19,6 +19,8 @@
       time: 43200 #DeltaV 12 hours
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -21,10 +21,12 @@
       time: 18000 # 5 hours
     - !type:DepartmentTimeRequirement
       department: Command
-      time: 108000 # DeltaV - 30 hours
+      time: 108000 # DeltaV - 30 hours, was 15
     - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
       time: 108000 # 30 hours
     - !type:WhitelistRequirement # DeltaV - Whitelist requirement
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 20
   startingGear: CaptainGear
   icon: "JobIconCaptain"

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -19,6 +19,8 @@
       time: 72000 # 20 hours
     - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
       time: 90000 # 25 hours
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -12,9 +12,11 @@
 #      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 90000 # DeltaV - 25 hours
+      time: 90000 # DeltaV - 25 hours, was 10
 #    - !type:OverallPlaytimeRequirement
-#      time: 72000 # DeltaV - 20 hours
+#      time: 144000 # DeltaV - was 40 hours upstream
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -17,7 +17,9 @@
       department: Medical
       time: 43200 # DeltaV - 12 hours
     - !type:OverallPlaytimeRequirement
-      time: 72000 # DeltaV - 20 hours
+      time: 72000 # DeltaV - 20 hours, was 40
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -9,7 +9,9 @@
       department: Epistemics # DeltaV - Epistemics Department replacing Science
       time: 54000 # DeltaV - 15 hours
     - !type:OverallPlaytimeRequirement
-      time: 72000 # DeltaV - 20 hours
+      time: 72000 # DeltaV - 20 hours, was 40
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -14,8 +14,10 @@
       department: Command
       time: 36000 # 10 hours
     - !type:OverallPlaytimeRequirement
-      time: 90000 # DeltaV - 25 hours
+      time: 90000 # DeltaV - 25 hours, was 40
     - !type:WhitelistRequirement # DeltaV - Whitelist requirement
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -1,6 +1,7 @@
 - type: department
   id: Logistics # DeltaV - Logistics Department replacing Cargo
-  description: department-Cargo-description
+  name: department-Logistics # DeltaV
+  description: department-Logistics-description # DeltaV
   color: "#A46106"
   roles:
   - CargoTechnician
@@ -11,6 +12,7 @@
 
 - type: department
   id: Civilian
+  name: department-Civilian
   description: department-Civilian-description
   color: "#9FED58"
   weight: -10
@@ -39,6 +41,7 @@
 
 - type: department
   id: Command
+  name: department-Command
   description: department-Command-description
   color: "#334E6D"
   roles:
@@ -56,6 +59,7 @@
 
 - type: department
   id: Engineering
+  name: department-Engineering
   description: department-Engineering-description
   color: "#EFB341"
   roles:
@@ -66,6 +70,7 @@
 
 - type: department
   id: Medical
+  name: department-Medical
   description: department-Medical-description
   color: "#52B4E9"
   roles:
@@ -79,6 +84,7 @@
 
 - type: department
   id: Security
+  name: department-Security
   description: department-Security-description
   color: "#DE3A3A"
   weight: 20
@@ -94,7 +100,8 @@
 
 - type: department
   id: Epistemics # DeltaV - Epistemics Department replacing Science
-  description: department-Science-description
+  name: department-Epistemics # DeltaV
+  description: department-Epistemics-description # DeltaV
   color: "#D381C9"
   roles:
   - ResearchDirector
@@ -105,6 +112,7 @@
 
 - type: department
   id: Specific
+  name: department-Specific
   description: department-Specific-description
   color: "#9FED58"
   weight: 10