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 1437: Check for stacking for elevation 0 Aeros during deployment #6269

Merged
merged 1 commit into from
Dec 15, 2024
Merged

Issue 1437: Check for stacking for elevation 0 Aeros during deployment #6269

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
5 changes: 3 additions & 2 deletions megamek/src/megamek/common/Compute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import megamek.common.annotations.Nullable;
import megamek.common.enums.AimingMode;
import megamek.common.enums.BasementType;
import megamek.common.enums.GamePhase;
import megamek.common.equipment.AmmoMounted;
import megamek.common.equipment.WeaponMounted;
import megamek.common.options.OptionsConstants;
Expand Down Expand Up @@ -419,8 +420,8 @@ public static Entity stackingViolation(Game game, Entity entering,
return null;
}

// no stacking violations for flying aeros
if (entering.isAirborne()) {
// no stacking violations for flying aeros, except during deployment - no crushing units during deployment!
if (entering.isAirborne() && !((game.getPhase().equals(GamePhase.DEPLOYMENT) && elevation == 0))) {
return null;
}

Expand Down
Loading