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

2019-05-16 05:50:56 +03:00
parent fd7dfebd3a
commit 884360216f
45 changed files with 1679 additions and 1563 deletions
@@ -235,12 +235,12 @@ namespace Barotrauma.Items.Components

            if (string.IsNullOrEmpty(objective.Option) || objective.Option.ToLowerInvariant() == "charge")
            {
-                if (Math.Abs(rechargeSpeed - maxRechargeSpeed * 0.5f) > 0.05f)
+                if (Math.Abs(rechargeSpeed - maxRechargeSpeed * aiRechargeTargetRatio) > 0.05f)
                {
 #if SERVER
                    item.CreateServerEvent(this);
 #endif
-                    RechargeSpeed = maxRechargeSpeed * 0.5f;
+                    RechargeSpeed = maxRechargeSpeed * aiRechargeTargetRatio;
 #if CLIENT
                    rechargeSpeedSlider.BarScroll = RechargeSpeed / Math.Max(maxRechargeSpeed, 1.0f);
 #endif