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

Alert display lights now properly react to power changes. (#14839)

Browse Source
This commit is contained in:
Menshin
2023-03-25 04:10:48 +01:00
committed by GitHub
parent 76b5439dc3
commit 735701d915
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Client/AlertLevel/AlertLevelDisplaySystem.cs
View File

@@ -15,32 +15,32 @@ public sealed class AlertLevelDisplaySystem : EntitySystem
SubscribeLocalEvent<AlertLevelDisplayComponent, AppearanceChangeEvent>(OnAppearanceChange);
}
private void OnAppearanceChange(EntityUid uid, AlertLevelDisplayComponent component, ref AppearanceChangeEvent args)
private void OnAppearanceChange(EntityUid uid, AlertLevelDisplayComponent alertLevelDisplay, ref AppearanceChangeEvent args)
{
if (args.Sprite == null)
{
return;
}
var layer = args.Sprite.LayerMapReserveBlank(AlertLevelDisplay.Layer);
if (!args.Sprite.LayerMapTryGet(AlertLevelDisplay.Layer, out _))
if (args.AppearanceData.TryGetValue(AlertLevelDisplay.Powered, out var poweredObject))
{
var layer = args.Sprite.AddLayer(new RSI.StateId(component.AlertVisuals.Values.First()));
args.Sprite.LayerMapSet(AlertLevelDisplay.Layer, layer);
args.Sprite.LayerSetVisible(layer, poweredObject is true);
}
if (!args.AppearanceData.TryGetValue(AlertLevelDisplay.CurrentLevel, out var level))
{
args.Sprite.LayerSetState(AlertLevelDisplay.Layer, new RSI.StateId(component.AlertVisuals.Values.First()));
args.Sprite.LayerSetState(layer, alertLevelDisplay.AlertVisuals.Values.First());
return;
}
if (component.AlertVisuals.TryGetValue((string) level, out var visual))
if (alertLevelDisplay.AlertVisuals.TryGetValue((string) level, out var visual))
{
args.Sprite.LayerSetState(AlertLevelDisplay.Layer, new RSI.StateId(visual));
args.Sprite.LayerSetState(layer, visual);
}
else
{
args.Sprite.LayerSetState(AlertLevelDisplay.Layer, new RSI.StateId(component.AlertVisuals.Values.First()));
args.Sprite.LayerSetState(layer, alertLevelDisplay.AlertVisuals.Values.First());
}
}
}

11
Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Power.Components;
using Content.Server.Station.Systems;
using Content.Shared.AlertLevel;
using Robust.Server.GameObjects;
@@ -13,6 +14,7 @@ public sealed class AlertLevelDisplaySystem : EntitySystem
{
SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertChanged);
SubscribeLocalEvent<AlertLevelDisplayComponent, ComponentInit>(OnDisplayInit);
SubscribeLocalEvent<AlertLevelDisplayComponent, PowerChangedEvent>(OnPowerChanged);
}
private void OnAlertChanged(AlertLevelChangedEvent args)
@@ -23,7 +25,7 @@ public sealed class AlertLevelDisplaySystem : EntitySystem
}
}
private void OnDisplayInit(EntityUid uid, AlertLevelDisplayComponent component, ComponentInit args)
private void OnDisplayInit(EntityUid uid, AlertLevelDisplayComponent alertLevelDisplay, ComponentInit args)
{
if (TryComp(uid, out AppearanceComponent? appearance))
{
@@ -34,4 +36,11 @@ public sealed class AlertLevelDisplaySystem : EntitySystem
}
}
}
private void OnPowerChanged(EntityUid uid, AlertLevelDisplayComponent alertLevelDisplay, ref PowerChangedEvent args)
{
if (!TryComp(uid, out AppearanceComponent? appearance))
return;
_appearance.SetData(uid, AlertLevelDisplay.Powered, args.Powered, appearance);
}
}

3
Content.Shared/AlertLevel/SharedAlertLevelDisplay.cs
View File

@@ -6,5 +6,6 @@ namespace Content.Shared.AlertLevel;
public enum AlertLevelDisplay
{
CurrentLevel,
Layer
Layer,
Powered
}