Changes

no edit summary
Line 123: Line 123:  
! colspan="4" |Day Battle
 
! colspan="4" |Day Battle
 
! colspan="5" |Night Battle
 
! colspan="5" |Night Battle
 +
! colspan="3" |Defence
 
|-
 
|-
 
!style="width:60px;"|Rank
 
!style="width:60px;"|Rank
Line 128: Line 129:  
!${fp}
 
!${fp}
 
!${torp}
 
!${torp}
!<span title="Damage: normal attack without equipment, ${db_attack_note} with maxed equipment (all other modifiers = 1, see notes)">Hit</span>
+
!<span title="Hit damage: without equipment, ${db_attack_note} with maxed equipment (all other modifiers = 1, see notes)">Hit</span>
!<span title="Normal torpedo salvo damage, all modifiers = 1, see notes">Salvo</span>
+
!<span title="Torpedo salvo damage: without torpedo equipment, with maxed torpedo equipment (all other modifiers = 1, see notes)">Salvo</span>
 
!${fp_plus_torp}
 
!${fp_plus_torp}
!<span title="Maximal damage from double attack (combined)">DA</span>
+
!<span title="Maximal damage from double attack (each, multiple by 1.5 for critical hit)">DA</span>
!<span title="Maximal damage from cut-in">CI</span>
+
!<span title="Maximal damage from cut-in (multiple by 2, multiple by 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/mixed cut-in rate, gun cut-in rate (only luck dependent part, no bonuses)">CI%</span>
 +
!${hp}
 +
!${armor}
 +
!${evasion}
 
${rows}|}]],
 
${rows}|}]],
   Line 158: Line 162:  
|${luck_minus_cap}
 
|${luck_minus_cap}
 
|${nb_ci_rate}
 
|${nb_ci_rate}
 +
|${hp}
 +
|${armor}
 +
|${evasion_rate}
 
]],
 
]],
   Line 208: Line 215:  
luck_minus_cap =
 
luck_minus_cap =
 
    '<span title="Luck cap">60</span>−' ..
 
    '<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")},
 +
    hp = Formatting:format_image{StatIcons.hp, caption = Formatting:format_stat_name("HP")},
 +
    armor = Formatting:format_image{StatIcons.armor, caption = Formatting:format_stat_name("Armor")},
 +
    evasion = Formatting:format_image{StatIcons.evasion, caption = Formatting:format_stat_name("Evasion rate")},
 
}
 
}
 
end
 
end
Line 245: Line 255:  
torpedo = Combat.nb_cut_in_rate(ship, Combat.nb_cut_in_types.torpedo),
 
torpedo = Combat.nb_cut_in_rate(ship, Combat.nb_cut_in_types.torpedo),
 
main = Combat.nb_cut_in_rate(ship, Combat.nb_cut_in_types.main)},
 
main = Combat.nb_cut_in_rate(ship, Combat.nb_cut_in_types.main)},
 +
hp = ship._hp,
 +
        armor = ship._armor_max,
 +
        evasion_rate = Combat.evasion_rate(ship) .. "%",
 
}
 
}
 
else
 
else
cssedit, gkautomate
6,926

edits