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

Jump to bottom

Support vee construction data #1452

Merged
merged 86 commits into from
Oct 16, 2019
Merged

Support vee construction data #1452

merged 86 commits into from
Oct 16, 2019

Conversation

neoancient
Copy link
Member

These are the MM changes needed for support vehicle construction in MML. It does not yet include support vehicle validation. I want to do that in a separate branch (since this is already such a large set of changes). There's a good chance the unit validation will reveal some things that need to be fixed so I'm posting this as a draft PR at this point.

@neoancient
Merge branch 'master' of /home/cwspain/IdeaProjects/megamek with conf…
35a41f0 
…licts.
@neoancient
Merge remote-tracking branch 'origin/master'
ef3ee41 
# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
@neoancient
Merge branch 'master' of https://github.com/MegaMek/megamek
409ad6e
@neoancient
Merge branch 'master' of https://github.com/MegaMek/megamek
9fecefe
@neoancient
Merge remote-tracking branch 'origin/master'
9ea7d40
@neoancient
Created enums for handling support vee chassis mod construction data.
37e8c09
@neoancient
Added enums for engine construction data.
626343c 
Added external power pickup chassis mod.
@neoancient
Merge branch 'support_vee' of ../megamek-all into support_vee
dfad378
@neoancient
Added some tech advancement data for SV components.
d26d913
@neoancient
Changed intro date on WiGE support vee to ES (TM, p. 287).
20b7abd
@neoancient
Added lookup methods for SVType and SVEngine.
052ed31
@neoancient
Fixed validation for steam and maglev engines.
92b00e5
@neoancient
Account for minimum weights for support vee engines.
75fb4ee
@neoancient
Fuel weight calculations for fixed wing and airship support vehicles.
437dbbe
@neoancient
Changed TestSupportVehicle to extend TestEntity instead of TestTank.
3a317f0 
This results in a little more duplicated code, but not as much as having to have separate classes for ground and air support vees.
Filled in most of the weight calculations. Turrets are still to be done.
@neoancient
Added turret weight calculations.
94e940b
@neoancient
Added slot calculations.
52f8931
@neoancient
Added transport and crew slot calculations.
04ab258 
Added field for combat seats for combat and support vehicles.
@neoancient
Fixed Engine validation and name problems with Steam and MagLev.
9c9c221
@neoancient
Validate engine type against support vehicle type.
905d8a2
@neoancient
Weight class categories for fixed wing.
6d6d45e
@neoancient
Method to check chassis mod compatibility
652653d
@neoancient
short names for sv chassis mods
1dd4d57
@neoancient
Merge remote-tracking branch 'origin/master'
83ff623
@neoancient
Changed TestSupportVehicle#ChassisModification
a953503 
Added method to check compatibility with other chassis mods.
@neoancient
Slot calculations.
cb2c320
@neoancient
Override isSupportVehicle to return true for FixedWingSupport
f4ef7d8
@neoancient
Track base chassis fire control weight for omni support vehicles.
732b919 
Added base chassis turret weight processing to support vees and VTOLs.
@neoancient
Advanced armor filtering for support vees.
7f495d7
@neoancient
Support vee armor calculation convenience methods.
f3346b4
@lgtm-com
Copy link

lgtm-com bot commented Aug 21, 2019

This pull request fixes 3 alerts when merging 883c015 into b06e689 - view on LGTM.com

fixed alerts:

  • 3 for Useless comparison test

@lgtm-com
Copy link

lgtm-com bot commented Aug 22, 2019

This pull request fixes 3 alerts when merging 8ac5886 into b06e689 - view on LGTM.com

fixed alerts:

  • 3 for Useless comparison test

@neoancient
Don't require base crew for SV trailers with no engine.
365e4dd
@neoancient
Cleanup for FixedWingSupport
8553de9 
Removed extraSeats field which was based on combat vee crew seating.
Provided satellite availability from later printing of TacOps.
@lgtm-com
Copy link

lgtm-com bot commented Aug 22, 2019

This pull request fixes 3 alerts when merging 8553de9 into b06e689 - view on LGTM.com

fixed alerts:

  • 3 for Useless comparison test

1 similar comment
@lgtm-com
Copy link

lgtm-com bot commented Aug 22, 2019

This pull request fixes 3 alerts when merging 8553de9 into b06e689 - view on LGTM.com

fixed alerts:

  • 3 for Useless comparison test

NickAragua
NickAragua approved these changes Aug 23, 2019
View reviewed changes
Copy link
Member

@NickAragua NickAragua left a comment

Choose a reason for hiding this comment

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

Looks good, with the caveat that I'm unlikely to be able to spot any meaningful logic errors or performance issues with a change set this large.

megamek/src/megamek/common/verifier/TestSupportVehicle.java Show resolved Hide resolved
@lgtm-com
Copy link

lgtm-com bot commented Sep 3, 2019

This pull request introduces 1 alert and fixes 3 when merging e2d9dd3 into 0016ef6 - view on LGTM.com

new alerts:

  • 1 for Dereferenced variable may be null

fixed alerts:

  • 3 for Useless comparison test

@neoancient
Removed incorrect smallOnly flag from convertible chassis mod.
fb30731 
Added more detailed message for chassis mod validation failure.
@neoancient
Override Entity#hasArmoredChassis in FixedWingSupport.
713931e
@neoancient
Merge branch 'master' into support_vee
47ef9e5
@neoancient
Merge remote-tracking branch 'origin/master' into support_vee
db7c30b 
# Conflicts:
#	megamek/data/images/units/mechset.txt
#	megamek/src/megamek/client/ui/swing/MechTileset.java
#	megamek/src/megamek/common/loaders/BLKSupportTankFile.java
@neoancient
Added missing imports.
693d1fc
@lgtm-com
Copy link

lgtm-com bot commented Oct 8, 2019

This pull request introduces 1 alert and fixes 3 when merging 693d1fc into e3e48c1 - view on LGTM.com

new alerts:

  • 1 for Dereferenced variable may be null

fixed alerts:

  • 3 for Useless comparison test

@neoancient
Added null check
576e174 
There shouldn't be any cases where there are towed units and game is null, but better safe.
@lgtm-com
Copy link

lgtm-com bot commented Oct 8, 2019

This pull request fixes 3 alerts when merging 576e174 into e3e48c1 - view on LGTM.com

fixed alerts:

  • 3 for Useless comparison test

@neoancient neoancient marked this pull request as ready for review October 13, 2019 21:49
NickAragua
NickAragua approved these changes Oct 14, 2019
View reviewed changes
Copy link
Member

@NickAragua NickAragua left a comment

Choose a reason for hiding this comment

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

I believe I reviewed the bulk of this PR previously, and the additional changes made since then didn't raise any red flags. Most likely we'll need to beat up on it by constructing support vehicles.

@neoancient
Copy link
Member Author

The additional changes were fixes discovered in the process of beating up on it to construct SVs.

@neoancient neoancient merged commit 576e174 into master Oct 16, 2019
@neoancient neoancient deleted the support_vee branch October 24, 2019 17:19
HammerGS added a commit that referenced this pull request Mar 13, 2024
@HammerGS
Merging following PR's
26c2fc2 
+ Fix #5214: Exception when loading saved game
+ Fix #5224: Infantry Firing issue
+ PR #5241: Add test to ensure every unit can load
+ PR #5244: Fixing MML #1452 Allows you to pod mount null signature
system.
IllianiCBT pushed a commit to IllianiCBT/megamek that referenced this pull request Mar 18, 2024
@HammerGS @IllianiCBT
Merging following PR's
498a251 
+ Fix MegaMek#5214: Exception when loading saved game
+ Fix MegaMek#5224: Infantry Firing issue
+ PR MegaMek#5241: Add test to ensure every unit can load
+ PR MegaMek#5244: Fixing MML MegaMek#1452 Allows you to pod mount null signature
system.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NickAragua NickAragua NickAragua approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@neoancient @NickAragua