(4ca668169) Fixed: Conflict

2019-05-16 05:58:48 +03:00
parent 0a67590572
commit cb83984e80
80 changed files with 2036 additions and 1859 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