half energy change

sayterdarkwynd · Nov 25, 2019 · 9c08f3e · 9c08f3e
1 parent 8bd0048
commit 9c08f3e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/items/active/weapons/ranged/gunfire.lua b/items/active/weapons/ranged/gunfire.lua
@@ -406,12 +406,11 @@ function GunFire:aimVector(inaccuracy)
 end
 
 function GunFire:energyPerShot()
- -- if self.isAmmoBased then
- --   return (self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0))/2
- -- else
+ if self.isAmmoBased then
+    return (self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0))/2
+ else
     return self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0)
-  --end
-
+ end  	
 end
 
 function GunFire:damagePerShot()

diff --git a/items/active/weapons/ranged/gunfirefixed.lua b/items/active/weapons/ranged/gunfirefixed.lua
@@ -459,8 +459,8 @@ 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
---   return (self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0))/2
+  elseif self.isAmmoBased then  --ammo based guns use 1/2 as much energy
+    return (self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0))/2
   else
     return 0
   end

diff --git a/species/fenerox.raceeffect b/species/fenerox.raceeffect
@@ -12,8 +12,8 @@
 	],
 	"diet" : "carnivore",
 	"controlModifiers": {
-		"speedModifier": 1.12,
-		"airJumpModifier": 1.11
+		"speedModifier": 1.06,
+		"airJumpModifier": 1.06
 	},
 	"envEffects": [
 		{

diff --git a/species/fenerox.species.patch b/species/fenerox.species.patch
@@ -10,7 +10,7 @@
  Diet: Carnivorous
 
  ^orange;Perks^reset;:
- ^green;+12%^reset; Speed, ^green;+11%^reset; Jump 
+ ^green;+6%^reset; Speed, ^green;+6%^reset; Jump 
  ^green;Regenerate at night and gain energy regeneration^reset;
  Resist: ^green;40%^reset; Poison & Electric, ^green;25%^reset; Cosmic
  Tech: ^green;Hunter's Claw^reset;
@@ -22,6 +22,7 @@
  ^orange;Weapons^reset;:
  Boomerang/Chakram: ^green;+10%^reset; Damage, ^green;+2%^reset; Crit^reset;
  Spear: ^green;+10%^reset; Damage, ^green;+2%^reset; Crit^reset; ^green;+20%^reset; Protection
+ Spear: Increases movement speed, but consumes hunger when wielding.
  ^green;Add your current speed/4 as bonus melee damage.^reset;
 
  ^red;Weaknesses^reset;: