Fix Immelman and Split-S maneuvers #4820
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
neoancient
commented
Oct 6, 2023
Comment on lines
+570
to
-573
| } else if (step.isManeuver()) { | ||
| step = new MoveStep(this, step.getType(), step.hasNoCost(), step.isManeuver(), step.getManeuverType()); | ||
| } else if (step.getManeuverType() != ManeuverType.MAN_NONE) { | ||
| step = new MoveStep(this, step.getType(), -1, -1, step.getManeuverType()); | ||
| } else if (step.isManeuver()) { | ||
| step = new MoveStep(this, step.getType(), step.hasNoCost(), step.isManeuver()); |
There was a problem hiding this comment.
This change in order was required to preserve the noCost field of the additional steps of the maneuver. I thought the check for maneuverType could be removed along with the constructor it uses, but when I tried that all the maneuvers lost their thrust costs. I decided to leave well enough alone.
NickAragua
approved these changes
Oct 7, 2023
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 fixes a bug I introduced in #4663. The change assumes that the maneuver type is set in the previous step, but it was only being set in the movement step and not the subsequent steps that implement the effects of the maneuver. I've changed it to include the maneuver type with all steps that are part of the maneuver, and this time I tested every maneuver type to make sure it's working.
Fixes #4791.