Merge pull request #4186 from SJuliez/AS_Conversion_Brawler

AS Conversion: Brawler discount not for transportable CI/BA
MegaMek · Feb 17, 2023 · b4b2ec6 · b4b2ec6
2 parents bf68720 + 60ba122
commit b4b2ec6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASPointValueConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASPointValueConverter.java
@@ -437,7 +437,8 @@ private double brawlerMalus() {
         double multiplier = 0;
         if (move >= 2 && !element.hasAnySUAOf(BT, ARTS, C3BSM, C3BSS, C3EM,
                 C3I, C3M, C3S, AC3, NC3, NOVA, C3RS, ECM, AECM, ARTAC, ARTAIS, ARTBA, ARTCM12, ARTCM5, ARTCM7,
-                ARTCM9, ARTLT, ARTLTC, ARTSC, ARTT, ARTTC)) {
+                ARTCM9, ARTLT, ARTLTC, ARTSC, ARTT, ARTTC, MEC, XMEC)
+                && !(element.hasSUA(CAR) && (element.getCAR() <= 8))) {
             double dmgS = pointValueSDamage(element);
             double dmgM = pointValueMDamage(element);
             double dmgL = pointValueLDamage(element);