Line 97: |
Line 97: |
| function format_damage(ship_, type_code, damage_type_fn, equip_setup, night_attack, spotting) | | function format_damage(ship_, type_code, damage_type_fn, equip_setup, night_attack, spotting) |
| local combat = Combat:new(night_attack) | | local combat = Combat:new(night_attack) |
− | local normal_damage = combat:damage(damage_type_fn(combat, Ship:new(ship_, {}, night_attack))) | + | local normal_damage = combat:damage(damage_type_fn(combat, Combat.ship(ship_, {}, night_attack))) |
| local normal_damage_string = | | local normal_damage_string = |
| normal_damage >= combat.cap | | normal_damage >= combat.cap |
Line 104: |
Line 104: |
| local equip = equipment[type_code][equip_setup] | | local equip = equipment[type_code][equip_setup] |
| spotting = spotting or 1 | | spotting = spotting or 1 |
− | local equip_damage_pre = combat:damage(damage_type_fn(combat, Ship:new(ship_, equip, night_attack))) | + | local equip_damage_pre = combat:damage(damage_type_fn(combat, Combat.ship(ship_, equip, night_attack))) |
− | local equip_damage = combat:damage(damage_type_fn(combat, Ship:new(ship_, equip, night_attack, spotting))) | + | local equip_damage = combat:damage(damage_type_fn(combat, Combat.ship(ship_, equip, night_attack, spotting))) |
| local equip_damage_string = | | local equip_damage_string = |
| equip_damage_pre >= combat.cap | | equip_damage_pre >= combat.cap |