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.

Sign up for GitHub

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

Jump to bottom

Make turret Attack/Aim anim traits conditional #14895

Merged
merged 3 commits into from
Mar 9, 2018
Merged

Make turret Attack/Aim anim traits conditional #14895

merged 3 commits into from
Mar 9, 2018

Conversation

reaperrr
Copy link
Contributor

@reaperrr 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

@abcdefg30 abcdefg30 merged commit 5a889c0 into OpenRA:bleed Mar 9, 2018
@abcdefg30
Copy link
Member

Changelog

@reaperrr
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 mentioned this pull request Mar 9, 2018
Merged
@reaperrr reaperrr deleted the conditional-tur-anims branch May 7, 2018 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abcdefg30 abcdefg30 abcdefg30 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@reaperrr @abcdefg30