(3a5d98b) v0.9.6.0

Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs

@@ -276,7 +276,7 @@ namespace Barotrauma.Items.Components
 
             if (reload > 0.0f) return false;
 
-            if (GetAvailablePower() < powerConsumption)
+            if (GetAvailableBatteryPower() < powerConsumption)
             {
 #if CLIENT
                 if (!flashLowPower && character != null && character == Character.Controlled)
@@ -410,7 +410,7 @@ namespace Barotrauma.Items.Components
                 character.AIController.SelectTarget(null);
             }
 
-            if (GetAvailablePower() < powerConsumption)
+            if (GetAvailableBatteryPower() < powerConsumption)
             {
                 var batteries = item.GetConnectedComponents<PowerContainer>();
 
@@ -540,21 +540,6 @@ namespace Barotrauma.Items.Components
             return false;
         }
 
-        private float GetAvailablePower()
-        {
-            var batteries = item.GetConnectedComponents<PowerContainer>();
-
-            float availablePower = 0.0f;
-            foreach (PowerContainer battery in batteries)
-            {
-                float batteryPower = Math.Min(battery.Charge*3600.0f, battery.MaxOutPut);
-
-                availablePower += batteryPower;
-            }
-
-            return availablePower;
-        }
-
         private void GetAvailablePower(out float availableCharge, out float availableCapacity)
         {
             var batteries = item.GetConnectedComponents<PowerContainer>();