Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-08-03 22:32:36 +03:00
parent 64ad5900c8 76b15fd787
commit 1adca3107a
77 changed files with 791 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/_White/Overlays/ThermalVisionOverlay.cs
View File

@@ -1,7 +1,9 @@
using System.Linq;
using System.Numerics;
using Content.Client.Stealth;
using Content.Shared._White.Overlays;
using Content.Shared.Body.Components;
using Content.Shared.Stealth.Components;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Client.Player;
@@ -19,6 +21,7 @@ public sealed class ThermalVisionOverlay : Overlay
private readonly TransformSystem _transform;
private readonly OccluderSystem _occluder;
private readonly PointLightSystem _pointLight;
private readonly StealthSystem _stealth;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -33,6 +36,7 @@ public sealed class ThermalVisionOverlay : Overlay
_transform = _entity.System<TransformSystem>();
_occluder = _entity.System<OccluderSystem>();
_pointLight = _entity.System<PointLightSystem>();
_stealth = _entity.System<StealthSystem>();
ZIndex = -1;
}
@@ -125,7 +129,9 @@ public sealed class ThermalVisionOverlay : Overlay
private bool CanSee(EntityUid ent, SpriteComponent sprite)
{
return sprite.Visible && !_entity.HasComponent<ThermalBlockerComponent>(ent);
return sprite.Visible && !_entity.HasComponent<ThermalBlockerComponent>(ent) &&
(!_entity.TryGetComponent(ent, out StealthComponent? stealth) ||
_stealth.GetVisibility(ent, stealth) > 0.5f);
}
private bool HasOccluders(EntityUid ent)