v0.11.0.9

2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
@@ -2,7 +2,9 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Globalization;
+using System.Linq;
 using System.Xml.Linq;
+using Barotrauma.MapCreatures.Behavior;

 namespace Barotrauma.Items.Components
 {
@@ -11,10 +13,38 @@ namespace Barotrauma.Items.Components
        private float flowPercentage;
        private float maxFlow;

-        private float? targetLevel;
+        public float? TargetLevel;
+
+        private bool hijacked;
+        public bool Hijacked
+        {
+            get { return hijacked; }
+            set 
+            {
+                if (value == hijacked) { return; }
+                hijacked = value;
+#if SERVER
+                item.CreateServerEvent(this);
+#endif
+            }
+        }

        private float pumpSpeedLockTimer, isActiveLockTimer;

+        private bool infected;
+
+        [Serialize(false, true, description: "Whether or not the pump is infected with ballast flora spores.")]
+        public bool Infected
+        {
+            get => infected;
+            set
+            {
+                infected = value;
+            }
+        }
+
+        public string InfectIdentifier;
+
        [Serialize(0.0f, true, description: "How fast the item is currently pumping water (-100 = full speed out, 100 = full speed in). Intended to be used by StatusEffect conditionals (setting this value in XML has no effect).")]
        public float FlowPercentage
        {
@@ -66,12 +96,12 @@ namespace Barotrauma.Items.Components
        {
            currFlow = 0.0f;

-            if (targetLevel != null)
+            if (TargetLevel != null)
            {
                pumpSpeedLockTimer -= deltaTime;
                float hullPercentage = 0.0f;
                if (item.CurrentHull != null) { hullPercentage = (item.CurrentHull.WaterVolume / item.CurrentHull.Volume) * 100.0f; }
-                FlowPercentage = ((float)targetLevel - hullPercentage) * 10.0f;
+                FlowPercentage = ((float)TargetLevel - hullPercentage) * 10.0f;
            }

            currPowerConsumption = powerConsumption * Math.Abs(flowPercentage / 100.0f);
@@ -92,14 +122,41 @@ namespace Barotrauma.Items.Components
            //less effective when in a bad condition
            currFlow *= MathHelper.Lerp(0.5f, 1.0f, item.Condition / item.MaxCondition);

+
+            if (currFlow < 0 && Infected)
+            {
+                InfectBallast(InfectIdentifier);
+            }
+            Infected = false;
+
            item.CurrentHull.WaterVolume += currFlow;
            if (item.CurrentHull.WaterVolume > item.CurrentHull.Volume) { item.CurrentHull.Pressure += 0.5f; }
        }

+        public void InfectBallast(string identifier)
+        {
+            Hull hull = item.CurrentHull;
+            if (hull == null) { return; }
+
+            // if the ship is already infected then do nothing
+            if (Hull.hullList.Where(h => h.Submarine == hull.Submarine).Any(h => h.BallastFlora != null)) { return; }
+
+            if (hull.BallastFlora != null) { return; }
+
+            Vector2 offset = item.WorldPosition - hull.WorldPosition;
+            hull.BallastFlora = new BallastFloraBehavior(hull, BallastFloraPrefab.Find(identifier), offset, firstGrowth: true);
+
+#if SERVER
+            hull.BallastFlora.SendNetworkMessage(hull.BallastFlora, BallastFloraBehavior.NetworkHeader.Spawn);
+#endif
+        }
+
        partial void UpdateProjSpecific(float deltaTime);
        
        public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item source, Character sender, float power = 0.0f, float signalStrength = 1.0f)
        {
+            if (Hijacked) { return; }
+
            if (connection.Name == "toggle")
            {
                IsActive = !IsActive;
@@ -115,7 +172,7 @@ namespace Barotrauma.Items.Components
                if (float.TryParse(signal, NumberStyles.Any, CultureInfo.InvariantCulture, out float tempSpeed))
                {
                    flowPercentage = MathHelper.Clamp(tempSpeed, -100.0f, 100.0f);
-                    targetLevel = null;
+                    TargetLevel = null;
                    pumpSpeedLockTimer = 0.1f;
                }
            }
@@ -123,7 +180,7 @@ namespace Barotrauma.Items.Components
            {
                if (float.TryParse(signal, NumberStyles.Any, CultureInfo.InvariantCulture, out float tempTarget))
                {
-                    targetLevel = MathHelper.Clamp(tempTarget + 50.0f, 0.0f, 100.0f);
+                    TargetLevel = MathHelper.Clamp(tempTarget + 50.0f, 0.0f, 100.0f);
                    pumpSpeedLockTimer = 0.1f;
                }
            }