Added Second Chance Caste to the Education Module for Warrior Caste Washouts #4139
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
…duation' into education_WashoutOptions
- Introduced the SecondChanceCaste enum, providing options for Warrior Caste washouts - Added SecondChanceCaste to Campaign Options with associated getters and setters - Modified resource files to include text and tooltips for SecondChanceCaste - Removed unnecessary parameters in the beginJourneyHome function of EducationController.java
SJuliez
approved these changes
Jun 4, 2024
# Conflicts: # MekHQ/resources/mekhq/resources/CreateCharacterDialog.properties # MekHQ/resources/mekhq/resources/CustomizePersonDialog.properties # MekHQ/src/mekhq/gui/dialog/CustomizePersonDialog.java
|
Resolved Conflicts |
|
Yet again, conflicts :) |
# Conflicts: # MekHQ/src/mekhq/gui/dialog/CustomizePersonDialog.java
- Added a guard clause to check for 'NONE' on secondChanceCasteIndex - Adjusted code to avoid unnecessary operations - Implemented exception throw for unexpected secondChanceCaste values
|
Addressed feedback and resolved conflicts |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #4139 +/- ##
============================================
- Coverage 10.28% 10.28% -0.01%
- Complexity 5793 5811 +18
============================================
Files 919 921 +2
Lines 125219 125741 +522
Branches 18550 18590 +40
============================================
+ Hits 12883 12933 +50
- Misses 111068 111538 +470
- Partials 1268 1270 +2 ☔ View full report in Codecov by Sentry. |
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: #4127 & #4126
This PR adds the ability to select a 'second chance' Warrior Caste sub-caste for Warrior Caste washouts.
When Warrior Caste personnel washout of the Warrior Caste mhq will check that their course index does not match the index of the chosen second chance caste. If there is no match (and second chance is not set to
NONE), then the aspirant washes into the chosen sub-caste.If second chance is set to
NONE, or the aspirant is washing out of the chosen sub-caste, they will washout into a civilian caste as normal.