Line 185: |
Line 185: |
| !${fp} | | !${fp} |
| !${torp} | | !${torp} |
− | !<span title="Hit damage: without equipment, ${db_attack_note} with maxed equipment (all other modifiers = 1, see notes)">Hit</span> | + | !<span title="Double attack damage (* 1.5 for critical hit)">DA</span> |
− | !<span title="Torpedo salvo damage: without torpedo equipment, with maxed torpedo equipment (all other modifiers = 1, see notes)">Salvo</span> | + | !<span title="Torpedo salvo damage: without and with torpedo equipment (* 1.5 for critical hit)">Salvo</span> |
| !${fp_plus_torp} | | !${fp_plus_torp} |
− | !<span title="Maximal damage from double attack (each, multiple by 1.5 for critical hit)">DA</span> | + | !<span title="Maximal damage from double attack (* 1.5 for critical hit)">DA</span> |
− | !<span title="Maximal damage from cut-in (multiple by 2, multiple by 1.5 for critical hit)">CI</span> | + | !<span title="Maximal damage from torpedo cut-in (* 1.5 for critical hit)">CI</span> |
| !${luck_minus_cap} | | !${luck_minus_cap} |
− | !<span title="Torpedo/mixed cut-in rate, gun cut-in rate (only luck dependent part, no bonuses)">CI%</span> | + | !<span title="Torpedo and mixed cut-in rate (only luck dependent part, no bonuses)">CI%</span> |
| !${hp} | | !${hp} |
| !${armor} | | !${armor} |
− | !${evasion} | + | !<span title="Evasion rate at lvl 80, with normal and high morale (only level dependent part)">${evasion}</span> |
| ${rows}|}]], | | ${rows}|}]], |
| | | |
Line 266: |
Line 266: |
| | | |
| local name, suffix = Ship:process_ship_key(ship_key) | | local name, suffix = Ship:process_ship_key(ship_key) |
− | local ship = Ship:get_table(name, suffix) -- Ship(ship_key){ _level = 80 } | + | local ship = Ship(ship_key){ _level = 80 } |
| | | |
| if rank and name and ship and ship._type then | | if rank and name and ship and ship._type then |
Line 292: |
Line 292: |
| hp = ship._hp, | | hp = ship._hp, |
| armor = ship._armor_max, | | armor = ship._armor_max, |
− | evasion_rate = Combat.evasion_rate(ship) .. "%", | + | evasion_rate = |
| + | string.format("%s%%, %s%%", |
| + | Combat.evasion_rate(ship), |
| + | Combat.evasion_rate(ship, true)), |
| } | | } |
| else | | else |