Skip to content

Commit e9f766c

Browse files
Merge pull request #1838 from exeea/Aero
aerospace with rating < 10
2 parents b5ee178 + 011e899 commit e9f766c

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

megameklab/src/megameklab/ui/generalUnit/MovementView.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,24 @@ public void setFromEntity(Entity en) {
247247
}
248248
} else if (en.hasETypeFlag(Entity.ETYPE_JUMPSHIP)) {
249249
minWalk = 0; // Station-keeping drive. Legal for warships, though unusual.
250+
} else if (en instanceof ConvFighter asf) { // ConvFighter is a subclass of AeroSpaceFighter so should be checked first
251+
if (asf.getWeight() <= 5) {
252+
minWalk = 2;
253+
} else {
254+
minWalk = 1;
255+
}
256+
} else if (en instanceof AeroSpaceFighter asf) {
257+
if (asf.getWeight() <= 5) {
258+
minWalk = 4;
259+
} else {
260+
minWalk = 3;
261+
}
250262
}
251263
// Trailers with no engine have a max speed of zero.
252264
if (en.isTrailer() && ((en.getEngine() == null)
253265
|| (en.getEngine().getEngineType() == Engine.NONE))) {
254266
maxWalk = 0;
255267
}
256-
257268
spnWalkModel.setMinimum(minWalk);
258269
spnWalkModel.setMaximum(maxWalk);
259270
spnWalk.setValue(Math.max(minWalk, en.getOriginalWalkMP()));

0 commit comments

Comments
 (0)