Condensed rubble and rough if statements

MegaMek · Feb 16, 2023 · 7ca5b59 · 7ca5b59
1 parent 0781768
commit 7ca5b59
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/megamek/src/megamek/common/Terrain.java b/megamek/src/megamek/common/Terrain.java
@@ -383,17 +383,16 @@ public int movementCost(Entity e) {
                 }
                 return 0;
             case Terrains.RUBBLE:
+                boolean allowRubbleHoverTracked = ((moveMode == EntityMovementMode.HOVER) || (moveMode == EntityMovementMode.TRACKED)) && (level == 6);
+
                 if (level == 6) {
                     mp = 2;
                 } else {
                     mp = 1;
                 }
 
                 if (isCrossCountry && e.isGround() && e.isCombatVehicle()) {
-                    if (((moveMode == EntityMovementMode.HOVER) || (moveMode == EntityMovementMode.TRACKED))
-                            && (level == 6)) {
-                        mp *= 2;
-                    } else if ((moveMode == EntityMovementMode.WHEELED)) {
+                    if (allowRubbleHoverTracked || (moveMode == EntityMovementMode.WHEELED)) {
                         mp *= 2;
                     }
                 }
@@ -521,17 +520,16 @@ public int movementCost(Entity e) {
                 }
                 return Math.max(0, mp);
             case Terrains.ROUGH:
+                boolean allowRoughHoverTracked = ((moveMode == EntityMovementMode.HOVER) || (moveMode == EntityMovementMode.TRACKED)) && (level == 2);
+
                 if (level == 2) {
                     mp = 2;
                 } else {
                     mp = 1;
                 }
 
                 if (isCrossCountry && e.isGround() && e.isCombatVehicle()) {
-                    if (((moveMode == EntityMovementMode.HOVER) || (moveMode == EntityMovementMode.TRACKED))
-                            && (level == 2)) {
-                        mp *= 2;
-                    } else if ((moveMode == EntityMovementMode.WHEELED)) {
+                    if ( allowRoughHoverTracked || (moveMode == EntityMovementMode.WHEELED)) {
                         mp *= 2;
                     }
                 }