Merge pull request #4956 from MegaMek/beast_mounted_bv

Use foot/jump type modifier for beast-mounted infantry BV
MegaMek · Dec 14, 2023 · 76fc572 · 76fc572
2 parents adf390c + ea37c8e
commit 76fc572
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/megamek/src/megamek/common/battlevalue/InfantryBVCalculator.java b/megamek/src/megamek/common/battlevalue/InfantryBVCalculator.java
@@ -137,21 +137,23 @@ protected void processSummarize() {
 
         List<String> modifierList = new ArrayList<>();
         double typeModifier = 1;
-        switch (infantry.getMovementMode()) {
-            case INF_MOTORIZED:
-            case WHEELED:
-                typeModifier = 0.8;
-                break;
-            case TRACKED:
-                typeModifier = 0.9;
-                break;
-            case HOVER:
-            case VTOL:
-                typeModifier = 0.7;
-                break;
-            case SUBMARINE:
-                typeModifier = 0.6;
-                break;
+        if (infantry.getMount() == null) {
+            switch (infantry.getMovementMode()) {
+                case INF_MOTORIZED:
+                case WHEELED:
+                    typeModifier = 0.8;
+                    break;
+                case TRACKED:
+                    typeModifier = 0.9;
+                    break;
+                case HOVER:
+                case VTOL:
+                    typeModifier = 0.7;
+                    break;
+                case SUBMARINE:
+                    typeModifier = 0.6;
+                    break;
+            }
         }
 
         if (infantry.hasSpecialization(Infantry.COMBAT_ENGINEERS)) {