v1.7.7.0 (Winter Update 2024)

2024-12-11 13:26:13 +02:00
parent 7d5b7a310a
commit f6349b2175
256 changed files with 4794 additions and 1653 deletions
@@ -232,7 +232,7 @@ namespace Barotrauma.Items.Components

            float maxOverVoltage = Math.Max(OverloadVoltage, 1.0f);

-            Overload = Voltage > maxOverVoltage;
+            Overload = Voltage > maxOverVoltage && GameMain.GameSession is not { RoundDuration: < 5 };

            if (Overload && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
            {
@@ -157,6 +157,13 @@ namespace Barotrauma.Items.Components
                {
                    if (powerOut?.Grid != null) { return powerOut.Grid.Voltage; }
                }
+                
+                if (this is PowerTransfer && item.Condition <= 0.0f)
+                {
+                    //if the junction box or other power transfer device is broken,
+                    //it cannot be supplying any power (voltage = 0)
+                    return 0.0f;
+                }
                return PowerConsumption <= 0.0f ? 1.0f : voltage;
            }
            set