check elevation for ice-related PSR checks (underwater movement etc)

MegaMek · Nov 2, 2024 · f0774d0 · f0774d0
1 parent f19b659
commit f0774d0
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -7762,21 +7762,22 @@ public PilotingRollData checkSkid(EntityMovementType moveType, Hex prevHex,
         boolean runOrSprint = (overallMoveType == EntityMovementType.MOVE_RUN)
                 || (overallMoveType == EntityMovementType.MOVE_SPRINT);
         if ((prevHex != null)
-                && prevHex.containsTerrain(Terrains.ICE)
-                && iceCheck
-                && (prevFacing != curFacing)
-                && !lastPos.equals(curPos)) {
+            && prevHex.containsTerrain(Terrains.ICE)
+            && (currStep.getElevation() == 0)
+            && iceCheck
+            && (prevFacing != curFacing)
+            && !lastPos.equals(curPos)) {
             roll.append(new PilotingRollData(getId(), getMovementBeforeSkidPSRModifier(distance), "turning on ice"));
             adjustDifficultTerrainPSRModifier(roll);
             return roll;
         } else if ((prevHex != null)
-                && prevHex.containsTerrain(Terrains.BLACK_ICE)
-                && iceCheck
-                && (prevFacing != curFacing)
-                && !lastPos.equals(curPos)) {
+            && prevHex.containsTerrain(Terrains.BLACK_ICE)
+            && (currStep.getElevation() == 0)
+            && iceCheck
+            && (prevFacing != curFacing)
+            && !lastPos.equals(curPos)) {
             addPilotingModifierForTerrain(roll, lastPos);
-            roll.append(
-                    new PilotingRollData(getId(), getMovementBeforeSkidPSRModifier(distance), "turning on black ice"));
+            roll.append(new PilotingRollData(getId(), getMovementBeforeSkidPSRModifier(distance), "turning on black ice"));
             adjustDifficultTerrainPSRModifier(roll);
             return roll;
         } else if (prevStepPavement