Fix WithTurretAimAnimation IsTraitDisabled handling #14896
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 old sequence was not recovering when this trait lost its required condition while the aim anim was running. Now it doesn't unconditionally return, but instead checks what the current sequence is and resets to base turret sequence if AimAnim is disabled.
reaperrr
force-pushed
the
fix-tur-aim-condition
branch
from
c58e635
to
bb6bdfb
Compare
abcdefg30
approved these changes
Mar 9, 2018
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.
The old sequence was not recovering when this trait lost its required condition while the aim anim was running.
Now it doesn't unconditionally return, but instead checks what the current sequence is and resets to base turret sequence if AimAnim is disabled.
Follow-up to #14895.
Testcase (RA cruiser): https://github.com/reaperrr/OpenRA/tree/aimanim-testcase
In the testcase, the cruiser displays the missile turret in the front while aiming, as long as it is undamaged. Damage it, and the default turret shows instead.