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

More misc fixes #317

Merged
merged 10 commits into from
Dec 20, 2023
Merged

More misc fixes #317

merged 10 commits into from
Dec 20, 2023

Conversation

lbmaian
Copy link
Contributor

@lbmaian lbmaian commented Dec 17, 2023 •
edited
Loading

Major fixes:

  • Fix regression from 1546575 by reverting saving +/- prefix for quirk costs (note: they still will show +/- prefix in GUI). This caused negative quirks to corrupt save files. Added backcompat code to handle such saves.
  • Treat 0 build year as unspecified and ensure model remembers the year is unspecified. This fixes more edge cases where "all era" CVs can still inadvertently have 2x armor cost.

Data:

  • Beagle and RISC viral jammers do not require power amps.
  • Centurion does require power amps.

UI:

  • Revert c43be1d "Use GetNewVee on Load and Open" since it resets the UI even when canceling the load/open.
  • Selective allocate for quad mechs use location names like "FLL" instead of "LFL".
  • Copy over CV/mech movement summary layout from wide CV GUI to non-wide GUI.
  • Standardize CV turret tonnage spinners.
  • Fix splash screen for SAW.
  • Equipment lists always have scrollbars as needed.

Misc:

  • Factored out era-year logic.
  • Partial updates to outdated GUI form files. They still can't be fully synced with the java source yet due to various custom changes to auto-generated code that the NetBeans GUI builder can't handle - some of those changes will have to be reverted later to fix this.
  • Misc other internal changes and whitespace fixes.

@lbmaian
Revert c43be1d "Use GetNewVee on Load and Open" since it resets UI ev…
d334e11 
…en when canceling load/open
@lbmaian
Selective allocate for quad mechs use loc names like FLL instead of LFL
d94197b
@lbmaian
Beagle and RISC viral jammers do not require power amps, Centurion does
42f487d 
Also fix some whitespace
@lbmaian
Fix regression from 1546575 by reverting saving +/- prefix for quirk …
ea740cc 
…costs

Including the +/- prefix in the saves could result in negative quirks having -- (double -) prefix.
If that was saved, then the cost could no longer be parsed as an int, making the unit unloadable.

Also add backcompat code to handle already corrupted saves.
@lbmaian
Treat 0 year as unspecified, factor out era-year logic out, ensure un…
4ea5fbb 
…specified flag is propagated

This fixes more edge cases where "all era" CVs can still inadvertently have 2x armor cost
@lbmaian
Fix minor discrepancies in CV GUI source from forms
c769f6d
@lbmaian
Copy over movement summary layout from wide CV GUI to non-wide GUI
51d3ed5 
Also try to update forms for misc outdated stuff that's in java source.
Note: the forms still can't be fully synced yet due to java source using
custom construction methods, method references for listeners, etc.
@lbmaian
Standardize CV turret tonnage spinners
6bb41d1 
Also attempt to add/update them in the forms
@lbmaian
Fix splash screen for SAW
1bb1c81
@lbmaian
Equipment lists always have scrollbars as needed
2d77059 
Also standardize related scroll pane vars and update forms
@WEKarnesky
Copy link
Member

I'm sorry, I'm not ignoring this pull request, I've had lots of family and friends over because of the holidays. I will review and presumably accept soon.

As I think this is your final currently planned I'm planning on preparing a release candidate as well.

@lbmaian
Copy link
Contributor Author

lbmaian commented Dec 20, 2023

I do have one more PR ready once this is merged: a few options to have certain output closer to MML's output

@WEKarnesky WEKarnesky merged commit 42b54d2 into Solaris-Skunk-Werks:develop Dec 20, 2023
1 check passed
@lbmaian lbmaian deleted the fixes branch December 20, 2023 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WEKarnesky WEKarnesky WEKarnesky 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
@lbmaian @WEKarnesky