Added Status Self-Validation; Prevented Assignment of Invalid Statuses to PoWs; Updated Status Change Menu #6531
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
- Changed "PoW" label to "Captured by the OpFor" for clarity.
- Introduced two new flags, `isPrisonerSuitableStatus` and `isCauseOfDeath`, to `PersonnelStatus` for enhanced status classification. - Added utility methods to filter statuses based on prisoner suitability and cause of death. - Implemented the `statusValidator` method to validate and auto-correct invalid personnel statuses, particularly for prisoners. - Updated legacy code paths to utilize the newly introduced status validation during campaign loading and prisoner status changes. - Modified `PersonnelTableMouseAdapter` to dynamically filter allowed statuses in the UI based on prisoner status and context. - Deprecated the old `getImplementedStatuses()` method in favor of the new overloaded version with filtering capabilities.
IllianiBird
added
Bug
Personnel
… to the correct method `getImplementedStatuses(boolean, boolean)`.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #6531 +/- ##
============================================
+ Coverage 11.28% 11.29% +0.01%
+ Complexity 6321 6318 -3
============================================
Files 1080 1080
Lines 137543 137589 +46
Branches 21300 21328 +28
============================================
+ Hits 15517 15540 +23
- Misses 120473 120494 +21
- Partials 1553 1555 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
…ing personnel status updates align with campaign-specific context (e.g., date).
rjhancock
approved these changes
Apr 4, 2025
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.
isPrisonerSuitableStatusandisCauseOfDeath, toPersonnelStatus.statusValidatormethod to validate and auto-correct invalid personnel statuses for prisoners.PersonnelTableMouseAdapterto dynamically filter allowed statuses in the UI based on prisoner status and context.getImplementedStatuses()method in favor of the new overloaded version with filtering capabilities.Dev Notes
This PR does a couple of things. First of all it locks Prisoners out of certain Personnel Statuses that aren't valid for prisoners. This prevents users from accidentally getting confused with what statuses are valid and what aren't. For example, I've seen instances of users assigning prisoners the 'PoW' status - however that status is not meant for NPC PoWs, and using it there breaks prisoner tracking.
Next, on load, we validate all prisoners have valid statuses to handle <50.05 campaigns.
Finally, I updated the Change Status menu so that it only shows Statuses the character is eligible for. I also grouped all of the Cause of Death statuses under a sub-menu, so the whole dropdown is a lot less cluttered.