fix: Avoid penalizing Improved Heavy Lasers in weapon bays

While heavy lasers incur an accuracy penalty, this obviously isn't meant to apply to improved heavy lasers, which are improved specifically by avoiding that. The check has also been made a bit more efficient.
MegaMek · Aug 18, 2024 · 4f537c7 · 4f537c7
1 parent 0e7ec4b
commit 4f537c7
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -3835,15 +3835,14 @@ private static ToHitData compileAeroAttackerToHitMods(Game game, Entity ae, Targ
             if (ae.usesWeaponBays() && wtype != null && weapon != null) {
 
                 // any heavy lasers
-                if (wtype.getAtClass() == WeaponType.CLASS_LASER) {
-                    for (WeaponMounted bweap : weapon.getBayWeapons()) {
-                        WeaponType bwtype = bweap.getType();
-                        if ((bwtype.getInternalName().contains("Heavy"))
-                                && (bwtype.getInternalName().contains("Laser"))) {
-                            toHit.addModifier(+1, Messages.getString("WeaponAttackAction.HeavyLaserInBay"));
-                            break;
-                        }
-                    }
+                if (wtype.getAtClass() == WeaponType.CLASS_LASER &&
+                        weapon.bayWeapons.stream()
+                        .map(getEntity().getWeapon)
+                        .filter(Objects::nonNull)
+                        .map(WeaponMounted::getType)
+                        .map(WeaponType::getInternalName)
+                        .anyMatch(i -> i.startsWith("CLHeavyLaser"))) {
+                        toHit.addModifier(+1, Messages.getString("WeaponAttackAction.HeavyLaserInBay"));
                 }
                 // barracuda missiles
                 else if (wtype.getAtClass() == WeaponType.CLASS_CAPITAL_MISSILE) {