Changes

m
19 revisions imported
Line 1: Line 1:  
local Stat = require("Module:Stat")
 
local Stat = require("Module:Stat")
local Combat2 = require("Module:Combat2")
+
local Combat = require("Module:CalcCombat")
    
return {
 
return {
   −
     hit = function(context)
+
     hit = function(ship)
         return Stat.rate({ args = { context.cl1 + context.cl2, context.cl0 + context.cl1 + context.cl2 } }) .. "%"
+
         return Stat.rate({ args = { ship.cl1 + ship.cl2, ship.cl0 + ship.cl1 + ship.cl2 } }) .. "%"
 
     end,
 
     end,
   −
     crit = function(context)
+
     crit = function(ship)
         return Stat.rate({ args = { context.cl2, context.cl0 + context.cl1 + context.cl2 } }) .. "%"
+
         return Stat.rate({ args = { ship.cl2, ship.cl0 + ship.cl1 + ship.cl2 } }) .. "%"
 
     end,
 
     end,
   −
     error = function(context)
+
     error = function(ship)
         return Stat.error({ args = { context.cl1 + context.cl2, context.cl0 + context.cl1 + context.cl2 } }) .. "%"
+
         return Stat.error({ args = { ship.cl1 + ship.cl2, ship.cl0 + ship.cl1 + ship.cl2 } }) .. "%"
 
     end,
 
     end,
   −
     difference = function(context)
+
     difference = function(ship)
         if context.hit_rate then
+
         if ship.hit_rate then
             local diff = 100 * (context.cl1 + context.cl2) / (context.cl0 + context.cl1 + context.cl2) - context.hit_rate
+
             local diff = 100 * (ship.cl1 + ship.cl2) / (ship.cl0 + ship.cl1 + ship.cl2) - ship.hit_rate
 
             return string.format("%.2f%%", diff)
 
             return string.format("%.2f%%", diff)
 
         else
 
         else
Line 25: Line 25:  
     end,
 
     end,
   −
     critical_difference = function(context)
+
     critical_difference = function(ship)
         if context.critical_hit_rate then
+
         if ship.critical_hit_rate then
             local diff = 100 * (context.cl2) / (context.cl0 + context.cl1 + context.cl2) - context.critical_hit_rate
+
             local diff = 100 * (ship.cl2) / (ship.cl0 + ship.cl1 + ship.cl2) - ship.critical_hit_rate
 
             return string.format("%.2f%%", diff)
 
             return string.format("%.2f%%", diff)
 
         else
 
         else
Line 35: Line 35:     
     accuracy_value = function(ship, target)
 
     accuracy_value = function(ship, target)
         local accuracy_value_1, _, accuracy_value_3 = Combat2.accuracy_value(ship, target)
+
         local accuracy_value_1, _, accuracy_value_3 = Combat.accuracy_value(ship, target)
 
         if accuracy_value_1 and accuracy_value_3 then
 
         if accuracy_value_1 and accuracy_value_3 then
 
             return string.format('<span class="explain" title="Before fit: %.2f%%">%d%%</span>', accuracy_value_1, math.floor(accuracy_value_3))
 
             return string.format('<span class="explain" title="Before fit: %.2f%%">%d%%</span>', accuracy_value_1, math.floor(accuracy_value_3))
Line 43: Line 43:  
     end,
 
     end,
   −
     fit = function(ship, target, context)
+
     fit = function(ship, target)
 +
        local context = {}
 
         context._ng = ship._ng
 
         context._ng = ship._ng
         context._ci, context._hit_rate = Stat.error_(context.cl1 + context.cl2, context.cl0 + context.cl1 + context.cl2)
+
         context._ci, context._hit_rate = Stat.error_(ship.cl1 + ship.cl2, ship.cl0 + ship.cl1 + ship.cl2)
         local fit, min_fit, max_fit = Combat2.find_fit(ship, target, context)
+
         local fit, min_fit, max_fit = Combat.find_fit(ship, target, context)
         if fit and min_fit and max_fit then
+
         if fit and min_fit and max_fit and ship._ng then
 
             return string.format('<span class="explain" title="%d ~ %d">%d</span>', min_fit, max_fit, fit)
 
             return string.format('<span class="explain" title="%d ~ %d">%d</span>', min_fit, max_fit, fit)
 
         else
 
         else
Bots, gkautomate
12,557

edits