Puddle refactor 2: Spillastic boogaloo (#4784)

* Refactor PuddleComponent * Move puddle effects into separate RSIs Basically egg/tomato/powder puddle will be moved into separate /Textures/Fluids RSIs * Fix YAML for puddles * Fix issues sloth pointed out. * Ensure Puddle Component are properly added when spawned * Remove unnecessary method init puddle with starting maxVolume * Addressed ElectroSr comments * Add Resolves * Try fix error in ensureSolution * Puddle unanchoring * Address some issues with puddles * Fix continue -> return
2021-10-27 09:24:18 +01:00
parent 03b1fed47d
commit 14b401f9b3
30 changed files with 753 additions and 564 deletions
--- a/Content.Server/Fluids/EntitySystems/EvaporationSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/EvaporationSystem.cs
@@ -0,0 +1,58 @@
+using Content.Server.Fluids.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Fluids.EntitySystems
+{
+    [UsedImplicitly]
+    public sealed class EvaporationSystem : EntitySystem
+    {
+        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+            var queueDelete = new RemQueue<EvaporationComponent>();
+            foreach (var evaporationComponent in EntityManager.EntityQuery<EvaporationComponent>())
+            {
+                var uid = evaporationComponent.Owner.Uid;
+                evaporationComponent.Accumulator += frameTime;
+
+                if (!_solutionContainerSystem.TryGetSolution(uid, evaporationComponent.SolutionName, out var solution))
+                {
+                    // If no solution, delete the entity
+                    queueDelete.Add(evaporationComponent);
+                    continue;
+                }
+
+                if (evaporationComponent.Accumulator < evaporationComponent.EvaporateTime)
+                    continue;
+
+                evaporationComponent.Accumulator -= evaporationComponent.EvaporateTime;
+
+
+                _solutionContainerSystem.SplitSolution(uid, solution,
+                    ReagentUnit.Min(ReagentUnit.New(1), solution.CurrentVolume));
+
+                if (solution.CurrentVolume == 0)
+                {
+                    EntityManager.QueueDeleteEntity(uid);
+                }
+                else if (solution.CurrentVolume <= evaporationComponent.LowerLimit
+                         || solution.CurrentVolume >= evaporationComponent.UpperLimit)
+                {
+                    queueDelete.Add(evaporationComponent);
+                }
+            }
+
+            foreach (var evaporationComponent in queueDelete)
+            {
+                EntityManager.RemoveComponent(evaporationComponent.Owner.Uid, evaporationComponent);
+            }
+        }
+    }
+}