Adds and uses bool member HasStealthComponent to GetStatusIconsEvent

This makes stealth effective against all huds
rbertoche · Nov 12, 2023 · 83c53ab · 83c53ab
1 parent 0c7f6b9
commit 83c53ab
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -47,7 +47,7 @@ protected override void DeactivateInternal()
 
     private void OnGetStatusIconsEvent(EntityUid uid, DamageableComponent damageableComponent, ref GetStatusIconsEvent args)
     {
-        if (!IsActive || args.InContainer)
+        if (!IsActive || args.InContainer || args.HasStealthComponent)
             return;
 
         AppendHealthIcons(damageableComponent, args.StatusIcons);

diff --git a/Content.Client/Overlays/ShowHungerIconsSystem.cs b/Content.Client/Overlays/ShowHungerIconsSystem.cs
@@ -19,7 +19,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, HungerComponent hungerComponent, ref GetStatusIconsEvent args)
     {
-        if (!IsActive || args.InContainer)
+        if (!IsActive || args.InContainer || args.HasStealthComponent)
             return;
 
         var healthIcons = DecideHungerIcon(uid, hungerComponent);

diff --git a/Content.Client/Overlays/ShowSecurityIconsSystem.cs b/Content.Client/Overlays/ShowSecurityIconsSystem.cs
@@ -25,7 +25,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent @event)
     {
-        if (!IsActive || @event.InContainer)
+        if (!IsActive || @event.InContainer || @event.HasStealthComponent)
         {
             return;
         }

diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs
@@ -19,7 +19,7 @@ public override void Initialize()
 
     private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent thirstComponent, ref GetStatusIconsEvent args)
     {
-        if (!IsActive || args.InContainer)
+        if (!IsActive || args.InContainer || args.HasStealthComponent)
             return;
 
         var healthIcons = DecideThirstIcon(uid, thirstComponent);

diff --git a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
@@ -26,7 +26,8 @@ private void OnGetStatusIcon(EntityUid uid, SSDIndicatorComponent component, ref
     {
         if (!component.IsSSD ||
             !_cfg.GetCVar(CCVars.ICShowSSDIndicator) ||
-            args.InContainer)
+            args.InContainer ||
+            args.HasStealthComponent)
             return;
 
         args.StatusIcons.Add(_prototype.Index<StatusIconPrototype>(component.Icon));

diff --git a/Content.Client/StatusIcon/StatusIconSystem.cs b/Content.Client/StatusIcon/StatusIconSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
+using Content.Shared.Stealth.Components;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 
@@ -13,6 +14,7 @@ public sealed class StatusIconSystem : SharedStatusIconSystem
 {
     [Dependency] private readonly IConfigurationManager _configuration = default!;
     [Dependency] private readonly IOverlayManager _overlay = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;
 
     private bool _globalEnabled;
     private bool _localEnabled;
@@ -63,7 +65,8 @@ public List<StatusIconData> GetStatusIcons(EntityUid uid, MetaDataComponent? met
             return list;
 
         var inContainer = (meta.Flags & MetaDataFlags.InContainer) != 0;
-        var ev = new GetStatusIconsEvent(list, inContainer);
+        var hasStealthComponent = _entManager.HasComponent<StealthComponent>(uid);
+        var ev = new GetStatusIconsEvent(list, inContainer, hasStealthComponent);
         RaiseLocalEvent(uid, ref ev);
         return ev.StatusIcons;
     }

diff --git a/Content.Shared/StatusIcon/Components/StatusIconComponent.cs b/Content.Shared/StatusIcon/Components/StatusIconComponent.cs
@@ -24,4 +24,4 @@ public sealed partial class StatusIconComponent : Component
 /// </summary>
 /// <param name="StatusIcons"></param>
 [ByRefEvent]
-public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer);
+public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer, bool HasStealthComponent);