Line 302: |
Line 302: |
| 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, attack.spotting), | + | db_attack = |
| + | attack |
| + | and format_damage(ship, type_code, Combat.shelling, "main", nil, attack.spotting) |
| + | or "", |
| db_torp = | | db_torp = |
− | (type_code == "BB" or type_code == "FBB") | + | (type_code == "BB" or type_code == "FBB" or type_code == "CV") |
| and "" | | and "" |
| or format_damage(ship, type_code, Combat.torpedo, "torpedo"), | | 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 = |
− | 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), | + | attack |
| + | and format_damage(ship, type_code, Combat.night_battle, "main", Combat.modifier.night_attack.double) |
| + | "", |
| + | nb_ci = |
| + | attack |
| + | and 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) |
| + | or "", |
| 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{ |