409d4d9...aeafa16 (merge human-ai)

2019-03-18 22:52:17 +02:00
parent 80ab27df22
commit 3301bed442
88 changed files with 2334 additions and 1657 deletions
@@ -176,7 +176,7 @@ namespace Barotrauma.Items.Components
 #endif

                //items in a bad condition are more sensitive to overvoltage
-                float maxOverVoltage = MathHelper.Lerp(Math.Min(OverloadVoltage, 1.0f), OverloadVoltage, item.Condition / item.Prefab.Health);
+                float maxOverVoltage = MathHelper.Lerp(Math.Min(OverloadVoltage, 1.0f), OverloadVoltage, item.Condition / item.MaxCondition);

                //if the item can't be fixed, don't allow it to break
                if (!item.Repairables.Any() || !CanBeOverloaded) continue;