Merge pull request #4976 from MegaMek/protomech-armormax

ProtoMek max armor values
MegaMek · Dec 26, 2023 · 12705e2 · 12705e2
2 parents b02b154 + 99d5f0d
commit 12705e2
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/megamek/src/megamek/common/verifier/TestProtomech.java b/megamek/src/megamek/common/verifier/TestProtomech.java
@@ -780,7 +780,7 @@ public static int maxArmorFactor(Protomech proto, int location) {
                 || (location == Protomech.LOC_RARM)) {
             if (proto.isQuad()) {
                 return 0;
-            } else if (proto.getWeight() < 3) {
+            } else if (proto.getWeight() < 6) {
                 return 2;
             } else if (proto.getWeight() < 10) {
                 return 4;
@@ -789,15 +789,6 @@ public static int maxArmorFactor(Protomech proto, int location) {
             }
         } else if (location == Protomech.LOC_BODY) {
             return 0;
-        } else if (proto.isQuad()) {
-            switch ((int) proto.getWeight()) {
-                case 3:
-                    return 12;
-                case 4:
-                case 5:
-                    return 14;
-                // else drop through
-            }
         }
         return proto.getOInternal(location) * 2;
     }