Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ProtoMek max armor values #4976

Merged
merged 1 commit into from
Dec 26, 2023
Merged

ProtoMek max armor values #4976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions megamek/src/megamek/common/verifier/TestProtomech.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down