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

Make turret Attack/Aim anim traits conditional #14895

Merged
merged 3 commits into from Mar 9, 2018

Conversation

Projects
None yet
2 participants
@reaperrr
Copy link
Contributor

reaperrr commented Mar 9, 2018

This is the third and last part split from #14036 and follow-up to #14846.

  • Makes WithTurretAttackAnimation and WithTurretAimAnimation conditional
  • adds Ruleset.Loaded check on WithTurretAimAnimation to prevent modders from using both on the same turret, as they currently conflict with each other too much
  • de-duplicates INotifyAttack.PreparingAttack and INotifyAttack.Attacking in WithTurretAttackAnimation, by extracting a shared NotifyAttack method

@reaperrr reaperrr force-pushed the reaperrr:conditional-tur-anims branch from bdaec94 to 20bdf6e Mar 9, 2018

@abcdefg30 abcdefg30 merged commit 5a889c0 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

This comment has been minimized.

Copy link
Contributor Author

reaperrr commented Mar 9, 2018

I actually noticed a bug in WithTurretAnimAnimation just now (doesn't restore old sequence when required condition is lost while anim is running). I'll file a follow-up.

@reaperrr reaperrr deleted the reaperrr:conditional-tur-anims 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.