From 0bb8c222bde06dad37ec8445e7f62c8757eb8593 Mon Sep 17 00:00:00 2001
From: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com>
Date: Sat, 30 Sep 2023 05:35:23 +0200
Subject: [PATCH] Added blocked visuals to volumetric pump (#20610)

---
 .../Components/GasVolumePumpComponent.cs      |   3 +++
 .../EntitySystems/GasVolumePumpSystem.cs      |  22 ++++++++++++++++--
 .../Binary/Visuals/GasVolumePumpVisuals.cs    |  18 ++++++++++++++
 .../Structures/Piping/Atmospherics/binary.yml |   7 +++---
 .../Piping/Atmospherics/pump.rsi/meta.json    |   5 ++++
 .../pump.rsi/pumpVolumeBlocked.png            | Bin 0 -> 5060 bytes
 6 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 Content.Shared/Atmos/Piping/Binary/Visuals/GasVolumePumpVisuals.cs
 create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeBlocked.png

diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
index bdd85524a8..36ced3887d 100644
--- a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
@@ -9,6 +9,9 @@ namespace Content.Server.Atmos.Piping.Binary.Components
         [DataField("enabled")]
         public bool Enabled { get; set; } = true;
 
+        [DataField("blocked")]
+        public bool Blocked { get; set; } = false;
+
         [ViewVariables(VVAccess.ReadWrite)]
         public bool Overclocked { get; set; } = false;
 
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index aa171ce6ba..5b8035681e 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -12,6 +12,7 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos.Piping;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.Atmos.Visuals;
 using Content.Shared.Audio;
 using Content.Shared.Database;
 using Content.Shared.Examine;
@@ -83,12 +84,24 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
             var inputStartingPressure = inlet.Air.Pressure;
             var outputStartingPressure = outlet.Air.Pressure;
 
+            var previouslyBlocked = pump.Blocked;
+            pump.Blocked = false;
+
             // Pump mechanism won't do anything if the pressure is too high/too low unless you overclock it.
             if ((inputStartingPressure < pump.LowerThreshold) || (outputStartingPressure > pump.HigherThreshold) && !pump.Overclocked)
-                return;
+            {
+                pump.Blocked = true;
+            }
 
             // Overclocked pumps can only force gas a certain amount.
             if ((outputStartingPressure - inputStartingPressure > pump.OverclockThreshold) && pump.Overclocked)
+            {
+                pump.Blocked = true;
+            }
+            
+            if (previouslyBlocked != pump.Blocked)
+                UpdateAppearance(uid, pump);
+            if (pump.Blocked)
                 return;
 
             // We multiply the transfer rate in L/s by the seconds passed since the last process to get the liters.
@@ -172,7 +185,12 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
             if (!Resolve(uid, ref pump, ref appearance, false))
                 return;
 
-            _appearance.SetData(uid, PumpVisuals.Enabled, pump.Enabled, appearance);
+            if (!pump.Enabled)
+                _appearance.SetData(uid, GasVolumePumpVisuals.State, GasVolumePumpState.Off, appearance);
+            else if (pump.Blocked)
+                _appearance.SetData(uid, GasVolumePumpVisuals.State, GasVolumePumpState.Blocked, appearance);
+            else
+                _appearance.SetData(uid, GasVolumePumpVisuals.State, GasVolumePumpState.On, appearance);
         }
 
         private void OnPacketRecv(EntityUid uid, GasVolumePumpComponent component, DeviceNetworkPacketEvent args)
diff --git a/Content.Shared/Atmos/Piping/Binary/Visuals/GasVolumePumpVisuals.cs b/Content.Shared/Atmos/Piping/Binary/Visuals/GasVolumePumpVisuals.cs
new file mode 100644
index 0000000000..1cc73e9038
--- /dev/null
+++ b/Content.Shared/Atmos/Piping/Binary/Visuals/GasVolumePumpVisuals.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Atmos.Visuals
+{
+    [Serializable, NetSerializable]
+    public enum GasVolumePumpVisuals : byte
+    {
+        State,
+    }
+
+    [Serializable, NetSerializable]
+    public enum GasVolumePumpState : byte
+    {
+        Off,
+        On,
+        Blocked,
+    }
+}
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index f5c1f2015f..b99b88483c 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -82,10 +82,11 @@
     - type: Appearance
     - type: GenericVisualizer
       visuals:
-        enum.PumpVisuals.Enabled:
+        enum.GasVolumePumpVisuals.State:
           enabled:
-            True: { state: pumpVolumeOn }
-            False: { state: pumpVolume }
+            On: { state: pumpVolumeOn }
+            Off: { state: pumpVolume }
+            Blocked: { state: pumpVolumeBlocked }
     - type: PipeColorVisuals
     - type: GasVolumePump
       enabled: false
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
index d3d3ce6ba9..14a5a244bf 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
@@ -52,6 +52,11 @@
          "name":"pumpVolumeOn",
          "directions":4,
          "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+      },
+      {
+         "name":"pumpVolumeBlocked",
+         "directions":4,
+         "delays":[ [ 1.0, 1.0 ], [ 1.0, 1.0 ], [ 1.0, 1.0 ], [ 1.0, 1.0 ] ]
       }
    ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeBlocked.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeBlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..27bb092f470b0b30826c979c9a6c701b8bbe641a
GIT binary patch
literal 5060
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

literal 0
HcmV?d00001