Merge pull request #6161 from SJuliez/no-ams-on-mortars

#5985: Prevent AMS targeting mortar shells
MegaMek · Nov 2, 2024 · ab4bb56 · ab4bb56
2 parents a0d2147 + 937879d
commit ab4bb56
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 27 deletions.
diff --git a/megamek/src/megamek/server/totalwarfare/TWGameManager.java b/megamek/src/megamek/server/totalwarfare/TWGameManager.java
@@ -9666,19 +9666,16 @@ public void assignAMS() {
             WeaponHandler wh = (WeaponHandler) ah;
             WeaponAttackAction waa = wh.waa;
 
-            // for artillery attacks, the attacking entity
-            // might no longer be in the game.
-            // TODO : Yeah, I know there's an exploit here, but better able to shoot some
-            // ArrowIVs than none, right?
+            // for artillery attacks, the attacking entity might no longer be in the game.
+            // TODO : Yeah, I know there's an exploit here, but better able to shoot some ArrowIVs than none, right?
             if (game.getEntity(waa.getEntityId()) == null) {
                 logger.info("Can't Assign AMS: Artillery firer is null!");
                 continue;
             }
 
             Mounted<?> weapon = game.getEntity(waa.getEntityId()).getEquipment(waa.getWeaponId());
 
-            // Only entities can have AMS. Arrow IV doesn't target an entity until later, so
-            // we have to ignore them
+            // Only entities can have AMS. Arrow IV doesn't target an entity until later, so we have to ignore them
             if (!(waa instanceof ArtilleryAttackAction) && (Targetable.TYPE_ENTITY != waa.getTargetType())) {
                 continue;
             }
@@ -9688,9 +9685,7 @@ public void assignAMS() {
                 continue;
             }
 
-            // Can only use AMS versus missiles. Artillery Bays might be firing Arrow IV
-            // homing missiles,
-            // but lack the flag
+            // Can only use AMS versus missiles. Artillery Bays might be firing Arrow IV homing missiles, but lack the flag
             boolean isHomingMissile = false;
             if (wh instanceof ArtilleryWeaponIndirectHomingHandler
                     || wh instanceof ArtilleryBayWeaponIndirectHomingHandler) {
@@ -9701,7 +9696,8 @@ public void assignAMS() {
                     isHomingMissile = true;
                 }
             }
-            if (!weapon.getType().hasFlag(WeaponType.F_MISSILE) && !isHomingMissile) {
+            if ((!weapon.getType().hasFlag(WeaponType.F_MISSILE) && !isHomingMissile)
+                || weapon.getType().hasFlag(WeaponType.F_MEK_MORTAR)) {
                 continue;
             }
 
@@ -9797,32 +9793,27 @@ private WeaponAttackAction manuallyAssignAPDSTarget(WeaponMounted apds,
         // Create a list of valid assignments for this APDS
         List<WeaponAttackAction> vAttacksInArc = new ArrayList<>(vAttacks.size());
         for (WeaponHandler wr : vAttacks) {
-            boolean isInArc = Compute.isInArc(e.getGame(), e.getId(),
-                    e.getEquipmentNum(apds),
-                    game.getEntity(wr.waa.getEntityId()));
-            boolean isInRange = e.getPosition().distance(
-                    wr.getWaa().getTarget(game).getPosition()) <= 3;
+            boolean isInArc = Compute.isInArc(e.getGame(), e.getId(), e.getEquipmentNum(apds), game.getEntity(wr.waa.getEntityId()));
+            boolean isInRange = e.getPosition().distance(wr.getWaa().getTarget(game).getPosition()) <= 3;
             if (isInArc && isInRange) {
                 vAttacksInArc.add(wr.waa);
             }
         }
 
         // If there are no valid attacks left, don't bother
-        if (vAttacksInArc.size() < 1) {
+        if (vAttacksInArc.isEmpty()) {
             return null;
         }
 
         WeaponAttackAction targetedWAA = null;
 
         if (apds.curMode().equals("Automatic")) {
-            targetedWAA = Compute.getHighestExpectedDamage(game,
-                    vAttacksInArc, true);
+            targetedWAA = Compute.getHighestExpectedDamage(game, vAttacksInArc, true);
         } else {
             // Send a client feedback request
             List<Integer> apdsDists = new ArrayList<>();
             for (WeaponAttackAction waa : vAttacksInArc) {
-                apdsDists.add(waa.getTarget(game).getPosition()
-                        .distance(e.getPosition()));
+                apdsDists.add(waa.getTarget(game).getPosition().distance(e.getPosition()));
             }
             sendAPDSAssignCFR(e, apdsDists, vAttacksInArc);
             synchronized (cfrPacketQueue) {
@@ -9865,9 +9856,7 @@ private WeaponAttackAction manuallyAssignAPDSTarget(WeaponMounted apds,
      * @param vAttacks
      *                 List of missile attacks directed at e
      */
-    private void manuallyAssignAMSTarget(Entity e,
-            Vector<WeaponHandler> vAttacks) {
-        // Fix for bug #1051 - don't send the targeting nag for a shutdown unit
+    private void manuallyAssignAMSTarget(Entity e, Vector<WeaponHandler> vAttacks) {
         if (e.isShutDown()) {
             return;
         }
@@ -9883,15 +9872,13 @@ private void manuallyAssignAMSTarget(Entity e,
             List<WeaponAttackAction> vAttacksInArc = new ArrayList<>(vAttacks.size());
             for (WeaponHandler wr : vAttacks) {
                 if (!amsTargets.contains(wr.waa)
-                        && Compute.isInArc(game, e.getId(),
-                                e.getEquipmentNum(ams),
-                                game.getEntity(wr.waa.getEntityId()))) {
+                        && Compute.isInArc(game, e.getId(), e.getEquipmentNum(ams), game.getEntity(wr.waa.getEntityId()))) {
                     vAttacksInArc.add(wr.waa);
                 }
             }
 
             // If there are no valid attacks left, don't bother
-            if (vAttacksInArc.size() < 1) {
+            if (vAttacksInArc.isEmpty()) {
                 continue;
             }
 

diff --git a/megamek/testresources/data/scenarios/test_setups/ams_mortar.mms b/megamek/testresources/data/scenarios/test_setups/ams_mortar.mms
@@ -0,0 +1,24 @@
+MMSVersion: 2
+name: AMS vs Mortars
+planet: None
+description: AMS may not engage mortars - test setup
+map: Beginner Box/16x17 Grassland 1.board
+
+options:
+  #off:
+   # - auto_ams
+
+factions:
+  - name: Test Player
+
+    units:
+      #AMS
+      - fullname: Atlas AS7-K
+        at: [ 9, 7 ]
+        facing: 3
+      #Mortar and SRM
+      - fullname: Minsk 2
+        at: [ 9, 14 ]
+        crew:
+          gunnery: 0
+