From 3a70f24573897629b6ae1984934bdd80722b6f71 Mon Sep 17 00:00:00 2001 From: cwspain Date: Thu, 16 Nov 2023 13:39:41 -0600 Subject: [PATCH 1/2] Set step size of BA cargo lifter. --- megamek/src/megamek/common/MiscType.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/megamek/src/megamek/common/MiscType.java b/megamek/src/megamek/common/MiscType.java index 07ca94d7722..94c85d26a76 100644 --- a/megamek/src/megamek/common/MiscType.java +++ b/megamek/src/megamek/common/MiscType.java @@ -455,10 +455,9 @@ public boolean isVariableSize() { @Override public Double variableStepSize() { - if (hasFlag(F_CARGO) || hasFlag(F_LIQUID_CARGO)) { + if (hasFlag(F_CARGO) || hasFlag(F_LIQUID_CARGO) || hasFlag(F_CARGOLIFTER)) { return 0.5; - } - if (hasFlag(F_LADDER)) { + } else if (hasFlag(F_LADDER)) { return 20.0; } return super.variableStepSize(); From af59bf79962837e05dcd405f5c5361ac5f56e287 Mon Sep 17 00:00:00 2001 From: cwspain Date: Thu, 16 Nov 2023 15:06:58 -0600 Subject: [PATCH 2/2] Cleanup TestBattleArmor.BAManipulator --- .../src/megamek/common/verifier/TestBattleArmor.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/megamek/src/megamek/common/verifier/TestBattleArmor.java b/megamek/src/megamek/common/verifier/TestBattleArmor.java index b611b442e88..b1add802f8f 100644 --- a/megamek/src/megamek/common/verifier/TestBattleArmor.java +++ b/megamek/src/megamek/common/verifier/TestBattleArmor.java @@ -188,19 +188,19 @@ public enum BAManipulator { * The type, corresponding to types defined in * EquipmentType. */ - public int type; + public final int type; /** * The name of this manipulator */ - public String internalName; + public final String internalName; - public String displayName; + public final String displayName; /** * Denotes whether this armor is Clan or not. */ - public boolean pairMounted; + public final boolean pairMounted; BAManipulator(int t, boolean p) { type = t; @@ -209,10 +209,6 @@ public enum BAManipulator { pairMounted = p; } - public static int getNumBAArmors() { - return values().length; - } - /** * Given an manipulator internal name, return the * BAManipulator instance that represents that internal