Unstable v0.1300.0.0 (February 19th 2021)

2021-02-25 13:44:23 +02:00
parent b772654326
commit 24cbef485a
441 changed files with 21343 additions and 8562 deletions
@@ -51,6 +51,7 @@ namespace Barotrauma.MapCreatures.Behavior
                if (pump.Item.CurrentHull == targetBranch.CurrentHull)
                {
                    targetPumps.Add(pump);
+                    SetPump(pump);
                    pump.Hijacked = true;
                }
            }
@@ -90,18 +91,23 @@ namespace Barotrauma.MapCreatures.Behavior
            }
        }

+        private void SetPump(Pump pump)
+        {
+            if (pump.TargetLevel != null)
+            {
+                pump.TargetLevel = 100f;
+            }
+            else
+            {
+                pump.FlowPercentage = 100f;
+            }
+        }
+
        public void Update(float deltaTime)
        {
            foreach (Pump pump in targetPumps)
            {
-                if (pump.TargetLevel != null)
-                {
-                    pump.TargetLevel = 100f;
-                }
-                else
-                {
-                    pump.FlowPercentage = 100f;
-                }
+                SetPump(pump);
            }

            if (tryDrown && !filled)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;

@@ -25,6 +26,17 @@ namespace Barotrauma.MapCreatures.Behavior

        protected override void Grow()
        {
+            if (TargetBranches.Any(b => b.Removed))
+            {
+                if (!Behavior.IgnoredTargets.ContainsKey(Target))
+                {
+                    Behavior.IgnoredTargets.Add(Target, 10);
+                }
+
+                isFinished = true;
+                return;
+            }
+
            if (Target == null || Target.Removed)
            {
                isFinished = true;