| 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 { |
| 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 47: |
Line 47: |
| | context._ng = ship._ng | | context._ng = ship._ng |
| | context._ci, context._hit_rate = Stat.error_(ship.cl1 + ship.cl2, ship.cl0 + ship.cl1 + ship.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 |