update pinpointer (#96)

FFATroop · Mar 13, 2024 · df26bba · df26bba
1 parent a4103f5
commit df26bba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs
@@ -5,13 +5,15 @@
 using Robust.Shared.Utility;
 using Content.Server.Shuttles.Events;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Mobs.Systems;
 
 namespace Content.Server.Pinpointer;
 
 public sealed class PinpointerSystem : SharedPinpointerSystem
 {
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
 
     private EntityQuery<TransformComponent> _xformQuery;
 
@@ -80,7 +82,7 @@ private void LocateTarget(EntityUid uid, PinpointerComponent component)
                 return;
             }
 
-            var target = FindTargetFromComponent(uid, reg.Type);
+            var target = FindTargetFromComponent(uid, reg.Type, component);
             SetTarget(uid, target, component);
         }
     }
@@ -102,7 +104,7 @@ public override void Update(float frameTime)
     ///     Try to find the closest entity from whitelist on a current map
     ///     Will return null if can't find anything
     /// </summary>
-    private EntityUid? FindTargetFromComponent(EntityUid uid, Type whitelist, TransformComponent? transform = null)
+    private EntityUid? FindTargetFromComponent(EntityUid uid, Type whitelist, PinpointerComponent? pinpointer = null, TransformComponent? transform = null)
     {
         _xformQuery.Resolve(uid, ref transform, false);
 
@@ -119,6 +121,11 @@ public override void Update(float frameTime)
             if (!_xformQuery.TryGetComponent(otherUid, out var compXform) || compXform.MapID != mapId)
                 continue;
 
+            if (pinpointer != null)
+            {
+                if (pinpointer.MustBeAlive && !_mobStateSystem.IsAlive(otherUid))
+                    continue;
+            }
             var dist = (_transform.GetWorldPosition(compXform) - worldPos).LengthSquared();
             l.TryAdd(dist, otherUid);
         }

diff --git a/Content.Shared/Pinpointer/PinpointerComponent.cs b/Content.Shared/Pinpointer/PinpointerComponent.cs
@@ -48,6 +48,10 @@ public sealed partial class PinpointerComponent : Component
     [DataField("canRetarget"), ViewVariables(VVAccess.ReadWrite)]
     public bool CanRetarget;
 
+
+    [DataField]
+    public bool MustBeAlive = false;
+
     [ViewVariables]
     public EntityUid? Target = null;
 

diff --git a/Resources/Prototypes/TS/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/TS/Entities/Objects/Devices/pinpointer.yml
@@ -11,5 +11,6 @@
   - type: Icon
     state: pinpointer-station
   - type: Pinpointer
+    mustBeAlive: true
     component: MissionAntag
     targetName: Unknown magnite signature