Merge pull request #6176 from DM0000/LAMHitLocation

LAM in fighter mode uses wrong hit location table #6144
MegaMek · Nov 5, 2024 · 66cc11f · 66cc11f
2 parents 57ada27 + 3a7d53c
commit 66cc11f
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/megamek/src/megamek/common/LandAirMek.java b/megamek/src/megamek/common/LandAirMek.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.Vector;
 
+import megamek.common.enums.AimingMode;
 import megamek.common.enums.MPBoosters;
 import megamek.common.equipment.AmmoMounted;
 import megamek.common.equipment.BombMounted;
@@ -1498,12 +1499,23 @@ public int getWeaponArc(int wn) {
     /**
      * Hit location table for fighter mode
      */
+    @Override
+    public HitData rollHitLocation(int table, int side, int aimedLocation, AimingMode aimingMode,
+            int cover) {
+                if (getConversionMode() != CONV_MODE_FIGHTER) {
+                    return super.rollHitLocation( table, side, aimedLocation, aimingMode,
+                    cover);
+                }
+        return rollHitLocation(table, side);
+    }
+
     @Override
     public HitData rollHitLocation(int table, int side) {
         if (getConversionMode() != CONV_MODE_FIGHTER) {
             return super.rollHitLocation(table, side);
         }
 
+
         int roll = Compute.d6(2);
 
         // first check for above/below