Release v0.15.12.0

2021-10-27 18:50:57 +03:00
parent bf95e82d80
commit 234fb6bc06
450 changed files with 26042 additions and 10457 deletions
@@ -15,6 +15,9 @@ namespace Barotrauma.Items.Components
        //a list of connections a given connection is connected to, either directly or via other power transfer components
        private readonly Dictionary<Connection, HashSet<Connection>> connectedRecipients = new Dictionary<Connection, HashSet<Connection>>();

+        private float overloadCooldownTimer;
+        private const float OverloadCooldown = 5.0f;
+
        protected float powerLoad;

        protected bool isBroken;
@@ -173,12 +176,19 @@ namespace Barotrauma.Items.Components
            Overload = -currPowerConsumption > Math.Max(powerLoad, 200.0f) * maxOverVoltage;
            if (Overload && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
            {
+                if (overloadCooldownTimer > 0.0f)
+                {
+                    overloadCooldownTimer -= deltaTime;
+                    return;
+                }
+
                //damage the item if voltage is too high (except if running as a client)
                float prevCondition = item.Condition;
                item.Condition -= deltaTime * 10.0f;

                if (item.Condition <= 0.0f && prevCondition > 0.0f)
                {
+                    overloadCooldownTimer = OverloadCooldown;
 #if CLIENT
                    SoundPlayer.PlaySound("zap", item.WorldPosition, hullGuess: item.CurrentHull);
                    Vector2 baseVel = Rand.Vector(300.0f);
@@ -370,5 +380,12 @@ namespace Barotrauma.Items.Components
                }
            }
        }
+
+        protected override void RemoveComponentSpecific()
+        {
+            base.RemoveComponentSpecific();
+            connectedRecipients?.Clear();
+            connectionDirty?.Clear();
+        }
    }
 }