Merge pull request #6062 from DM0000/DM-1486

Issue 1486 Add option to skip firing turn for mechs/vees that sprint
MegaMek · Oct 5, 2024 · d80c42a · d80c42a
2 parents c698909 + ef8b224
commit d80c42a
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -84,6 +84,8 @@
 import megamek.logging.MMLogger;
 import megamek.utilities.xml.MMXMLUtility;
 
+import static megamek.common.EquipmentTypeLookup.TSM;
+
 /**
  * Entity is a master class for basically anything on the board except terrain.
  */
@@ -9929,6 +9931,14 @@ public boolean isEligibleForFiring() {
  return false;
  }
 
+ if (moved == EntityMovementType.MOVE_SPRINT
+ || moved == EntityMovementType.MOVE_VTOL_SPRINT) {
+ if(isMek()) {
+ return getMisc().stream().anyMatch(m -> m.getType().hasFlag(MiscType.F_TSM));
+ }
+ return false;
+ }
+
  // if you're offboard, no shooting
  if (isOffBoard() || isAssaultDropInProgress()) {
  return false;