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

Ba manipulator size #4896

Merged
merged 2 commits into from
Nov 18, 2023
Merged

Ba manipulator size #4896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a70f24
Set step size of BA cargo lifter.
neoancient Nov 16, 2023
af59bf7
Cleanup TestBattleArmor.BAManipulator
neoancient Nov 16, 2023
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
5 changes: 2 additions & 3 deletions megamek/src/megamek/common/MiscType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 4 additions & 8 deletions megamek/src/megamek/common/verifier/TestBattleArmor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,19 +188,19 @@ public enum BAManipulator {
* The type, corresponding to types defined in
* <code>EquipmentType</code>.
*/
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;
Expand All @@ -209,10 +209,6 @@ public enum BAManipulator {
pairMounted = p;
}

public static int getNumBAArmors() {
return values().length;
}

/**
* Given an manipulator internal name, return the
* <code>BAManipulator</code> instance that represents that internal
Expand Down