(6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-27 20:58:04 +02:00
parent 0ab2f2ac69
commit e6c3d6d537
12 changed files with 11 additions and 9563 deletions
@@ -180,7 +180,8 @@ 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.MaxCondition);
+                float maxOverVoltage = MathHelper.Lerp(OverloadVoltage * 0.75f, OverloadVoltage, item.Condition / item.MaxCondition);
+                maxOverVoltage = Math.Max(OverloadVoltage, 1.0f);

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