Changes

m
no edit summary
Line 60: Line 60:  
},
 
},
 
},
 
},
FBB = {
+
Bismarck = {
 
main = {
 
main = {
 
{ firepower = 17, rank = 10, k = 1.5 },
 
{ firepower = 17, rank = 10, k = 1.5 },
Line 71: Line 71:  
{ torpedo = 12, rank = 10, k = 1 },
 
{ torpedo = 12, rank = 10, k = 1 },
 
{ torpedo = 12, rank = 10, k = 1 },
 
{ torpedo = 12, rank = 10, k = 1 },
 +
},
 +
},
 +
FBB = {
 +
main = {
 +
{ firepower = 17, rank = 10, k = 1.5 },
 +
{ firepower = 17, rank = 10, k = 1.5 },
 +
{ firepower = 8, rank = 10, k = 1 },
 
},
 
},
 
main_ci = {
 
main_ci = {
Line 254: Line 261:  
template,
 
template,
 
rows = frame.args[1] or "",
 
rows = frame.args[1] or "",
db_attack_note = attacks[type_code].note or "?",
+
db_attack_note = attacks[type_code].note,
 
fp = Formatting:format_image{StatIcons.firepower, caption = Formatting:format_stat_name("firepower")},
 
fp = Formatting:format_image{StatIcons.firepower, caption = Formatting:format_stat_name("firepower")},
 
torp = Formatting:format_image{StatIcons.torpedo, caption = Formatting:format_stat_name("torpedo")},
 
torp = Formatting:format_image{StatIcons.torpedo, caption = Formatting:format_stat_name("torpedo")},
Line 282: Line 289:     
local type_code_ = Formatting:format_ship_code(ship._type)
 
local type_code_ = Formatting:format_ship_code(ship._type)
local type_code = normalized_type_code[type_code_]
+
local type_code = name == "Bismarck" and "Bismarck" or normalized_type_code[type_code_]
 
local template = templates[type_code_to_template[type_code_] .. "_row"]
 
local template = templates[type_code_to_template[type_code_] .. "_row"]
 
local luck_diff = 60 - ship._luck
 
local luck_diff = 60 - ship._luck
         local attack = name == "Bismarrck" and attacks["Bismarrck"] or attacks[type_code]
+
         local attack = attacks[type_code]
 
          
 
          
 
return format{
 
return format{
Line 296: Line 303:  
fp_plus_torp = ship._firepower_max + (ship._torpedo_max or 0),
 
fp_plus_torp = ship._firepower_max + (ship._torpedo_max or 0),
 
db_attack = format_damage(ship, type_code, Combat.shelling, "main", nil, attack.spotting),
 
db_attack = format_damage(ship, type_code, Combat.shelling, "main", nil, attack.spotting),
db_torp = format_damage(ship, type_code, Combat.torpedo, "torpedo"),
+
db_torp =
 +
    (type_code == "BB" or type_code == "FBB")
 +
    and ""
 +
    or format_damage(ship, type_code, Combat.torpedo, "torpedo"),
 
nb_da = format_damage(ship, type_code, Combat.night_battle, "main", Combat.modifier.night_attack.double),
 
nb_da = format_damage(ship, type_code, Combat.night_battle, "main", Combat.modifier.night_attack.double),
 
nb_ci = format_damage(ship, type_code, Combat.night_battle, attack.nb_ci_equip or "torpedo", attack.nb_ci or Combat.modifier.night_attack.cut_in.torpedo),
 
nb_ci = format_damage(ship, type_code, Combat.night_battle, attack.nb_ci_equip or "torpedo", attack.nb_ci or Combat.modifier.night_attack.cut_in.torpedo),
cssedit, gkautomate
7,064

edits