Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WithTurretAimAnimation IsTraitDisabled handling #14896

Merged
merged 1 commit into from Mar 9, 2018

Conversation

Projects
None yet
2 participants
@reaperrr
Copy link
Contributor

reaperrr commented Mar 9, 2018

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.

Fix WithTurretAimAnimation disabled handling
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 reaperrr force-pushed the reaperrr:fix-tur-aim-condition branch from c58e635 to bb6bdfb Mar 9, 2018

@abcdefg30 abcdefg30 merged commit fd83cbf into OpenRA:bleed Mar 9, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Mar 9, 2018

@reaperrr reaperrr deleted the reaperrr:fix-tur-aim-condition branch May 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.