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

Replace *Animation traits that use PlayFetchIndex with *SpriteBodies #15906

Merged
merged 2 commits into from Dec 24, 2018

Conversation

Projects
None yet
3 participants
@reaperrr
Copy link
Contributor

reaperrr commented Dec 13, 2018

  1. Replaces the two special-case With*Animation traits that use PlayFetchIndex - WithChargeAnimation and WithSiloAnimation - with *SpriteBody equivalents akin to similar cases like WithGateSpriteBody or WithWallSpriteBody.
    PlayFetchIndex isn't compatible with other animation traits (unless as overlay), so these cases are better left as special-case sprite bodies (all of the affected actors in our shipping mods either don't need generic animation support, or already use overlays).

  2. Renames WithResources to WithResourceLevelOverlay and fixes TS silo yaml setup.

@reaperrr reaperrr changed the title Animation trait clean-ups Replace *Animation traits that use PlayFetchIndex with *SpriteBodies Dec 14, 2018

@abcdefg30
Copy link
Member

abcdefg30 left a comment

Looks good to me.

@pchote

This comment has been minimized.

Copy link
Member

pchote commented Dec 18, 2018

Also needs a rebase now, unfortunately.

This fits in well with all the other render trait changes from the INotifyBuildComplete removal, so adding to the milestone.

@pchote pchote added this to the Next Release milestone Dec 18, 2018

@reaperrr reaperrr force-pushed the reaperrr:anim-cleanups branch from ce3fb0f to 7578ae7 Dec 20, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented Dec 20, 2018

Updated and rebased.

@reaperrr reaperrr force-pushed the reaperrr:anim-cleanups branch from 7578ae7 to 966264c Dec 22, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented Dec 22, 2018

Updated.

@pchote pchote referenced this pull request Dec 23, 2018

Open

Rename the different traits that use original names? #6336

7 of 14 tasks complete

@reaperrr reaperrr force-pushed the reaperrr:anim-cleanups branch from 966264c to 76bac7b Dec 23, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented Dec 23, 2018

Updated. Rebasing the individual resource commits properly would have been hard due to the TS silo yaml changes, so I merged the two commits instead (including their update rules).

reaperrr added some commits Dec 13, 2018

Replace WithChargeAnimation with -SpriteBody
PlayFetchIndex on a With*Animation trait conflicts with the animation
concept, as it's bound to conflict with pretty much all 'normal'
animation traits and blocks progress on the animation priority system.

We also already have multiple precedent SpriteBody traits of similar kind,
like WithGateSpriteBody and WithWallSpriteBody.
Streamline resource anim traits
- Replaces WithSiloAnimation with
  WithResourceLevelSpriteBody.

PlayFetchIndex on a With*Animation trait conflicts
with the animation concept, as it's bound to conflict
with pretty much all 'normal' animation traits and
blocks progress on the animation priority system.

We also already have multiple similar SpriteBody traits,
like WithGateSpriteBody and WithWallSpriteBody.

- Rename WithResources to WithResourceLevelOverlay

Make name more accurate and consistent with sprite body
equivalent.
Also fix TS silo yaml setup (bleed setup stems from times
before WithResources was introduced).

@reaperrr reaperrr force-pushed the reaperrr:anim-cleanups branch from 76bac7b to d72f5c0 Dec 23, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented Dec 23, 2018

Updated.

@pchote

pchote approved these changes Dec 24, 2018

@pchote pchote merged commit be310ab into OpenRA:bleed Dec 24, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment