-
Notifications
You must be signed in to change notification settings - Fork 291
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
Implement 4397 internal bomb bay redux #5003
Implement 4397 internal bomb bay redux #5003
Conversation
…ms display (pt. 1)
…for two bomb location types
…IBB reason message
This was intended for a new option in the top-level Exception handler dialog, but extraneous here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few comments.
Did you also check compatibility with MML?
I noticed some code that could be omitted when there are no units left that are pure Aero class.
@@ -154,8 +154,12 @@ public String[] getLocationNames() { | |||
// fixed and pod-mounted. | |||
private int podHeatSinks; | |||
|
|||
protected int maxBombPoints = 0; | |||
protected int[] bombChoices = new int[BombType.B_NUM]; | |||
protected int maxIntBombPoints = 0; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(not about this line)
Since fighters are no longer directly Aero, do we ever instantiate Aero? It seems that the Aero class could be abstract.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(not about this line)
Since fighters are no longer directly Aero, do we ever instantiate Aero? It seems that the Aero class could be abstract.
It could be, although I wasn't planning to at this juncture. It would let us move a lot of stuff out of Aero.
Edit: we do not ever instantiate Aero directly now.
I did check compatibility in MML, although there should be no impact there: bombs are only added in MM / MHQ, and the added "virtual" cargo space for ASFs (used to calculate internal bomb capacity for ASFs with "Cargo" equipment) is not utilized by MML. |
(Note: this is a re-submission of PR 4974, due to merge issues I caused by fixing things out of order)
This has some pretty big changes:
New gameplay features:
Changes/Additions
in service of reducing the number of classes that needed updates for IBB. This should also allow reducing the code in Aero considerably and moving ASF-only functionality into that class, if desired.
TO-DO / Not Yet Implemented
Testing
Note:
I updated the JVM options in build.gradle to use 4GB of RAM and disable AWT grabbing (source of a lot of freezing while debugging AWT windows). I can remove this if folks don't feel it's necessary for them.
Pulling this PR will also require pulling the matching MekHQ PR here
Close #4397