| Line 8: |
Line 8: |
| | local ShipCardKai = require("Module:ShipCardKai") | | local ShipCardKai = require("Module:ShipCardKai") |
| | local ShipBattleCardKai = require("Module:ShipBattleCardKai") | | local ShipBattleCardKai = require("Module:ShipBattleCardKai") |
| − | local Combat2 = require("Module:Combat2") | + | local Combat = require("Module:CalcCombat") |
| | local EquipmentCardKai = require("Module:EquipmentCardKai") | | local EquipmentCardKai = require("Module:EquipmentCardKai") |
| | local EquipmentGraphicKai = require("Module:EquipmentGraphicKai") | | local EquipmentGraphicKai = require("Module:EquipmentGraphicKai") |
| Line 241: |
Line 241: |
| | | | |
| | hit_rate = function(ship, target) | | hit_rate = function(ship, target) |
| − | local r = Combat2.hit_rate(ship, target) | + | local r = Combat.hit_rate(ship, target) |
| | if r then | | if r then |
| | ship.hit_rate = r | | ship.hit_rate = r |
| Line 251: |
Line 251: |
| | | | |
| | critical_hit_rate = function(ship, target) | | critical_hit_rate = function(ship, target) |
| − | local r = Combat2.critical_hit_rate(ship, target) | + | local r = Combat.critical_hit_rate(ship, target) |
| | if r then | | if r then |
| | ship.critical_hit_rate = r | | ship.critical_hit_rate = r |