Line 151: |
Line 151: |
| | | |
| -- * CI rate formula. | | -- * CI rate formula. |
| + | |
| + | -- old formula |
| + | function cut_in_rate(luck) |
| + | if luck <= 50 then |
| + | return math.floor(0.85 * luck) |
| + | else |
| + | return math.floor(0.85 * 50 + math.sqrt(luck - 50)) |
| + | end |
| + | end |
| | | |
| -- * Tables. | | -- * Tables. |
Line 169: |
Line 178: |
| !${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, ±?% depending on modifiers">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, ±?% depending on modifiers">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 (from each)">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="minumal and maximal (all bonuses) cut-in rate">Cut-in Rate</span> | + | !<span title="Cut-in rate (only luck dependent part, no bonuses)">Cut-In Rate</span> |
| ${rows}|}]], | | ${rows}|}]], |
| | | |
Line 206: |
Line 215: |
| luck_minus_cap = | | luck_minus_cap = |
| 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">50</span>' | + | .. '−<span title="Luck cap">50</span>' |
| } | | } |
| end | | end |
Line 230: |
Line 239: |
| 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 = "", | + | nb_ci_rate = cut_in_rate(ship_table._luck) .. "%", |
| } | | } |
| else | | else |