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

Various fixes including for regressions on latest RC #315

Merged
merged 17 commits into from
Dec 5, 2023

Conversation

lbmaian
Copy link
Contributor

@lbmaian lbmaian commented Dec 4, 2023

Several fixes and misc changes. There's two more PRs that will follow this, one that has fixes for mech and CV turrets and related UI, and the other for some MML compat options.

Improved error handling:

  • Allow loading units with unknown equipment, also fixing an old backcompat check.
  • Allow loading units with equipment in invalid locations.
  • Unit saving no longer wipes file on error. Shows unexpected exceptions during saving in a dialog.

UI fixes:

  • Fix regression from 69bbe7c that broke multiples of same equipment. I know there's another outstanding PR (Bug Fix - SSW - Multiple Equipment Entries #301) that's supposed to fix it, but don't think conflating an instance of an equipment and the "class" of that equipment for equality purposes is a good idea.
  • Use equipment chooser panel from wide CV GUI in all other CV/mech GUIs. This also fixes non-wide CV GUI equipment chooser scrolling regression from e8dd5de. Note: the form files are already out of sync with with the java files and it would be non-trivial to make them work (Netbeans can't handle it, and Eclipse outright crashes).
  • Fix wide CV GUI using SSW prefs instead of SAW prefs.
  • Reset cockpit command console for new mech.
  • Check omnimech eligibility when changing rules level.

Other fixes:

  • Fix "All Eras" doubling CV armor cost.
  • Disallow vehicular grenade launcher in CV body.
  • Remove "Structure" from composite/primitive chassis CritName for consistency with other chassis.
  • Armored components are now saved to file in era-specific rules (instead of just experimental rules).
  • Cost/BV now properly calculated for coolant pods and armored components in era-specific rules (instead of just experimental rules).
  • Read "Unknown"/"None" manufacturer/model as empty string. This also fixes jump jet model still being "None" on a loaded mech after adding jump jets afterwards.
  • TRO: Avoid "Unknown" prefix, omit manufacturer/factory section if empty (ala MML), improved jump jet info a bit.
  • Fix narrow/low profile quirk cost from 2 to 3 (and fill out its description) - see https://bg.battletech.com/wp-content/uploads/2023/07/Campaign-Operations-2023-07-26-v4.0.pdf
  • Separate out quad version of directional torso mount quirk since it has a different point cost.
  • Change variable quirk cost from 0 to 1 so user can manually come up with cost by selecting it multiple times.

Misc:

  • Add eclipse stuff to .gitgnore. (Netbeans refuses to compile correctly with the ancient version of Gradle being used here, so I defaulted to another prominent free java IDE.)
  • Sync SAW dlgPrefs form with java source.
  • Fix minor whitespace issue in equipment.json.

This also fixes non-wide CV GUI equipment chooser scrolling regression from e8dd5de, remove superfluous seperators

Note: frmVeeWide.form with frmVeeWide.java (wide CV GUI) is already out-of-sync and can't handle the custom methods like EquipmentLocation
This also fixes jump jet model being "None" on a loaded mech after adding jump jets
…fic rules

Specifically it used to only work properly in experimental rules.
Following was fixed to now work in era-specific rules:
- cost/BV now calculated for coolant pods and armored components
- armored components are now saved to file
@lbmaian lbmaian marked this pull request as ready for review December 4, 2023 11:58
Specifics:
- Fix narrow/low profile quirk cost from 2 to 3 - see https://bg.battletech.com/wp-content/uploads/2023/07/Campaign-Operations-2023-07-26-v4.0.pdf
- Also fill out its description
- Separate out quad version of directional torso mount quirk
- Change variable quirk cost from 0 to 1 so user can manually come up with cost by selecting it multiple times
@WEKarnesky
Copy link
Member

Thank you for submitting this. I will be reviewing it this afternoon after work.

@WEKarnesky WEKarnesky merged commit ef79619 into Solaris-Skunk-Werks:develop Dec 5, 2023
1 check passed
@lbmaian lbmaian deleted the fixes branch December 7, 2023 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants