gunfire fixes

sayterdarkwynd · Dec 11, 2019 · 47563d6 · 47563d6
1 parent d815632
commit 47563d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/items/active/weapons/ranged/gunfire.lua b/items/active/weapons/ranged/gunfire.lua
@@ -1,3 +1,6 @@
+--activeItem.setInstanceValue() can be used to set a property on the active item  (ammo reload pause if discarding)
+--and the property should be accessible via config.getParameter()
+
 require "/scripts/util.lua"
 require "/scripts/interp.lua"
 require "/scripts/FRHelper.lua"
@@ -120,7 +123,6 @@ function GunFire:update(dt, fireMode, shiftHeld)
 		    self:setState(self.burst)
 		end
 	end
-
 end
 
 
@@ -273,7 +275,7 @@ function GunFire:aimVector(inaccuracy)
 end
 
 function GunFire:energyPerShot()
- if self.isAmmoBased then
+ if (self.isAmmoBased == 1) and not (self.fireMode == "alt") then
     return (self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0))/2
  else
     return self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0)
@@ -357,7 +359,7 @@ function GunFire:hasShotgunReload()
 	end
 end
 
-function GunFire:checkAmmo()	
+function GunFire:checkAmmo()
 	if (self.isAmmoBased==1) and (self.magazineAmount <= 0) then 
 	    if self.burstCooldown then
 	      self.cooldownTimer = self.burstCooldown + self.reloadTime

diff --git a/items/active/weapons/ranged/gunfirefixed.lua b/items/active/weapons/ranged/gunfirefixed.lua
@@ -329,10 +329,10 @@ function GunFireFixed:aimVector(inaccuracy)
 end
 
 function GunFireFixed:energyPerShot()
-  if self.useEnergy == "nil" or self.useEnergy then -- key "useEnergy" defaults to true.
-    return self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0)
-  elseif self.isAmmoBased then  --ammo based guns use 1/2 as much energy
+  if (self.isAmmoBased == 1) and not (self.fireMode == "alt") then  --ammo based guns use 1/2 as much energy
     return (self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0))/2
+  elseif self.useEnergy == "nil" or self.useEnergy then -- key "useEnergy" defaults to true.
+    return self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0)  
   else
     return 0
   end