tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup warnings in ApcVisualizerSystem (#37396)

Browse Source
This commit is contained in:
Tayrtahn
2025-05-12 19:53:11 -04:00
committed by GitHub
parent b9c500ff59
commit 9c017b7848
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Content.Client/Power/APC/ApcVisualizerSystem.cs
View File

@@ -1,5 +1,4 @@
using Content.Shared.APC; using Content.Shared.APC;
using JetBrains.Annotations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
namespace Content.Client.Power.APC; namespace Content.Client.Power.APC;
@@ -7,6 +6,7 @@ namespace Content.Client.Power.APC;
public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent> public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
{ {
[Dependency] private readonly SharedPointLightSystem _lights = default!; [Dependency] private readonly SharedPointLightSystem _lights = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
protected override void OnAppearanceChange(EntityUid uid, ApcVisualsComponent comp, ref AppearanceChangeEvent args) protected override void OnAppearanceChange(EntityUid uid, ApcVisualsComponent comp, ref AppearanceChangeEvent args)
{ {
@@ -14,38 +14,38 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
return; return;
// get the mapped layer index of the first lock layer and the first channel layer // get the mapped layer index of the first lock layer and the first channel layer
var lockIndicatorOverlayStart = args.Sprite.LayerMapGet(ApcVisualLayers.InterfaceLock); var lockIndicatorOverlayStart = _sprite.LayerMapGet((uid, args.Sprite), ApcVisualLayers.InterfaceLock);
var channelIndicatorOverlayStart = args.Sprite.LayerMapGet(ApcVisualLayers.Equipment); var channelIndicatorOverlayStart = _sprite.LayerMapGet((uid, args.Sprite), ApcVisualLayers.Equipment);
// Handle APC screen overlay: // Handle APC screen overlay:
if(!AppearanceSystem.TryGetData<ApcChargeState>(uid, ApcVisuals.ChargeState, out var chargeState, args.Component)) if (!AppearanceSystem.TryGetData<ApcChargeState>(uid, ApcVisuals.ChargeState, out var chargeState, args.Component))
chargeState = ApcChargeState.Lack; chargeState = ApcChargeState.Lack;
if (chargeState >= 0 && chargeState < ApcChargeState.NumStates) if (chargeState >= 0 && chargeState < ApcChargeState.NumStates)
{ {
args.Sprite.LayerSetState(ApcVisualLayers.ChargeState, $"{comp.ScreenPrefix}-{comp.ScreenSuffixes[(sbyte)chargeState]}"); _sprite.LayerSetRsiState((uid, args.Sprite), ApcVisualLayers.ChargeState, $"{comp.ScreenPrefix}-{comp.ScreenSuffixes[(sbyte)chargeState]}");
// LockState does nothing currently. The backend doesn't exist. // LockState does nothing currently. The backend doesn't exist.
if (AppearanceSystem.TryGetData<byte>(uid, ApcVisuals.LockState, out var lockStates, args.Component)) if (AppearanceSystem.TryGetData<byte>(uid, ApcVisuals.LockState, out var lockStates, args.Component))
{ {
for(var i = 0; i < comp.LockIndicators; ++i) for (var i = 0; i < comp.LockIndicators; ++i)
{ {
var layer = ((byte)lockIndicatorOverlayStart + i); var layer = (byte)lockIndicatorOverlayStart + i;
sbyte lockState = (sbyte)((lockStates >> (i << (sbyte)ApcLockState.LogWidth)) & (sbyte)ApcLockState.All); var lockState = (sbyte)((lockStates >> (i << (sbyte)ApcLockState.LogWidth)) & (sbyte)ApcLockState.All);
args.Sprite.LayerSetState(layer, $"{comp.LockPrefix}{i}-{comp.LockSuffixes[lockState]}"); _sprite.LayerSetRsiState((uid, args.Sprite), layer, $"{comp.LockPrefix}{i}-{comp.LockSuffixes[lockState]}");
args.Sprite.LayerSetVisible(layer, true); _sprite.LayerSetVisible((uid, args.Sprite), layer, true);
} }
} }
// ChannelState does nothing currently. The backend doesn't exist. // ChannelState does nothing currently. The backend doesn't exist.
if (AppearanceSystem.TryGetData<byte>(uid, ApcVisuals.ChannelState, out var channelStates, args.Component)) if (AppearanceSystem.TryGetData<byte>(uid, ApcVisuals.ChannelState, out var channelStates, args.Component))
{ {
for(var i = 0; i < comp.ChannelIndicators; ++i) for (var i = 0; i < comp.ChannelIndicators; ++i)
{ {
var layer = ((byte)channelIndicatorOverlayStart + i); var layer = (byte)channelIndicatorOverlayStart + i;
sbyte channelState = (sbyte)((channelStates >> (i << (sbyte)ApcChannelState.LogWidth)) & (sbyte)ApcChannelState.All); var channelState = (sbyte)((channelStates >> (i << (sbyte)ApcChannelState.LogWidth)) & (sbyte)ApcChannelState.All);
args.Sprite.LayerSetState(layer, $"{comp.ChannelPrefix}{i}-{comp.ChannelSuffixes[channelState]}"); _sprite.LayerSetRsiState((uid, args.Sprite), layer, $"{comp.ChannelPrefix}{i}-{comp.ChannelSuffixes[channelState]}");
args.Sprite.LayerSetVisible(layer, true); _sprite.LayerSetVisible((uid, args.Sprite), layer, true);
} }
} }
@@ -57,16 +57,16 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
else else
{ {
/// Overrides all of the lock and channel indicators. /// Overrides all of the lock and channel indicators.
args.Sprite.LayerSetState(ApcVisualLayers.ChargeState, comp.EmaggedScreenState); _sprite.LayerSetRsiState((uid, args.Sprite), ApcVisualLayers.ChargeState, comp.EmaggedScreenState);
for(var i = 0; i < comp.LockIndicators; ++i) for (var i = 0; i < comp.LockIndicators; ++i)
{ {
var layer = ((byte)lockIndicatorOverlayStart + i); var layer = (byte)lockIndicatorOverlayStart + i;
args.Sprite.LayerSetVisible(layer, false); _sprite.LayerSetVisible((uid, args.Sprite), layer, false);
} }
for(var i = 0; i < comp.ChannelIndicators; ++i) for (var i = 0; i < comp.ChannelIndicators; ++i)
{ {
var layer = ((byte)channelIndicatorOverlayStart + i); var layer = (byte)channelIndicatorOverlayStart + i;
args.Sprite.LayerSetVisible(layer, false); _sprite.LayerSetVisible((uid, args.Sprite), layer, false);
} }
if (TryComp<PointLightComponent>(uid, out var light)) if (TryComp<PointLightComponent>(uid, out var light))
@@ -77,7 +77,7 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
} }
} }
enum ApcVisualLayers : byte public enum ApcVisualLayers : byte
{ {
/// <summary> /// <summary>
/// The sprite layer used for the interface lock indicator light overlay. /// The sprite layer used for the interface lock indicator light overlay.