ec pershot logic

gomker · Jul 8, 2018 · 9a9b7af · 9a9b7af
1 parent 8146622
commit 9a9b7af
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/BDArmory/ModuleWeapon.cs b/BDArmory/ModuleWeapon.cs
@@ -1457,18 +1457,19 @@ void DrainECPerShot()
 
         bool CanFire()
         {
-            if ((BDArmorySettings.INFINITE_AMMO || part.RequestResource(ammoName, requestResourceAmount) > 0))
+
+            if (ECPerShot != 0)
             {
-                if (ECPerShot != 0)
+                double chargeAvailable = part.RequestResource("ElectricCharge", ECPerShot, ResourceFlowMode.ALL_VESSEL);
+                if (chargeAvailable < ECPerShot * 0.95f)
                 {
-                    double chargeAvailable = part.RequestResource("ElectricCharge", ECPerShot, ResourceFlowMode.ALL_VESSEL);
-                    if (chargeAvailable < ECPerShot * 0.95f)
-                    {
-                        ScreenMessages.PostScreenMessage("Weapon Requires EC", 5.0f, ScreenMessageStyle.UPPER_CENTER);
-                        return false;
-                    }
+                    ScreenMessages.PostScreenMessage("Weapon Requires EC", 5.0f, ScreenMessageStyle.UPPER_CENTER);
+                    return false;
                 }
+            }
 
+            if ((BDArmorySettings.INFINITE_AMMO || part.RequestResource(ammoName, requestResourceAmount) > 0))
+            {
                 return true;
             }