Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 1486 Add option to skip firing turn for mechs/vees that sprint #6062

Merged
merged 1 commit into from
Oct 5, 2024
+10 −0
Merged

Issue 1486 Add option to skip firing turn for mechs/vees that sprint #6062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions megamek/src/megamek/common/Entity.java
View file
Open in desktop
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