fixes

sayterdarkwynd · Jan 24, 2017 · 8c557e9 · 8c557e9
1 parent fb48df9
commit 8c557e9
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 24 deletions.
diff --git a/items/active/weapons/bow/abilities/bowshot.lua b/items/active/weapons/bow/abilities/bowshot.lua
@@ -27,9 +27,7 @@ function BowShot:setCritDamage(damage)
      --used for checking dual-wield setups
      local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")  
      local weaponModifier = config.getParameter("critChance",0)
-   if not self.critChance then
-    local self.critChance = 0
-  end      
+
   if heldItem then
       if root.itemHasTag(heldItem, "bow") then
         self.critChance = 9 + weaponModifier
@@ -38,6 +36,9 @@ function BowShot:setCritDamage(damage)
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
+  if not self.critChance then
+    self.critChance = 0
+  end
 
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
@@ -52,7 +53,12 @@ function BowShot:setCritDamage(damage)
   damage = crit and (damage*2) + self.critBonus or damage
 
   if crit then
+    if heldItem then
+      -- exclude mining lasers
+      if not root.itemHasTag(heldItem, "mininggun") then 
         status.addEphemeralEffect("crithit", 0.3, activeItem.ownerEntityId())
+      end
+    end
   end
 
   return damage

diff --git a/items/active/weapons/other/magnorbs/magnorbatropus/magnorbs_multi.lua b/items/active/weapons/other/magnorbs/magnorbatropus/magnorbs_multi.lua
@@ -59,15 +59,16 @@ function setCritDamageBoomerang(damage)
      local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
      --used for checking dual-wield setups
      local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")  
-     local weaponModifier = config.getParameter("critChance",0)
-
+     local weaponModifier = config.getParameter("critChance",0)  
   if heldItem then
       if root.itemHasTag(heldItem, "magnorb") then
         self.critChance = 4 + weaponModifier
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/other/magnorbs/magnorbfrost/magnorbs_multi.lua b/items/active/weapons/other/magnorbs/magnorbfrost/magnorbs_multi.lua
@@ -67,7 +67,9 @@ function setCritDamageBoomerang(damage)
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/other/magnorbs/magnorblunari/magnorbs.lua b/items/active/weapons/other/magnorbs/magnorblunari/magnorbs.lua
@@ -62,15 +62,16 @@ function setCritDamageBoomerang(damage)
      local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
      --used for checking dual-wield setups
      local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")  
-     local weaponModifier = config.getParameter("critChance",0)
-
+     local weaponModifier = config.getParameter("critChance",0)       
   if heldItem then
       if root.itemHasTag(heldItem, "magnorb") then
         self.critChance = 4 + weaponModifier
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/other/magnorbs/magnorbs.lua b/items/active/weapons/other/magnorbs/magnorbs.lua
@@ -70,7 +70,9 @@ function setCritDamageBoomerang(damage)
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/other/magnorbs/magnorbs_multi.lua b/items/active/weapons/other/magnorbs/magnorbs_multi.lua
@@ -67,7 +67,9 @@ function setCritDamageBoomerang(damage)
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/other/magnorbs/magnorbshadow/magnorbsquad.lua b/items/active/weapons/other/magnorbs/magnorbshadow/magnorbsquad.lua
@@ -67,7 +67,9 @@ function setCritDamageBoomerang(damage)
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/other/magnorbs/magnorbsquad.lua b/items/active/weapons/other/magnorbs/magnorbsquad.lua
@@ -67,7 +67,9 @@ function setCritDamageBoomerang(damage)
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/ranged/gunfire.lua b/items/active/weapons/ranged/gunfire.lua
@@ -33,9 +33,7 @@ function GunFire:setCritDamage(damage)
      --used for checking dual-wield setups
      local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")  
      local weaponModifier = config.getParameter("critChance",0)
-  if not self.critChance then
-    local self.critChance = 0
-  end       
+
   if heldItem then
       if root.itemHasTag(heldItem, "pistol") then
         self.critChance = 4 + weaponModifier
@@ -60,7 +58,9 @@ function GunFire:setCritDamage(damage)
       end
   end
     --sb.logInfo("crit chance base="..self.critChance)
-
+  if not self.critChance then
+    self.critChance = 0
+  end  
   --critBonus is bonus damage done with crits
   self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0  
   -- this next modifier only applies if they have a multiply item equipped

diff --git a/items/active/weapons/weapon.lua b/items/active/weapons/weapon.lua
@@ -32,14 +32,13 @@ end
   -- FU Crit Damage Script
 
 function setCritDamage(damage)
-
      -- check their equipped weapon
      -- Primary hand, or single-hand equip  
      local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
      --used for checking dual-wield setups
      local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")  
      local weaponModifier = config.getParameter("critChance",0)
-
+     
   if heldItem then
       if root.itemHasTag(heldItem, "dagger") then
         self.critChance = 1 + weaponModifier
@@ -63,13 +62,12 @@ function setCritDamage(damage)
         self.critChance = 3 + weaponModifier
       elseif root.itemHasTag(heldItem, "rapier") then
         self.critChance = 1 + weaponModifier
-      elseif root.itemHasTag(heldItem, "mininggun") then
-        self.critChance = 0       
       end
   end
+
   if not self.critChance then
-    local self.critChance = 0
-  end    
+    self.critChance = 0
+  end
     --sb.logInfo("crit chance base="..self.critChance)
 
   --critBonus is bonus damage done with crits