Line 184: |
Line 184: |
| !${fp} | | !${fp} |
| !${torp} | | !${torp} |
− | !<span title="Normal attack damage, all modifiers = 1, see notes">Attack</span> | + | !<span title="Normal attack damage: without equipment, with 2x maxed guns; all modifiers = 1, see notes">Attack</span> |
| !<span title="Normal torpedo salvo damage, all modifiers = 1, see notes">Torpedo</span> | | !<span title="Normal torpedo salvo damage, all modifiers = 1, see notes">Torpedo</span> |
| !${fp_plus_torp} | | !${fp_plus_torp} |
Line 226: |
Line 226: |
| | | |
| local modifiers = default_modifiers(false) | | local modifiers = default_modifiers(false) |
| + | |
| + | function get_db_attack_string(fp, t) |
| + | local equip_fp = { |
| + | dd = 2 * 3 + math.floor(2 * math.sqrt(10)) |
| + | } |
| + | return |
| + | damage(shelling_attack_power(ship_table._firepower_max, 0, modifiers), modifiers) |
| + | .. ", " .. |
| + | damage(shelling_attack_power(ship_table._firepower_max, equip_fp[t], modifiers), modifiers) |
| + | end |
| | | |
| function Combat.table_dd_row(frame) | | function Combat.table_dd_row(frame) |
Line 242: |
Line 252: |
| torp = ship_table._torpedo_max, | | torp = ship_table._torpedo_max, |
| fp_plus_torp = ship_table._firepower_max + ship_table._torpedo_max, | | fp_plus_torp = ship_table._firepower_max + ship_table._torpedo_max, |
− | db_attack = damage(shelling_attack_power(ship_table._firepower_max, 0, modifiers), modifiers), | + | db_attack = get_db_attack_string(ship_table._firepower_max, "dd"), |
| db_torp = "", | | db_torp = "", |
| nb_da = "", | | nb_da = "", |