Implemented Incremental Loyalty Changes #4441
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
New service logger messages were added for statuses 'SACKED' and 'LEFT'. In addition, turnover retirement information is now temporarily stored across new day events, allowing its retrieval on a new day.
In the `Person` class, when a person's status was updated to 'Dead', checks were added to determine if the person has living children. If the person had children and no living parents remain, the children are logged as orphans.
Enhanced the way the game handles the death of a character within a relationship. Introduced comprehensive checks and notifications for the status of family members upon a character's death, including living spouses, children, and parents. Logs were also updated to differentiate between 'divorced' and 'widowed'.
Added new functionality to manage character loyalty changes in various scenarios including childbirth, death of family members, or financial matters. Refactored multiple notification messages related to finance handling to be more descriptive and provide more accurate information.
The 'useLeadershipChangeRefresh' variable was removed from CampaignOptions and all related settings, methods and bindings. This included the GUI components associated with this option, its XML handlers and its references in the properties file.
The loyalty refreshing logic has been refactored and improved. Removed multiple calls to 'refreshLoyalty()' method across different personnel status conditions. Instead, a new 'massChangeLoyalty()' method is introduced which triggers a loyalty change for the entire unit when the current character is a campaign commander who hasn't resigned or retired.
The condition in the 'Person.java' file for triggering a loyalty change has been modified. Previously, the loyalty change would occur if the character had living parents. The way it works now, the loyalty change is only triggered if the character still qualifies as a child.
The default loyalty value for the Person class in MekHQ was changed from 0 to 9.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4441 +/- ##
============================================
- Coverage 10.24% 10.23% -0.02%
+ Complexity 5809 5807 -2
============================================
Files 924 925 +1
Lines 126436 126569 +133
Branches 18766 18807 +41
============================================
- Hits 12953 12949 -4
- Misses 112208 112343 +135
- Partials 1275 1277 +2 ☔ View full report in Codecov by Sentry. |
The update includes modifications in PersonnelTableMouseAdapter file. It now processes loyalty changes whenever prisoners are executed or jettisoned.
The logic for executing and jettisoning prisoners has been consolidated into a single method to avoid code duplication. This simplification provides clearer path and less maintenance, improving overall code health. The prompt messages have also been updated to include information about the potential loyalty changes that could occur as a result.
HammerGS
approved these changes
Jul 23, 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.
This PR attempts to make Loyalty more dynamic by introducing event-based Loyalty changes. Now, as personnel 'live' their lives events may occur which result in Loyalty being tested. Sometimes it will improve, other times it will be reduced.
Triggering events include...
Both Turnover & Retention and Education documentation have been updated to reflect these changes.
Important
This PR merges in changes made in #4439 and #4440 and must be merged last to avoid conflicts.