Module:WeaponDPS: Difference between revisions

← Older edit

@@ Line 2: / Line 2: @@
 function p.dps(frame)
-     local str = tonumber(frame.args.str)
+     local args = frame.args
-     local ticks = tonumber(frame.args.ticks)
+     local parent = frame:getParent()
-     if not str or not ticks or ticks == 0 then
+     local str = tonumber(args.Strength or parent.args.Strength) or 0
-        return "Invalid input"
+    local acc = tonumber(args.Accuracy or parent.args.Accuracy) or 0
-     end
+     local ticks = tonumber(args.Speed or parent.args.Speed)
-     local maxHit = str / 8
+    if (str == 0 and acc == 0) then return "No STR or ACC" end
+    if not ticks then return "No speed" end
+    local effectiveStr = str + acc
+     local maxHit = effectiveStr / 14
      local seconds = ticks * 0.6
      local dps = maxHit / seconds
-     return string.format("%.2f DPS (Max Hit: %.2f)", dps, maxHit)
+     return '<abbr title="Theoretical damage per second">' .. string.format('%.2f', dps) .. '</abbr>'
 end
 return p