Skip to content

Commit

Permalink
added check for sprint and TSM in isEligibleForFiring
Browse files Browse the repository at this point in the history
  • Loading branch information
DM0000 committed Oct 4, 2024
1 parent a53044e commit ef8b224
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions megamek/src/megamek/common/Entity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit ef8b224

Please sign in to comment.