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

Cleanup warnings in AirlockSystem (#37434)

Browse Source 
Cleanup warnings in AirlockSystem
This commit is contained in:
Tayrtahn
2025-05-13 21:57:01 -04:00
committed by GitHub
parent 5ba1b2af86
commit d957cdb144
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Client/Doors/AirlockSystem.cs
View File

@@ -10,6 +10,7 @@ namespace Content.Client.Doors;
public sealed class AirlockSystem : SharedAirlockSystem public sealed class AirlockSystem : SharedAirlockSystem
{ {
[Dependency] private readonly AppearanceSystem _appearanceSystem = default!; [Dependency] private readonly AppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -21,7 +22,7 @@ public sealed class AirlockSystem : SharedAirlockSystem
private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args) private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)
{ {
// Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash. // Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash.
if(!TryComp<DoorComponent>(uid, out var door)) if (!TryComp<DoorComponent>(uid, out var door))
return; return;
if (comp.OpenUnlitVisible) // Otherwise there are flashes of the fallback sprite between clicking on the door and the door closing animation starting. if (comp.OpenUnlitVisible) // Otherwise there are flashes of the fallback sprite between clicking on the door and the door closing animation starting.
@@ -31,17 +32,17 @@ public sealed class AirlockSystem : SharedAirlockSystem
} }
((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick() ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
{ {
LayerKey = DoorVisualLayers.BaseUnlit, LayerKey = DoorVisualLayers.BaseUnlit,
KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningSpriteState, 0f) }, KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningSpriteState, 0f) },
} }
); );
((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick() ((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
{ {
LayerKey = DoorVisualLayers.BaseUnlit, LayerKey = DoorVisualLayers.BaseUnlit,
KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingSpriteState, 0f) }, KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingSpriteState, 0f) },
} }
); );
door.DenyingAnimation = new Animation() door.DenyingAnimation = new Animation()
@@ -57,19 +58,19 @@ public sealed class AirlockSystem : SharedAirlockSystem
} }
}; };
if(!comp.AnimatePanel) if (!comp.AnimatePanel)
return; return;
((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick() ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
{ {
LayerKey = WiresVisualLayers.MaintenancePanel, LayerKey = WiresVisualLayers.MaintenancePanel,
KeyFrames = {new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningPanelSpriteState, 0f)}, KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningPanelSpriteState, 0f) },
}); });
((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick ((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
{ {
LayerKey = WiresVisualLayers.MaintenancePanel, LayerKey = WiresVisualLayers.MaintenancePanel,
KeyFrames = {new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingPanelSpriteState, 0f)}, KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingPanelSpriteState, 0f) },
}); });
} }
@@ -101,11 +102,12 @@ public sealed class AirlockSystem : SharedAirlockSystem
&& !boltedVisible && !emergencyLightsVisible; && !boltedVisible && !emergencyLightsVisible;
} }
args.Sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible); _sprite.LayerSetVisible((uid, args.Sprite), DoorVisualLayers.BaseUnlit, unlitVisible);
args.Sprite.LayerSetVisible(DoorVisualLayers.BaseBolted, boltedVisible); _sprite.LayerSetVisible((uid, args.Sprite), DoorVisualLayers.BaseBolted, boltedVisible);
if (comp.EmergencyAccessLayer) if (comp.EmergencyAccessLayer)
{ {
args.Sprite.LayerSetVisible( _sprite.LayerSetVisible(
(uid, args.Sprite),
DoorVisualLayers.BaseEmergencyAccess, DoorVisualLayers.BaseEmergencyAccess,
emergencyLightsVisible emergencyLightsVisible
&& state != DoorState.Open && state != DoorState.Open
@@ -118,12 +120,12 @@ public sealed class AirlockSystem : SharedAirlockSystem
switch (state) switch (state)
{ {
case DoorState.Open: case DoorState.Open:
args.Sprite.LayerSetState(DoorVisualLayers.BaseUnlit, comp.ClosingSpriteState); _sprite.LayerSetRsiState((uid, args.Sprite), DoorVisualLayers.BaseUnlit, comp.ClosingSpriteState);
args.Sprite.LayerSetAnimationTime(DoorVisualLayers.BaseUnlit, 0); _sprite.LayerSetAnimationTime((uid, args.Sprite), DoorVisualLayers.BaseUnlit, 0);
break; break;
case DoorState.Closed: case DoorState.Closed:
args.Sprite.LayerSetState(DoorVisualLayers.BaseUnlit, comp.OpeningSpriteState); _sprite.LayerSetRsiState((uid, args.Sprite), DoorVisualLayers.BaseUnlit, comp.OpeningSpriteState);
args.Sprite.LayerSetAnimationTime(DoorVisualLayers.BaseUnlit, 0); _sprite.LayerSetAnimationTime((uid, args.Sprite), DoorVisualLayers.BaseUnlit, 0);
break; break;
} }
} }