Merge pull request #4070 from SJuliez/AS_corrections_4

AS conversion: Allow 0" movement for CI
MegaMek · Dec 26, 2022 · 8206fed · 8206fed
2 parents 838fecc + 7d6fed7
commit 8206fed
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASMovementConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASMovementConverter.java
@@ -142,14 +142,12 @@ private static Map<String, Integer> convertMovementForInfantry(ASConverter.Conve
             jumpingMP = ((BattleArmor)entity).getJumpMP(true, true, true);
         }
 
-        // ensure a minimum base movement of 2"
-        walkingMP = Math.max(walkingMP, 1);
         report.addLine("Walking MP:", Integer.toString(walkingMP));
         report.addLine("Jumping MP:", Integer.toString(jumpingMP));
         String movementCode = getMovementCode(conversionData);
         element.setPrimaryMovementMode(movementCode);
 
-        if (walkingMP > jumpingMP) {
+        if ((walkingMP > jumpingMP) || (jumpingMP == 0)) {
             result.put(movementCode, walkingMP * 2);
             report.addLine("Walking MP > Jumping MP", walkingMP + " x 2", walkingMP * 2 + "\"" + movementCode);
         } else {