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

Disable unlit layers on unpowered airlocks.

Browse Source 
Fixes #389
This commit is contained in:
Pieter-Jan Briers
2019-10-13 16:39:21 +02:00
parent 8896f46ef3
commit be9dc90738
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs
View File

@@ -90,22 +90,20 @@ namespace Content.Client.GameObjects.Components.Doors
state = DoorVisualState.Closed;
}
var unlitVisible = true;
switch (state)
{
case DoorVisualState.Closed:
sprite.LayerSetState(DoorVisualLayers.Base, "closed");
sprite.LayerSetState(DoorVisualLayers.BaseUnlit, "closed_unlit");
sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, true);
break;
case DoorVisualState.Closing:
sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, true);
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
animPlayer.Play(CloseAnimation, AnimationKey);
}
break;
case DoorVisualState.Opening:
sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, true);
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
animPlayer.Play(OpenAnimation, AnimationKey);
@@ -114,10 +112,10 @@ namespace Content.Client.GameObjects.Components.Doors
break;
case DoorVisualState.Open:
sprite.LayerSetState(DoorVisualLayers.Base, "open");
sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, false);
unlitVisible = false;
break;
case DoorVisualState.Deny:
sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, false);
unlitVisible = false;
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
animPlayer.Play(DenyAnimation, AnimationKey);
@@ -126,6 +124,13 @@ namespace Content.Client.GameObjects.Components.Doors
default:
throw new ArgumentOutOfRangeException();
}
if (component.TryGetData(DoorVisuals.Powered, out bool powered) && !powered)
{
unlitVisible = false;
}
sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible);
}
}

12
Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
View File

@@ -4,6 +4,8 @@ using Content.Server.GameObjects.Components.Interactable.Tools;
using Content.Server.GameObjects.Components.Power;
using Content.Server.GameObjects.Components.VendingMachines;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Doors;
using Robust.Server.GameObjects;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -77,6 +79,16 @@ namespace Content.Server.GameObjects.Components.Doors
base.Initialize();
_powerDevice = Owner.GetComponent<PowerDeviceComponent>();
_wires = Owner.GetComponent<WiresComponent>();
_powerDevice.OnPowerStateChanged += PowerDeviceOnOnPowerStateChanged;
}
private void PowerDeviceOnOnPowerStateChanged(object sender, PowerStateEventArgs e)
{
if (Owner.TryGetComponent(out AppearanceComponent appearance))
{
appearance.SetData(DoorVisuals.Powered, e.Powered);
}
}
protected override void ActivateImpl(ActivateEventArgs args)

1
Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs
View File

@@ -8,6 +8,7 @@ namespace Content.Shared.GameObjects.Components.Doors
public enum DoorVisuals
{
VisualState,
Powered
}
[NetSerializable]