Reworked AtB Bonus Rolls, Fixed Bug in Bulk Hire #4931
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
Removed random civilian, apc, and free recruit rolls from AtB Bonus table. Replaced with free Veteran MekWarrior (Ronin), free tank, free aerospace fighter, and free mek. Fixed a bug in bulk hire that caused SPAs to not be generated if fixed age wasn't enabled.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| actualUnitType = UnitType.TANK; | ||
| // Mixed units randomly select between Mek or ground vehicle | ||
| } else { | ||
| for (int x = 0; x < unitCount; x++) { |
Check warning
Code scanning / CodeQL
Constant loop condition Warning
| Collection<MissionRole> roles; | ||
|
|
||
| if (rolesByType != null) { | ||
| roles = rolesByType.getOrDefault(unitTypes.get(i), new ArrayList<>()); |
Check warning
Code scanning / CodeQL
Dereferenced variable may be null Warning
There was a problem hiding this comment.
The null check is right there
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4931 +/- ##
=========================================
Coverage 10.44% 10.44%
- Complexity 5998 6007 +9
=========================================
Files 951 951
Lines 132874 132922 +48
Branches 19329 19343 +14
=========================================
+ Hits 13873 13885 +12
- Misses 117653 117691 +38
+ Partials 1348 1346 -2 ☔ View full report in Codecov by Sentry. |
Removed the `campaign` parameter from the `reRollLoyalty` method as it was redundant and unused. This change reduces the complexity of calls to this method in `AtBContract.java` and `HireBulkPersonnelDialog.java`.
A random callsign is now generated for new Ronin characters during their recruitment process. This change improves the immersion and uniqueness of each Ronin by providing them with automatically generated, random callsigns.
HammerGS
approved these changes
Oct 2, 2024
|
@IllianiCBT Has conflicting files now. |
# Conflicts: # MekHQ/src/mekhq/campaign/mission/AtBContract.java # MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
Consolidated and refactored import statements in AtBContract and AtBDynamicScenarioFactory. Replaced hardcoded values with constants and centralized imports to maintain consistency and improve readability.
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 #4928
Removed random civilian, apc, and free recruit rolls from AtB Bonus table. Replaced with free Veteran MekWarrior (Ronin), free tank, free aerospace fighter, and free mek.
Fixed a bug in bulk hire that caused SPAs to not be generated if fixed age wasn't enabled.