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

air alarm now sends the count of known devices, rather than all types of devices

Browse Source
This commit is contained in:
vulppine
2022-08-23 12:04:45 -07:00
parent 72d74222da
commit e348a64423
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs
View File

@@ -15,10 +15,10 @@ public sealed class AirAlarmComponent : Component
[ViewVariables] public AirAlarmTab CurrentTab { get; set; } [ViewVariables] public AirAlarmTab CurrentTab { get; set; }
public Dictionary<string, IAtmosDeviceData> DeviceData = new(); public readonly HashSet<string> KnownDevices = new();
public Dictionary<string, GasVentPumpData> VentData = new(); public readonly Dictionary<string, GasVentPumpData> VentData = new();
public Dictionary<string, GasVentScrubberData> ScrubberData = new(); public readonly Dictionary<string, GasVentScrubberData> ScrubberData = new();
public Dictionary<string, AtmosSensorData> SensorData = new(); public readonly Dictionary<string, AtmosSensorData> SensorData = new();
public HashSet<NetUserId> ActivePlayers = new(); public HashSet<NetUserId> ActivePlayers = new();

8
Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
View File

@@ -182,6 +182,7 @@ public sealed class AirAlarmSystem : EntitySystem
{ {
ForceCloseAllInterfaces(uid); ForceCloseAllInterfaces(uid);
component.CurrentModeUpdater = null; component.CurrentModeUpdater = null;
component.KnownDevices.Clear();
component.ScrubberData.Clear(); component.ScrubberData.Clear();
component.SensorData.Clear(); component.SensorData.Clear();
component.VentData.Clear(); component.VentData.Clear();
@@ -232,6 +233,7 @@ public sealed class AirAlarmSystem : EntitySystem
{ {
if (AccessCheck(uid, args.Session.AttachedEntity, component)) if (AccessCheck(uid, args.Session.AttachedEntity, component))
{ {
component.KnownDevices.Clear();
component.VentData.Clear(); component.VentData.Clear();
component.ScrubberData.Clear(); component.ScrubberData.Clear();
component.SensorData.Clear(); component.SensorData.Clear();
@@ -384,8 +386,6 @@ public sealed class AirAlarmSystem : EntitySystem
// Save into component. // Save into component.
// Sync data to interface. // Sync data to interface.
// _airAlarmDataSystem.UpdateDeviceData(uid, args.SenderAddress, data);
//
switch (data) switch (data)
{ {
case GasVentPumpData ventData: case GasVentPumpData ventData:
@@ -402,6 +402,8 @@ public sealed class AirAlarmSystem : EntitySystem
break; break;
} }
controller.KnownDevices.Add(args.SenderAddress);
UpdateUI(uid, controller); UpdateUI(uid, controller);
return; return;
@@ -500,7 +502,7 @@ public sealed class AirAlarmSystem : EntitySystem
} }
} }
var deviceCount = alarm.VentData.Count + alarm.ScrubberData.Count + alarm.SensorData.Count; var deviceCount = alarm.KnownDevices.Count;
if (!_atmosAlarmable.TryGetHighestAlert(uid, out var highestAlarm)) if (!_atmosAlarmable.TryGetHighestAlert(uid, out var highestAlarm))
{ {