Merge pull request #4890 from MegaMek/artillery_target_disengaged

Handle artillery strike against offboard unit that has disengaged.
MegaMek · Nov 15, 2023 · 61330da · 61330da
2 parents c3187bf + 2cf4e21
commit 61330da
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/megamek/i18n/megamek/common/report-messages.properties b/megamek/i18n/megamek/common/report-messages.properties
@@ -302,6 +302,7 @@
 3145=, the shot is an automatic hit (<data>), 
 3150=\ needs <data>, 
 3155=rolls <data> : 
+3158=<data> lands, but the offboard target is gone.
 3160=<font color='C00000'>THE AUTOCANNON JAMS</font>; 
 3161=<font color='C00000'>THE DAMN THING JAMS</font>; 
 3162=<font color='C00000'>THE DAMN THING EXPLODES</font>;

diff --git a/megamek/src/megamek/common/weapons/ArtilleryBayWeaponIndirectFireHandler.java b/megamek/src/megamek/common/weapons/ArtilleryBayWeaponIndirectFireHandler.java
@@ -136,6 +136,15 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
             aaa.decrementTurnsTilHit();
             return true;
         }
+        // Offboard shots are targeted at an entity rather than a hex. If null, the target has disengaged.
+        if (target == null) {
+            Report r = new Report(3158);
+            r.indent();
+            r.subject = subjectId;
+            r.add(wtype.getName());
+            vPhaseReport.add(r);
+            return true;
+        }
         final Vector<Integer> spottersBefore = aaa.getSpotterIds();
         Coords targetPos = target.getPosition();
         final int playerId = aaa.getPlayerId();

diff --git a/megamek/src/megamek/common/weapons/ArtilleryWeaponIndirectFireHandler.java b/megamek/src/megamek/common/weapons/ArtilleryWeaponIndirectFireHandler.java
@@ -102,6 +102,15 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
             return true;
         }
 
+        // Offboard shots are targeted at an entity rather than a hex. If null, the target has disengaged.
+        if (target == null) {
+            Report r = new Report(3158);
+            r.indent();
+            r.subject = subjectId;
+            r.add(wtype.getName());
+            vPhaseReport.add(r);
+            return true;
+        }
         final Vector<Integer> spottersBefore = aaa.getSpotterIds();
 
         Coords targetPos = target.getPosition();