Added Campaign Option to Randomize New Unit Quality #4158
Merged
Conversation
This file contains 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
- Implemented getRandomUnitQuality method to generate quality of unit based on 2d6 roll and a modifier
- Added checkbox for enabling/disabling random new unit quality - Updated related settings and tooltips in CampaignOptionsDialog.properties - Updated set and get methods in CampaignOptions.java - Adjusted the UI to accommodate the new option in CampaignOptionsPane.java
IllianiCBT
changed the title
IllianiCBT
changed the title
This was referenced Jun 6, 2024
|
This seems to include the changes of previous PRs. Better reolve the conflict, then update so the difference is easier to see. |
# Conflicts: # MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
|
Conflicts resolved |
# Conflicts: # MekHQ/src/mekhq/campaign/Campaign.java
|
Resolved conflicts |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #4158 +/- ##
============================================
- Coverage 10.28% 10.27% -0.01%
+ Complexity 5816 5809 -7
============================================
Files 921 920 -1
Lines 125827 125726 -101
Branches 18603 18600 -3
============================================
- Hits 12944 12923 -21
+ Misses 111613 111532 -81
- Partials 1270 1271 +1 ☔ View full report in Codecov by Sentry. |
# Conflicts: # MekHQ/src/mekhq/campaign/Quartermaster.java # MekHQ/src/mekhq/campaign/mission/AtBContract.java # MekHQ/src/mekhq/campaign/storyarc/storytrigger/AddUnitStoryTrigger.java # MekHQ/src/mekhq/campaign/universe/generators/companyGenerators/AbstractCompanyGenerator.java # MekHQ/src/mekhq/gui/CampaignGUI.java # MekHQ/src/mekhq/gui/adapter/ProcurementTableMouseAdapter.java # MekHQ/src/mekhq/gui/dialog/GMToolsDialog.java # MekHQ/src/mekhq/gui/dialog/MekHQUnitSelectorDialog.java # MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java
SJuliez
approved these changes
Jun 8, 2024
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.
Requires: #4150
This PR adds a new campaign option to have new Units generate with randomized Quality ratings. I based the chance for each rating on the AtB Mek Quality table.
This table is based on a
2d6 + modifierroll, with results clamped within 2 and 12. Please note that Unit Quality is one of those cases where F is the best quality and A is the worst. The original AtB table appears to have unit quality incorrectly flipped around, so I factored for that.Random Company Generator is affected by these changes, but applies a +2 modifier for the campaign commanders' roll, and a +1 modifier for officer rolls.