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.

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

Industrial tripod cockpit #1472

Merged
merged 6 commits into from
Apr 6, 2024
Merged

Industrial tripod cockpit #1472

merged 6 commits into from
Apr 6, 2024

Conversation

neoancient
Copy link
Member

Makes a distinction between tripod industrial mechs with and without active fire control. Also fixes a couple of bugs I noticed during testing, involving cockpit type not updating when switching an industrial mech to tripod or switching between standard weight and superheavy.

Requires MegaMek/megamek#5291.

Fixes #1315
Fixes #1371

@@ -137,8 +137,6 @@ public void createNewUnit(long entityType, boolean isPrimitive, boolean isIndust
mech.addEngineCrits();
if (isPrimitive) {
mech.addPrimitiveCockpit();
} else if (isIndustrial) {
Copy link
Member Author

@neoancient neoancient Mar 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this branch because it is incorrectly adding a standard industrial cockpit to tripods and superheavies, and already handled correctly in Mech::addCockpit in the else branch below.

@IllianiCBT IllianiCBT added the Bug label Mar 29, 2024
@HammerGS HammerGS merged commit 2c6c837 into master Apr 6, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect cockpit weights for tripod industrialmeks Superheavy industrial tripod fire control
4 participants