kill objectives only target people with jobs

Content.Server/Objectives/Components/PickRandomPersonComponent.cs

@@ -8,6 +8,9 @@ namespace Content.Server.Objectives.Components;
 [RegisterComponent, Access(typeof(KillPersonConditionSystem))]
 public sealed partial class PickRandomPersonComponent : Component
 {
+    /// <summary>
+    /// DeltaV: If true a target must have a job with SetPreference set to true.
+    /// </summary>
     [DataField]
-    public bool NeedsOrganic; // Goobstation: Only pick non-silicon players.
+    public bool OnlyChoosableJobs;
 }

Content.Server/Objectives/Systems/KillPersonConditionSystem.cs

@@ -5,7 +5,10 @@
 using Content.Shared.CCVar;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
+using Content.Shared.Roles; // DeltaV
+using Content.Shared.Roles.Jobs; // DeltaV
 using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes; // DeltaV
 using Robust.Shared.Random;
 using System.Linq;
 
@@ -18,8 +21,10 @@ public sealed class KillPersonConditionSystem : EntitySystem
 {
     [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!; // DeltaV
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly SharedRoleSystem _role = default!; // DeltaV
     [Dependency] private readonly TargetObjectiveSystem _target = default!;
 
     public override void Initialize()
@@ -41,7 +46,7 @@ private void OnGetProgress(EntityUid uid, KillPersonConditionComponent comp, ref
 
     private void OnPersonAssigned(Entity<PickRandomPersonComponent> ent, ref ObjectiveAssignedEvent args)
     {
-        AssignRandomTarget(ent, ref args, _ => true);
+        AssignRandomTarget(ent, ref args, _ => true, ent.Comp.OnlyChoosableJobs); // DeltaV: pass onlyJobs
     }
 
     private void OnHeadAssigned(Entity<PickRandomHeadComponent> ent, ref ObjectiveAssignedEvent args)
@@ -52,7 +57,8 @@ mind.OwnedEntity is { } ownedEnt &&
             HasComp<CommandStaffComponent>(ownedEnt));
     }
 
-    private void AssignRandomTarget(EntityUid uid, ref ObjectiveAssignedEvent args, Predicate<EntityUid> filter, bool fallbackToAny = true)
+    // DeltaV: added onlyJobs
+    private void AssignRandomTarget(EntityUid uid, ref ObjectiveAssignedEvent args, Predicate<EntityUid> filter, bool onlyJobs = true, bool fallbackToAny = true)
     {
         // invalid prototype
         if (!TryComp<TargetObjectiveComponent>(uid, out var target))
@@ -75,6 +81,16 @@ private void AssignRandomTarget(EntityUid uid, ref ObjectiveAssignedEvent args,
             })
             .ToList();
 
+        // Begin DeltaV Additions: Only target people with jobs
+        if (onlyJobs)
+        {
+            allHumans.RemoveAll(mindId => !(
+                _role.MindHasRole<JobRoleComponent>((mindId.Owner, mindId.Comp), out var role) &&
+                role?.Comp1.JobPrototype is {} jobId &&
+                _proto.Index(jobId).SetPreference));
+        }
+        // End DeltaV Additions
+
         // Can't have multiple objectives to kill the same person
         foreach (var objective in args.Mind.Objectives)
         {

Resources/Prototypes/Objectives/traitor.yml

@@ -96,6 +96,7 @@
   - type: TargetObjective
     title: objective-condition-kill-person-title
   - type: PickRandomPerson
+    onlyChoosableJobs: true # DeltaV
 
 - type: entity
   parent: [BaseTraitorObjective, BaseKillObjective]

Resources/Prototypes/_DV/Objectives/traitor.yml

@@ -91,6 +91,7 @@
   - type: TargetObjective
     title: objective-condition-teach-person-title
   - type: PickRandomPerson
+    onlyChoosableJobs: true
 
 # Kill fellow traitor objective
 - type: entity