From 6f4236ab02f265d009c0a3579ee2036c10e05aea Mon Sep 17 00:00:00 2001 From: Carl Spain Date: Thu, 19 Nov 2020 14:30:51 -0600 Subject: [PATCH 1/2] Fix armor factor BV for BAR armor. --- megamek/src/megamek/common/Tank.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megamek/src/megamek/common/Tank.java b/megamek/src/megamek/common/Tank.java index 65fb3372a6a..f52227cd1c5 100644 --- a/megamek/src/megamek/common/Tank.java +++ b/megamek/src/megamek/common/Tank.java @@ -1304,7 +1304,7 @@ public int calculateBattleValue(boolean ignoreC3, boolean ignorePilot) { bvText.append(startColumn); bvText.append(endColumn); bvText.append(startColumn); - double armorBV = (getArmor(loc) + modularArmor) * armorMultiplier * (getBARRating(loc) / 10); + double armorBV = (getArmor(loc) + modularArmor) * armorMultiplier * (getBARRating(loc) / 10.0); bvText.append(armorBV); dbv += armorBV; bvText.append(endColumn); From cc189a51d779214922eaafa637ca485d91a0e537 Mon Sep 17 00:00:00 2001 From: Carl Spain Date: Thu, 19 Nov 2020 14:34:23 -0600 Subject: [PATCH 2/2] Add BAR armor factor calculation for fixed wing support BV. --- megamek/src/megamek/common/Aero.java | 41 +++++++++++++++------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/megamek/src/megamek/common/Aero.java b/megamek/src/megamek/common/Aero.java index 4738133bef1..292142dadb7 100644 --- a/megamek/src/megamek/common/Aero.java +++ b/megamek/src/megamek/common/Aero.java @@ -1375,25 +1375,28 @@ public int calculateBattleValue(boolean ignoreC3, boolean ignorePilot) { // total armor points switch (getArmorType(loc)) { - case EquipmentType.T_ARMOR_COMMERCIAL: - armorMultiplier = 0.5; - break; - case EquipmentType.T_ARMOR_HARDENED: - armorMultiplier = 2.0; - break; - case EquipmentType.T_ARMOR_REACTIVE: - case EquipmentType.T_ARMOR_REFLECTIVE: - case EquipmentType.T_ARMOR_BALLISTIC_REINFORCED: - armorMultiplier = 1.5; - break; - case EquipmentType.T_ARMOR_LC_LAMELLOR_FERRO_CARBIDE: - case EquipmentType.T_ARMOR_FERRO_LAMELLOR: - case EquipmentType.T_ARMOR_ANTI_PENETRATIVE_ABLATION: - armorMultiplier = 1.2; - break; - default: - armorMultiplier = 1.0; - break; + case EquipmentType.T_ARMOR_COMMERCIAL: + armorMultiplier = 0.5; + break; + case EquipmentType.T_ARMOR_HARDENED: + armorMultiplier = 2.0; + break; + case EquipmentType.T_ARMOR_REACTIVE: + case EquipmentType.T_ARMOR_REFLECTIVE: + case EquipmentType.T_ARMOR_BALLISTIC_REINFORCED: + armorMultiplier = 1.5; + break; + case EquipmentType.T_ARMOR_LC_LAMELLOR_FERRO_CARBIDE: + case EquipmentType.T_ARMOR_FERRO_LAMELLOR: + case EquipmentType.T_ARMOR_ANTI_PENETRATIVE_ABLATION: + armorMultiplier = 1.2; + break; + default: + armorMultiplier = 1.0; + break; + } + if (hasBARArmor(loc)) { + armorMultiplier *= getBARRating(loc) / 10.0; } if (blueShield) {