Merge pull request #6016 from MegaMek/quadvee-damage-mp-reduction

Quadvee damage mp reduction
MegaMek · Sep 21, 2024 · c6b71cf · c6b71cf
2 parents 418a656 + 0eeace3
commit c6b71cf
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/megamek/src/megamek/common/QuadVee.java b/megamek/src/megamek/common/QuadVee.java
@@ -103,7 +103,7 @@ public String getMotiveTypeString() {
     }
 
     public static int getMotiveTypeForString(String inType) {
-        if ((inType == null) || (inType.length() < 1)) {
+        if ((inType == null) || (inType.isEmpty())) {
             return MOTIVE_UNKNOWN;
         }
         for (int x = 0; x < MOTIVE_STRING.length; x++) {
@@ -161,9 +161,8 @@ public int getCruiseMP(MPCalculationSetting mpCalculationSetting) {
             mp++;
         }
 
-        // If a leg or its track/wheel is destroyed, it is treated as major motive system damage,
-        // which we are interpreting as a cumulative 1/2 MP.
-        // bg.battletech.com/forums/index.php?topic=55261.msg1271935#msg1271935
+        // If a leg or its track/wheel is destroyed, it reduces movement by a cumulative -1/4 mp per leg.
+        // https://bg.battletech.com/forums/index.php?topic=63281.msg1469243#msg1469243
         int badTracks = 0;
         for (int loc = 0; loc < locations(); loc++) {
             if (locationIsLeg(loc) && (isLocationBad(loc) || getCritical(loc, 5).isHit())) {
@@ -173,8 +172,8 @@ public int getCruiseMP(MPCalculationSetting mpCalculationSetting) {
 
         if (badTracks == 4) {
             return 0;
-        } else if (badTracks > 1) {
-            mp = mp / (1 << badTracks);
+        } else if (badTracks > 0) {
+            mp -= mp * badTracks / 4;
         }
 
         if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
@@ -276,14 +275,11 @@ public MPBoosters getArmedMPBoosters() {
             return  mpBoosters;
         }
 
-        switch (mpBoosters) {
-            case MASC_AND_SUPERCHARGER:
-                return MPBoosters.SUPERCHARGER_ONLY;
-            case MASC_ONLY:
-                return MPBoosters.NONE;
-            default:
-                return mpBoosters;
-        }
+        return switch (mpBoosters) {
+            case MASC_AND_SUPERCHARGER -> MPBoosters.SUPERCHARGER_ONLY;
+            case MASC_ONLY -> MPBoosters.NONE;
+            default -> mpBoosters;
+        };
     }
 
     /**