Removed Automatic Pilot Pickup Assumption #4454
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
The code that automatically assumed all ejected pilots were picked up if the player controlled the battlefield & was using ejected pilots flee was removed.
The capture checking logic is now refactored and extracted into a separate method `rollForCapture`.
The condition for the dice roll in the ResolveScenarioWizardDialog was modified. Previously, it was checking for an exact match with the target, but now it checks for whether the rolled number is greater than or equal to the target.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4454 +/- ##
============================================
- Coverage 10.24% 10.24% -0.01%
+ Complexity 5809 5808 -1
============================================
Files 924 924
Lines 126441 126441
Branches 18768 18767 -1
============================================
- Hits 12953 12951 -2
- Misses 112213 112214 +1
- Partials 1275 1276 +1 ☔ View full report in Codecov by Sentry. |
HammerGS
approved these changes
Jul 23, 2024
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.
Previously, with the Ejected Pilots Flee option enabled, all enemy personnel were considered 'picked up.' It seems the intent was for this to apply only to ejected personnel. Unfortunately, the reality is that this resulted in all enemy personnel being classified as 'picked up'. However,_ this bug wasn't an issue before because the 'was picked up' variable was never properly set, so nothing significant was done with that information.
In my recent rework, I set the 'was picked up' value so that picked-up personnel would be automatically captured, as originally intended. However, I missed the above bug, resulting in all non-KIA enemy personnel being classified as captured if Ejected Pilots Flee was enabled.
With this PR, I removed the handler that classified all enemy personnel as being picked up. Now, when using Ejected Pilots Flee, enemy personnel will roll to see if they have been captured, just as they would if the option were disabled. To account for the reduced likelihood of injuring or picking up ejected enemy personnel, I lowered the capture target number from 6 to 5+ (only when Ejected Pilots Flee is enabled).
Closes #4447