fixes for multiple stratcon issues; objective display improvement #2756
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
Codecov Report
@@ Coverage Diff @@
## master #2756 +/- ##
============================================
- Coverage 10.60% 10.59% -0.02%
+ Complexity 3853 3845 -8
============================================
Files 717 717
Lines 99774 99804 +30
Branches 16404 16413 +9
============================================
- Hits 10585 10573 -12
- Misses 87812 87844 +32
- Partials 1377 1387 +10
Continue to review full report at Codecov.
|
Comment on lines
75
to
92
| case AnyScenarioVictory: | ||
| case SpecificScenarioVictory: | ||
| // you can fail this if the scenario goes away somehow | ||
| return getCurrentObjectiveCount() == OBJECTIVE_FAILED; | ||
| case AlliedFacilityControl: | ||
| // you can fail this by having the facility destroyed | ||
| StratconFacility alliedFacility = trackState.getFacility(getObjectiveCoords()); | ||
| return alliedFacility == null; | ||
| case HostileFacilityControl: | ||
| // you can fail this by having the facility destroyed | ||
| StratconFacility hostileFacility = trackState.getFacility(getObjectiveCoords()); | ||
| return hostileFacility == null; | ||
| case FacilityDestruction: | ||
| // you can't really permanently fail this | ||
| return false; | ||
| default: | ||
| // we shouldn't be here, but just in case | ||
| return false; |
| default: | ||
| // we shouldn't be here, but just in case | ||
| return false; | ||
| } |
There was a problem hiding this comment.
Also... this shouldn't line up with the method end
MekHQ/src/mekhq/gui/StratconTab.java
Outdated
| @@ -291,6 +295,8 @@ private String buildShortStrategicObjectiveText(StratconCampaignState campaignSt | |||
| private String buildStrategicObjectiveText(StratconCampaignState campaignState) { | |||
| StringBuilder sb = new StringBuilder(); | |||
|
|
|||
| boolean contractIsActive = campaignState.getContract().isActiveOn(getCampaignGui().getCampaign().getLocalDate()); | |||
There was a problem hiding this comment.
Variable is useless given it is used a grand total of once, and isn't required at all times.
|
Changes made, plus a data fix for an annoying issue where hostile off-board artillery would count towards primary scenario objectives. |
Windchild292
approved these changes
Jul 21, 2021
This was referenced Jul 21, 2021
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.
o indicates an in-progress objective (not complete, not failed, colored orange)
x indicates a failed objective (no way to complete, red colored)
checkmark indicates a completed objective (green colored)