Fix: Fixed Processing of Profession Salaries in the Event New Profession Added Since Campaign Last Loaded #7059
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ion Added Since Campaign Last Loaded
IllianiBird
commented
May 20, 2025
Comment on lines
5931
to
+5943
| } else if (nodeName.equalsIgnoreCase("salaryTypeBase")) { | ||
| Money[] defaultSalaries = retVal.getRoleBaseSalaries(); | ||
| Money[] newSalaries = Utilities.readMoneyArray(wn2); | ||
| Money[] defaultSalaries = campaignOptions.getRoleBaseSalaries(); | ||
| Money[] newSalaries = Utilities.readMoneyArray(childNode); | ||
|
|
||
| Money[] mergedSalaries = new Money[PersonnelRole.values().length]; | ||
| for (int i = 0; i < mergedSalaries.length; i++) { | ||
| mergedSalaries[i] = (newSalaries[i] != null) ? newSalaries[i] : defaultSalaries[i]; | ||
| try { | ||
| mergedSalaries[i] = (newSalaries[i] != null) ? newSalaries[i] : defaultSalaries[i]; | ||
| } catch (Exception e) { | ||
| // This will happen if we ever add a new profession, as it will exceed the entries in | ||
| // the child node | ||
| mergedSalaries[i] = defaultSalaries[i]; | ||
| } |
There was a problem hiding this comment.
While I was in this neck of the woods I took the opportunity to clean up xml parsing. This is the only section with actual functionality changes.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #7059 +/- ##
============================================
- Coverage 12.43% 12.42% -0.01%
Complexity 7243 7243
============================================
Files 1116 1117 +1
Lines 143957 144014 +57
Branches 22163 22166 +3
============================================
+ Hits 17897 17898 +1
- Misses 124224 124279 +55
- Partials 1836 1837 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
# Conflicts: # MekHQ/src/mekhq/campaign/CampaignOptions.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we load a campaign we transcribe profession salaries to the campaign. If a new profession were added this could potentially fail. The end result would be the remaining professions would all receive default salaries.
This isn't a huge issue currently as, concerning the recent addition of professions, we want them to have default salaries anyway. However, this would become a problem if a new profession was added in the middle of the profession enum, rather than at the end.
This PR resolves the problem.