add visual state enums, basic logic

new-frontiers-14 · Jan 27, 2025 · 81fb8de · 81fb8de
1 parent 89d5c57
commit 81fb8de
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/Content.Server/_NF/Fluids/EntitySystems/AdvDrainSystem.cs b/Content.Server/_NF/Fluids/EntitySystems/AdvDrainSystem.cs
@@ -11,6 +11,8 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
 using Content.Shared.Fluids.Components;
+using Content.Shared._NF.Fluids.Components;
+using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
@@ -20,7 +22,7 @@
 using Robust.Shared.Utility;
 
 
-namespace Content.Server.Fluids.EntitySystems;
+namespace Content.Server._NF.Fluids.EntitySystems;
 
 public sealed class AdvDrainSystem : SharedDrainSystem
 {
@@ -36,6 +38,7 @@ public sealed class AdvDrainSystem : SharedDrainSystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
 
     private readonly HashSet<Entity<PuddleComponent>> _puddles = new();
 
@@ -136,13 +139,17 @@ public override void Update(float frameTime)
             if (!TryComp(uid, out TransformComponent? xform) || !xform.Anchored)
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
+                _appearanceSystem.SetData(uid, AdvDrainVisualState.IsRunning, false);
+                _appearanceSystem.SetData(uid, AdvDrainVisualState.IsDraining, false);
                 continue;
             }
 
             // not powered
             if (!_powerCell.HasCharge(uid, drain.Wattage))
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
+                _appearanceSystem.SetData(uid, AdvDrainVisualState.IsRunning, false);
+                _appearanceSystem.SetData(uid, AdvDrainVisualState.IsDraining, false);
                 continue;
             }
 
@@ -152,7 +159,7 @@ public override void Update(float frameTime)
                 continue;
             }
             drain.Accumulator -= drain.DrainFrequency;
-
+            _appearanceSystem.SetData(uid, AdvDrainVisualState.IsRunning, true);
 
             // Disable ambient sound from emptying manually
             if (!drain.AutoDrain)
@@ -177,8 +184,13 @@ public override void Update(float frameTime)
             // Remove a bit from the buffer
             if (drainSolution.Volume > drain.UnitsDestroyedThreshold)
             {
+                _appearanceSystem.SetData(uid, AdvDrainVisualState.IsVoiding, true);
                 _solutionContainerSystem.SplitSolution(drain.Solution.Value, Math.Min(drain.UnitsDestroyedPerSecond * drain.DrainFrequency, (float)drainSolution.Volume - drain.UnitsDestroyedThreshold));
             }
+            else
+            {
+                _appearanceSystem.SetData(uid, AdvDrainVisualState.IsVoiding, false);
+            }
 
             // This will ensure that UnitsPerSecond is per second...
             var amount = drain.UnitsPerSecond * drain.DrainFrequency;
@@ -196,6 +208,7 @@ public override void Update(float frameTime)
 
             // only use power if it's actively draining puddles
             _powerCell.TryUseCharge(uid, drain.Wattage * drain.DrainFrequency);
+            _appearanceSystem.SetData(uid, AdvDrainVisualState.IsDraining, true);
             amount /= _puddles.Count;
 
             foreach (var puddle in _puddles)
@@ -240,6 +253,4 @@ private void OnExamined(Entity<AdvDrainComponent> entity, ref ExaminedEvent args
         var text = Loc.GetString("adv-drain-component-examine-volume", ("volume", drainSolution.Volume), ("maxvolume", drain.UnitsDestroyedThreshold));
         args.PushMarkup(text);
     }
-
-
 }
diff --git a/Content.Shared/Fluids/SharedDrainSystem.cs b/Content.Shared/Fluids/SharedDrainSystem.cs
@@ -10,3 +10,13 @@ public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent
     {
     }
 }
+
+// Start Frontier: portable pump visual state
+[Serializable, NetSerializable]
+public enum AdvDrainVisualState : byte
+{
+    IsRunning,
+    IsDraining,
+    IsVoiding
+}
+// End Frontier
diff --git a/Content.Shared/_NF/Fluids/Components/AdvDrainComponent.cs b/Content.Shared/_NF/Fluids/Components/AdvDrainComponent.cs
@@ -1,8 +1,9 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
+using Content.Shared.Fluids;
 
-namespace Content.Shared.Fluids.Components;
+namespace Content.Shared._NF.Fluids.Components;
 
 /// <summary>
 /// A Drain allows an entity to absorb liquid in a disposal goal. Drains can be filled manually (with the Empty verb)

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/portable_pump.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/portable_pump.yml
@@ -24,13 +24,15 @@
     noRot: true
     layers:
     - state: base
-      map: ["enum.PortableScrubberVisualLayers.IsRunning"]
+      map: ["enum.AdvDrainVisualState.IsRunning"]
     - state: pumping
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      map: ["enum.AdvDrainVisualState.IsDraining"]
     - state: powered
       shader: unshaded
-    #  visible: false
-    #  map: ["enum.PortableScrubberVisualLayers.IsDraining"]
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: voiding
+      shader: unshaded
+      map: ["enum.AdvDrainVisualState.IsVoiding"]
   - type: Appearance
   - type: GenericVisualizer
     visuals: