Line 184: |
Line 184: |
| !${fp} | | !${fp} |
| !${torp} | | !${torp} |
− | !<span title="Normal attack damage, all modifiers = 1, ±?% depending on modifiers">Attack</span> | + | !<span title="Normal attack damage, all modifiers = 1, see notes">Attack</span> |
− | !<span title="Normal torpedo salvo damage, all modifiers = 1, ±?% depending on modifiers">Torpedo</span> | + | !<span title="Normal torpedo salvo damage, all modifiers = 1, see notes">Torpedo</span> |
| !${fp_plus_torp} | | !${fp_plus_torp} |
− | !<span title="Maximal damage from double attack (from each)">Double Attack</span> | + | !<span title="Maximal damage from double attack (combined)">Double Attack</span> |
| !<span title="Maximal damage from cut-in">Cut-In</span> | | !<span title="Maximal damage from cut-in">Cut-In</span> |
| !${luck_minus_cap} | | !${luck_minus_cap} |
− | !<span title="Torpedo cut-in rate (only luck dependent part, no bonuses)">Cut-In Rate</span> | + | !<span title="Torpedo/mixed cut-in rate, gun cut-in rate (only luck dependent part, no bonuses)">Cut-In Rates</span> |
| ${rows}|}]], | | ${rows}|}]], |
| | | |
Line 220: |
Line 220: |
| Formatting:format_image{StatIcons.torpedo, caption = Formatting:format_stat_name("torpedo")}, | | Formatting:format_image{StatIcons.torpedo, caption = Formatting:format_stat_name("torpedo")}, |
| luck_minus_cap = | | luck_minus_cap = |
| + | '<span title="Luck cap">60</span>−' .. |
| Formatting:format_image{StatIcons.luck, caption = Formatting:format_stat_name("luck")} | | Formatting:format_image{StatIcons.luck, caption = Formatting:format_stat_name("luck")} |
− | .. '−<span title="Luck cap">60</span>'
| |
| } | | } |
| end | | end |
| + | |
| + | local modifiers = default_modifiers(false) |
| | | |
| function Combat.table_dd_row(frame) | | function Combat.table_dd_row(frame) |
Line 233: |
Line 235: |
| | | |
| if rank and name and ship_table and ship_table._type then | | if rank and name and ship_table and ship_table._type then |
− | local luck_diff = ship_table._luck - 60 | + | local luck_diff = 60 - ship_table._luck |
| return format{ | | return format{ |
| table_templates.table_dd_row, | | table_templates.table_dd_row, |
Line 240: |
Line 242: |
| 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 = "", | + | db_attack = damage(shelling_attack_power(ship_table._firepower_max, 0, modifiers), modifiers), |
| db_torp = "", | | db_torp = "", |
| nb_da = "", | | nb_da = "", |
| nb_ci = "", | | nb_ci = "", |
| luck_minus_cap = luck_diff < 0 and "−" .. -luck_diff or luck_diff, | | luck_minus_cap = luck_diff < 0 and "−" .. -luck_diff or luck_diff, |
− | nb_ci_rate = cut_in_rate(ship_table._luck, cut_in_types.torpedo) .. "%", | + | nb_ci_rate = |
| + | cut_in_rate(ship_table._luck, cut_in_types.torpedo) .. "%, " .. |
| + | cut_in_rate(ship_table._luck, cut_in_types.main) .. "%", |
| } | | } |
| else | | else |