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

Fixes Emergency Lights not charging (#2873)

Browse Source 
* Fixes Emergency Lights not charging

* Removed extra imports
This commit is contained in:
Daniel Castro Razo
2021-01-01 07:26:42 -06:00
committed by GitHub
parent 483f7f4385
commit 633ae5bc90
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
@@ -32,7 +32,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
} }
} }
private EmergencyLightState _state = EmergencyLightState.Charging; private EmergencyLightState _state = EmergencyLightState.Empty;
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
private float _wattage; private float _wattage;
@@ -139,11 +139,15 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
}
Owner.EnsureComponentWarn(out PowerReceiverComponent receiver); public override void OnAdd()
{
base.OnAdd();
if (Owner.TryGetComponent(out PowerReceiverComponent receiver))
{
receiver.OnPowerStateChanged += UpdateState; receiver.OnPowerStateChanged += UpdateState;
State = EmergencyLightState.Charging; }
} }
public override void OnRemove() public override void OnRemove()

17
Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers; using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
internal sealed class EmergencyLightSystem : EntitySystem internal sealed class EmergencyLightSystem : EntitySystem
{ {
private readonly List<EmergencyLightComponent> _activeLights = new(); private readonly HashSet<EmergencyLightComponent> _activeLights = new();
public override void Initialize() public override void Initialize()
{ {
@@ -21,19 +21,13 @@ namespace Content.Server.GameObjects.EntitySystems
{ {
switch (message.State) switch (message.State)
{ {
case EmergencyLightComponent.EmergencyLightState.On:
case EmergencyLightComponent.EmergencyLightState.Charging: case EmergencyLightComponent.EmergencyLightState.Charging:
if (_activeLights.Contains(message.Component))
_activeLights.Add(message.Component); _activeLights.Add(message.Component);
break; break;
case EmergencyLightComponent.EmergencyLightState.Full: case EmergencyLightComponent.EmergencyLightState.Full:
case EmergencyLightComponent.EmergencyLightState.Empty: case EmergencyLightComponent.EmergencyLightState.Empty:
_activeLights.Remove(message.Component); _activeLights.Remove(message.Component);
break;
case EmergencyLightComponent.EmergencyLightState.On:
if (!_activeLights.Contains(message.Component))
_activeLights.Add(message.Component);
break; break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
@@ -42,10 +36,9 @@ namespace Content.Server.GameObjects.EntitySystems
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
for (var i = _activeLights.Count - 1; i >= 0; i--) foreach (var activeLight in _activeLights)
{ {
var comp = _activeLights[i]; activeLight.OnUpdate(frameTime);
comp.OnUpdate(frameTime);
} }
} }
} }

2
Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
View File

@@ -11,11 +11,11 @@
offset: "0.5, 0" offset: "0.5, 0"
color: "#FF4020" color: "#FF4020"
mask: /Textures/Effects/LightMasks/emergency_mask.png mask: /Textures/Effects/LightMasks/emergency_mask.png
- type: EmergencyLight
- type: PowerReceiver - type: PowerReceiver
- type: Battery - type: Battery
maxCharge: 30000 maxCharge: 30000
startingCharge: 0 startingCharge: 0
- type: EmergencyLight
- type: Sprite - type: Sprite
sprite: Constructible/Lighting/emergency_light.rsi sprite: Constructible/Lighting/emergency_light.rsi
state: emergency_light_off state: emergency_light_off