Always check if crew is KOed before rerolling edge #5875
Merged
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.
#5855 introduced a bug where crew KOs would trigger rerolling edge until the pilot blacked out. This occurred because the
isKoThisRound()
check was accidentally grouped withshouldUseEdge(OptionsConstants.EDGE_WHEN_KO
, and then the|| EDGE_WHEN_AERO
condition was firing each time. This PR should fix the problem by re-grouping the conditions such thatisKoThisRound()
is always checked, and must be true with either of the EDGE options also true.I tested this with mechs and it seems to show the expected behavior again:
Closes #5874