Added autoAwards Support for the Education Module #4118
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
…rd image calculations
…bons, medals, and misc awards
…CampaignOptions, removed auto award eduEnableAutoAwardsIntegration from Campaign Options and added TrainingAwards class for auto awards processing
- Modified Academy class to include type in parameters for Academy creation - Adjusted testAcademyCreationAllFields method in Academy unit test to accommodate changes - Simplified variable initializations in Training Awards class
* Added parameter to `EducationController.processNewDay` to bypass age restrictions during education process. * Introduced logic to handle graduation, awarding and journey home process in `PersonnelTableMouseAdapter`. * Refactored the `Campaign.java` to use the updated `EducationController.processNewDay`. * Adjusted the education levels classification in `Academy.java`. * Fixed award attribute defaults to avoid null values in `Award.java`. * Adjusted award size definitions in `standard.xml`. * Updated Academy type definitions in `Local Academies.xml`.
- Changed setEduDaysOfEducation value to unify the logic across modules - Removed redundant completeEducation and completeJourneyTo methods - Adjusted return type of Process method to accommodate for changes - Removed unnecessary whitespace in PersonnelTableMouseAdapter
* Added new field 'eduEducationStage' in Person class to help keep track of the person's education status * Adjusted the EducationController to utilise the new eduEducationStage property during person's education journey * Updated PersonViewPanel to handle the changes effected in the education process
Sleet01
reviewed
May 29, 2024
MekHQ/src/mekhq/campaign/personnel/education/EducationController.java
Outdated
Show resolved
Hide resolved
Sleet01
reviewed
May 29, 2024
MekHQ/src/mekhq/campaign/personnel/education/EducationController.java
Outdated
Show resolved
Hide resolved
Sleet01
requested changes
May 29, 2024
…ome process in EducationController
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 primarily adds autoAwards support to the Education module. However, adding this support required more extensive rebuilding of the Education module system that handles students passing through the stages of education (journey to, education, journey from) than anticipated. This led to a rework of how the Education Module moves students between education stages.
I'll be honest, the previous code wasn't my best work, so I took the opportunity to rework it into a far more robust system that should be easier to read and maintain. Additionally, autoAwards documentation has been updated to include this new functionality.
I also restored the autoAwards report image that went missing at some point. No idea when, either way: it's back.