Fix: #6821 Fixed Drill Instructor Awards Being Issued While Not on a Mission #6827
Conversation
This file contains hidden or 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
### Dev Notes Drill Instructor shouldn't be awarded unless the campaign has an active AtBContract. This is just a simple fix to address that.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6827 +/- ##
============================================
+ Coverage 11.46% 11.51% +0.04%
- Complexity 6508 6563 +55
============================================
Files 1098 1100 +2
Lines 140812 140989 +177
Branches 21831 21848 +17
============================================
+ Hits 16150 16237 +87
- Misses 122995 123056 +61
- Partials 1667 1696 +29 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Scoppio
requested changes
May 1, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR fixes the issue with Drill Instructor Awards being issued incorrectly when the campaign is off-mission. Key changes include:
- Updating the condition in PrisonerEventManager.java to require an active AtBContract.
- Modifying the drillInstructor method in MiscAwards.java to include a condition based on the active AtBContract status.
- Adding an overloaded method in Campaign.java to support the revised condition.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| MekHQ/src/mekhq/campaign/randomEvents/prisoners/PrisonerEventManager.java | Modified the active contract check to use the overloaded method. |
| MekHQ/src/mekhq/campaign/personnel/autoAwards/MiscAwards.java | Updated drillInstructor logic to conditionally award based on the active contract state and refactored header comments. |
| MekHQ/src/mekhq/campaign/Campaign.java | Added an overloaded hasActiveAtBContract() method for simplified usage. |
Scoppio
requested changes
May 2, 2025
| @@ -1,14 +1,14 @@ | |||
| /* | |||
| * Copyright (C) 2024-2025 The MegaMek Team. All Rights Reserved. | |||
| * | |||
| * This file is part of MekHQ. | |||
| * This file is part of <Package Name>. | |||
There was a problem hiding this comment.
Copyright notice needs updating
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
Yeah, apparently I just missed this PR when making sure I'd addressed everything. |
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.
Fix #6821
Dev Notes
Drill Instructor shouldn't be awarded unless the campaign has an active AtBContract. This is just a simple fix to address that.