Line 59: |
Line 59: |
| { torpedo = 12, rank = 10, k = 1 }, | | { torpedo = 12, rank = 10, k = 1 }, |
| }, | | }, |
− | mixed = { | + | }, |
| + | FBB = { |
| + | main = { |
| + | { firepower = 17, rank = 10, k = 1.5 }, |
| + | { firepower = 17, rank = 10, k = 1.5 }, |
| + | { firepower = 8, rank = 10, k = 1 }, |
| + | }, |
| + | torpedo = { |
| + | { torpedo = 12, rank = 10, k = 1 }, |
| + | { torpedo = 12, rank = 10, k = 1 }, |
| + | { torpedo = 12, rank = 10, k = 1 }, |
| + | { torpedo = 12, rank = 10, k = 1 }, |
| + | }, |
| + | main_ci = { |
| + | { firepower = 17, rank = 10, k = 1.5 }, |
| + | { firepower = 17, rank = 10, k = 1.5 }, |
| + | { firepower = 17, rank = 10, k = 1.5 }, |
| + | { firepower = 8, rank = 10, k = 1 }, |
| + | }, |
| + | }, |
| + | BB = { |
| + | main = { |
| + | { firepower = 22, rank = 10, k = 1.5 }, |
| + | { firepower = 22, rank = 10, k = 1.5 }, |
| + | { firepower = 8, rank = 10, k = 1 }, |
| + | }, |
| + | main_ci = { |
| + | { firepower = 22, rank = 10, k = 1.5 }, |
| + | { firepower = 22, rank = 10, k = 1.5 }, |
| + | { firepower = 22, rank = 10, k = 1.5 }, |
| + | { firepower = 8, rank = 10, k = 1 }, |
| }, | | }, |
| }, | | }, |
Line 70: |
Line 100: |
| CA = "CA", | | CA = "CA", |
| CAV = "CA", | | CAV = "CA", |
− | FBB = "BB", | + | FBB = "FBB", |
| BB = "BB", | | BB = "BB", |
| BBV = "BB", | | BBV = "BB", |
Line 85: |
Line 115: |
| FBB = "main", | | FBB = "main", |
| BB = "main", | | BB = "main", |
− | CAV = "main_aviation", | + | CAV = "main", |
− | BBV = "main_aviation", | + | BBV = "main", |
| CVL = "carrier", | | CVL = "carrier", |
| CV = "carrier", | | CV = "carrier", |
Line 194: |
Line 224: |
| spotting = Combat.modifier.spotting.double, | | spotting = Combat.modifier.spotting.double, |
| note = "double attack", | | note = "double attack", |
| + | }, |
| + | Bismarck = { |
| + | spotting = Combat.modifier.spotting.double, |
| + | note = "double attack", |
| + | nb_ci = Combat.modifier.night_attack.cut_in.torpedo, |
| + | nb_ci_equip = "torpedo", |
| + | }, |
| + | FBB = { |
| + | spotting = Combat.modifier.spotting.double, |
| + | note = "double attack", |
| + | nb_ci = Combat.modifier.night_attack.cut_in.main, |
| + | nb_ci_equip = "main_ci", |
| + | }, |
| + | BB = { |
| + | spotting = Combat.modifier.spotting.double, |
| + | note = "double attack", |
| + | nb_ci = Combat.modifier.night_attack.cut_in.main, |
| + | nb_ci_equip = "main_ci", |
| }, | | }, |
| } | | } |
Line 237: |
Line 285: |
| 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] |
| + | |
| return format{ | | return format{ |
| template, | | template, |
Line 246: |
Line 295: |
| torp = ship._torpedo_max, | | torp = ship._torpedo_max, |
| 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, attacks[type_code].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 = 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, "torpedo", 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), |
| 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 = format{ | | nb_ci_rate = format{ |