Senior ID cards get a custom job name: Attempt 2

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

@@ -851,6 +851,9 @@ public void RefreshJobs()
 
                 foreach (var job in jobs)
                 {
+                    if (job.EditorHidden)
+                        continue;
+
                     var jobContainer = new BoxContainer()
                     {
                         Orientation = LayoutOrientation.Horizontal,

Content.Server/Access/Components/PresetIdCardComponent.cs

@@ -11,10 +11,4 @@ public sealed partial class PresetIdCardComponent : Component
 
     [DataField("name")]
     public string? IdName;
-
-    /// <summary>
-    /// DeltaV: Allow changing the job title, even if it'd be otherwise set by the JobPrototype
-    /// </summary>
-    [DataField("customJob")]
-    public string? CustomJobName;
 }

Content.Server/Access/Systems/PresetIdCardSystem.cs

@@ -2,10 +2,8 @@
 using Content.Server.GameTicking;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
-using Content.Server.StationRecords.Systems;
 using Content.Shared.Access.Systems;
 using Content.Shared.Roles;
-using Content.Shared.StationRecords;
 using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
 
@@ -17,8 +15,6 @@ public sealed class PresetIdCardSystem : EntitySystem
     [Dependency] private readonly IdCardSystem _cardSystem = default!;
     [Dependency] private readonly SharedAccessSystem _accessSystem = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
-    [Dependency] private readonly StationRecordsSystem _record = default!; // DeltaV - Allow changing the job title within the prototype
-
     public override void Initialize()
     {
         SubscribeLocalEvent<PresetIdCardComponent, MapInitEvent>(OnMapInit);
@@ -41,7 +37,6 @@ private void PlayerJobsAssigned(RulePlayerJobsAssignedEvent ev)
 
             SetupIdAccess(uid, card, true);
             SetupIdName(uid, card);
-            SetupIdJob(uid, card); // DeltaV - Allow changing the job title within the prototype
         }
     }
 
@@ -61,7 +56,6 @@ private void OnMapInit(EntityUid uid, PresetIdCardComponent id, MapInitEvent arg
 
         SetupIdAccess(uid, id, extended);
         SetupIdName(uid, id);
-        SetupIdJob(uid, id); // DeltaV - Allow changing the job title within the prototype
     }
 
     private void SetupIdName(EntityUid uid, PresetIdCardComponent id)
@@ -71,25 +65,6 @@ private void SetupIdName(EntityUid uid, PresetIdCardComponent id)
         _cardSystem.TryChangeFullName(uid, id.IdName);
     }
 
-    // DeltaV - Allow changing the job title within the prototype
-    private void SetupIdJob(EntityUid uid, PresetIdCardComponent id)
-    {
-        if (id.CustomJobName == null)
-            return;
-        _cardSystem.TryChangeJobTitle(uid, id.CustomJobName);
-
-        // The following code is taken from IdCardConsoleSystem
-        if (!TryComp<StationRecordKeyStorageComponent>(uid, out var keyStorage)
-            || keyStorage.Key is not { } key
-            || !_record.TryGetRecord<GeneralStationRecord>(key, out var record))
-        {
-            return;
-        }
-        record.JobTitle = id.CustomJobName;
-        _record.Synchronize(key);
-    }
-    // End of DeltaV code
-
     private void SetupIdAccess(EntityUid uid, PresetIdCardComponent id, bool extended)
     {
         if (id.JobName == null)

Content.Server/GameTicking/GameTicker.Spawning.cs

@@ -11,8 +11,11 @@
 using Content.Shared.Mind;
 using Content.Shared.Players;
 using Content.Shared.Preferences;
+using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
+using Content.Shared.Clothing;
+using Content.Shared.Access.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -21,13 +24,19 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Microsoft.CodeAnalysis;
+using Content.Shared.PDA;
+using FastAccessors;
+using Content.Server.Access.Components;
+using Content.Shared.Destructible;
 
 namespace Content.Server.GameTicking
 {
     public sealed partial class GameTicker
     {
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly SharedJobSystem _jobs = default!;
+        [Dependency] private readonly IComponentFactory _componentFactory = default!;
 
         [ValidatePrototypeId<EntityPrototype>]
         public const string ObserverPrototypeName = "MobObserver";
@@ -224,7 +233,32 @@ private void SpawnPlayer(ICommonSession player,
 
             var jobPrototype = _prototypeManager.Index<JobPrototype>(jobId);
             var job = new JobComponent {Prototype = jobId};
+            // DeltaV - Senior ID cards
+            do
+            {
+                var jobLoadout = LoadoutSystem.GetJobPrototype(jobPrototype.ID);
+
+                if (!_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto))
+                    break;
+
+                RoleLoadout? loadout = null;
+                character.Loadouts.TryGetValue(jobLoadout, out loadout);
+
+                // Set to default if not present
+                if (loadout == null)
+                {
+                    loadout = new RoleLoadout(jobLoadout);
+                    loadout.SetDefault(_prototypeManager);
+                }
+
+                if (GetVirtualJobFromRoleLoadout(loadout, roleProto, character, out var virtualJobId) && _prototypeManager.TryIndex<JobPrototype>(virtualJobId, out var virtualJobProto))
+                {
+                    job.VirtualJob = new JobComponent {Prototype = virtualJobProto};
+                }
+            }
+            while (false);
             _roles.MindAddRole(newMind, job, silent: silent);
+            // End of DeltaV code
             var jobName = _jobs.MindTryGetJobName(newMind);
 
             _playTimeTrackings.PlayerRolesChanged(player);
@@ -302,14 +336,71 @@ private void SpawnPlayer(ICommonSession player,
             PlayersJoinedRoundNormally++;
             var aev = new PlayerSpawnCompleteEvent(mob,
                 player,
-                jobId,
+                job,
                 lateJoin,
                 PlayersJoinedRoundNormally,
                 station,
                 character);
             RaiseLocalEvent(mob, aev, true);
         }
 
+        // DeltaV - Senior ID cards
+        private bool GetVirtualJobFromRoleLoadout(RoleLoadout loadout, RoleLoadoutPrototype roleProto, HumanoidCharacterProfile character, out ProtoId<JobPrototype>? virtualJob)
+        {
+            virtualJob = null;
+
+            // Use to read job loadout and find an ID card
+            foreach (var group in loadout.SelectedLoadouts.OrderBy(x => roleProto.Groups.FindIndex(e => e == x.Key)))
+            {
+                foreach (var items in group.Value)
+                {
+                    if (!_prototypeManager.TryIndex(items.Prototype, out var loadoutProto))
+                    {
+                        Log.Warning($"Unable to find loadout prototype for {items.Prototype}");
+                        continue;
+                    }
+                    if (!_prototypeManager.TryIndex(loadoutProto.Equipment, out var startingGear))
+                    {
+                        Log.Warning($"Unable to find starting gear {loadoutProto.Equipment} for loadout {loadoutProto}");
+                        continue;
+                    }
+                    var entProtoId = startingGear.GetGear("id");
+                    if (!_prototypeManager.TryIndex<EntityPrototype>(entProtoId, out var idProto))
+                    {
+                        Log.Warning($"Unable to find prototype for {startingGear} for starting gear {loadoutProto.Equipment} for loadout {loadoutProto}");
+                        continue;
+                    }
+                    if (idProto.TryGetComponent<PdaComponent>(out var pdaComponent, _componentFactory) && pdaComponent.IdCard != null)
+                    {
+                        ProtoId<EntityPrototype> idProtoId = pdaComponent.IdCard;
+                        if (!_prototypeManager.TryIndex<EntityPrototype>(idProtoId, out idProto))
+                        {
+                            Log.Warning($"Unable to find an idCard in {idProto}");
+                            return false;
+                        }
+                    }
+
+                    if (!idProto.TryGetComponent<PresetIdCardComponent>(out var idComponent, _componentFactory))
+                    {
+                        Log.Warning($"Unable to find presetIdCard for {idProto}");
+                        continue;
+                    }
+
+                    ProtoId<JobPrototype> jobProtoId = idComponent.JobName ?? string.Empty;
+                    if (jobProtoId == string.Empty)
+                    {
+                        Log.Warning($"Empty jobProtoId!");
+                        return false;
+                    }
+                    virtualJob = jobProtoId;
+                    Log.Debug($"Successfully outputted {virtualJob} from {idProto}");
+                    return true;
+                }
+            }
+            Log.Warning($"All other options exhausted");
+            return false;
+        }
+
         public void Respawn(ICommonSession player)
         {
             _mind.WipeMind(player);
@@ -500,7 +591,7 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
     {
         public EntityUid Mob { get; }
         public ICommonSession Player { get; }
-        public string? JobId { get; }
+        public JobComponent? Job { get; }
         public bool LateJoin { get; }
         public EntityUid Station { get; }
         public HumanoidCharacterProfile Profile { get; }
@@ -510,15 +601,15 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
 
         public PlayerSpawnCompleteEvent(EntityUid mob,
             ICommonSession player,
-            string? jobId,
+            JobComponent? job,
             bool lateJoin,
             int joinOrder,
             EntityUid station,
             HumanoidCharacterProfile profile)
         {
             Mob = mob;
             Player = player;
-            JobId = jobId;
+            Job = job;
             LateJoin = lateJoin;
             Station = station;
             Profile = profile;

Content.Server/Station/Systems/StationSpawningSystem.cs

@@ -144,6 +144,7 @@ public EntityUid SpawnPlayerMob(
         EntityUid? entity = null)
     {
         _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out var prototype);
+        _prototypeManager.TryIndex(job?.VirtualJob?.Prototype ?? string.Empty, out var virtualJobPrototype); // DeltaV - Senior ID cards
 
         // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff.
         if (prototype?.JobEntity != null)
@@ -212,7 +213,7 @@ public EntityUid SpawnPlayerMob(
         if (profile != null)
         {
             if (prototype != null)
-                SetPdaAndIdCardData(entity.Value, profile.Name, prototype, station);
+                SetPdaAndIdCardData(entity.Value, profile.Name, virtualJobPrototype ?? prototype, station); //DeltaV - Senior ID cards
 
             _humanoidSystem.LoadProfile(entity.Value, profile);
             _metaSystem.SetEntityName(entity.Value, profile.Name);
@@ -258,7 +259,7 @@ public void SetPdaAndIdCardData(EntityUid entity, string characterName, JobProto
             return;
 
         _cardSystem.TryChangeFullName(cardId, characterName, card);
-        _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
+        _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card); // Delta V - Senior ID card, job names and icon should already be set via prototype
 
         if (_prototypeManager.TryIndex(jobPrototype.Icon, out var jobIcon))
             _cardSystem.TryChangeJobIcon(cardId, jobIcon, card);

Content.Server/StationRecords/Systems/StationRecordsSystem.cs

@@ -1,10 +1,12 @@
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Forensics;
 using Content.Server.GameTicking;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
 using Content.Shared.StationRecords;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
@@ -48,12 +50,18 @@ private void OnPlayerSpawn(PlayerSpawnCompleteEvent args)
         if (!TryComp<StationRecordsComponent>(args.Station, out var stationRecords))
             return;
 
-        CreateGeneralRecord(args.Station, args.Mob, args.Profile, args.JobId, stationRecords);
+        CreateGeneralRecord(args.Station, args.Mob, args.Profile, args.Job, stationRecords);
     }
 
     private void CreateGeneralRecord(EntityUid station, EntityUid player, HumanoidCharacterProfile profile,
-        string? jobId, StationRecordsComponent records)
+        JobComponent? job, StationRecordsComponent records)
     {
+        _prototypeManager.TryIndex<JobPrototype>(job?.VirtualJob?.Prototype, out var a);
+        if (!_prototypeManager.TryIndex<JobPrototype>(job?.Prototype, out var b))
+            return;
+
+        ProtoId<JobPrototype> jobId = a?.ID ?? b.ID;
+        Log.Debug(jobId);
         // TODO make PlayerSpawnCompleteEvent.JobId a ProtoId
         if (string.IsNullOrEmpty(jobId)
             || !_prototypeManager.HasIndex<JobPrototype>(jobId))
@@ -133,6 +141,7 @@ public void CreateGeneralRecord(
             Fingerprint = mobFingerprint,
             DNA = dna
         };
+        Log.Debug($"Record: {record.JobTitle}, {record.JobIcon}, {record.JobPrototype}");
 
         var key = AddRecordEntry(station, record);
         if (!key.IsValid())

Content.Shared/Roles/JobPrototype.cs

@@ -123,6 +123,9 @@ public sealed partial class JobPrototype : IPrototype
 
         [DataField]
         public bool Whitelisted;
+
+        [DataField]
+        public bool EditorHidden;
     }
 
     /// <summary>

Content.Shared/Roles/Jobs/JobComponent.cs

@@ -11,4 +11,6 @@ public sealed partial class JobComponent : Component
 {
     [DataField(required: true), AutoNetworkedField]
     public ProtoId<JobPrototype>? Prototype;
+    [DataField]
+    public JobComponent? VirtualJob;
 }

Content.Shared/Roles/Jobs/SharedJobSystem.cs

@@ -39,6 +39,8 @@ private void SetupTrackerLookup()
         // This breaks if you have N trackers to 1 JobId but future concern.
         foreach (var job in _protoManager.EnumeratePrototypes<JobPrototype>())
         {
+            if (_inverseTrackerLookup.ContainsKey(job.PlayTimeTracker)) continue; // DeltaV - we have N trackers to 1 JobId... (senior job names)
+
             _inverseTrackerLookup.Add(job.PlayTimeTracker, job.ID);
         }
     }
@@ -118,6 +120,19 @@ public bool MindTryGetJob(
                _prototypes.TryIndex(comp.Prototype, out prototype);
     }
 
+    public bool MindTryGetVirtualJob( // DeltaV - Senior ID cards
+        [NotNullWhen(true)] EntityUid? mindId,
+        [NotNullWhen(true)] out JobComponent? comp,
+        [NotNullWhen(true)] out JobPrototype? virtualJob)
+    {
+        comp = null;
+        virtualJob = null;
+
+        return TryComp(mindId, out comp) &&
+               comp.VirtualJob != null &&
+               _prototypes.TryIndex(comp.VirtualJob.Prototype, out virtualJob);
+    }
+
     public bool MindTryGetJobId([NotNullWhen(true)] EntityUid? mindId, out ProtoId<JobPrototype>? job)
     {
         if (!TryComp(mindId, out JobComponent? comp))
@@ -136,14 +151,19 @@ public bool MindTryGetJobId([NotNullWhen(true)] EntityUid? mindId, out ProtoId<J
     /// </summary>
     public bool MindTryGetJobName([NotNullWhen(true)] EntityUid? mindId, out string name)
     {
-        if (MindTryGetJob(mindId, out _, out var prototype))
+        MindTryGetVirtualJob(mindId, out _, out var virtualJob);
+        if (!MindTryGetJob(mindId, out _, out var prototype))
         {
-            name = prototype.LocalizedName;
-            return true;
+            name = Loc.GetString("generic-unknown-title");
+            return false;
         }
 
-        name = Loc.GetString("generic-unknown-title");
-        return false;
+        name = virtualJob?.LocalizedName ?? string.Empty;
+        if (string.IsNullOrEmpty(name))
+            name = prototype.LocalizedName;
+
+        Log.Debug(name);
+        return true;
     }
 
     /// <summary>

Resources/Locale/en-US/job/job-names.ftl

@@ -47,6 +47,11 @@ job-name-ertjanitor = ERT Janitor
 job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
+# DeltaV - Define senior job names for use in separate prototypes
+job-name-seniorengineer = Senior Engineer
+job-name-seniorphysician = Senior Physician
+job-name-seniorresearcher = Senior Researcher
+job-name-seniorofficer = Senior Officer
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician