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

Crystallo <-> Roof Crystallo on levelflip #2576

Merged
merged 6 commits into from
Aug 16, 2023

Conversation

Narre
Copy link
Contributor

@Narre Narre commented Aug 8, 2023

This PR makes Crystallos transform into Roof Crystallos on levelflip() (and vice versa).
Awaken Sleeping Crystallos get transformed into Roof Crystallos too.
Asleep Sleeping Crystallos get their texture flipped.
If awaken during a levelflip(), the Sleeping Crystallo will transform into a Roof Crystallo and immediately drop/attack.

This PR also combines crystallo.sprite, scrystallo.sprite and rcrystallo.sprite into one (crystallo.sprite) sprite file. This is done so that the crystallos can keep their sprite during the transformations, i.e. compatibility with custom sprites.

crystalflip.mp4

scrystallo (awake) -> rcrystallo on levelflip
scrystallo (sleeping) flips its texture on levelflip
waking scrystallo during levelflip -> rcrystallo (attacking)
fix bug with Direction::AUTO in the editor for scrystallo and rcrystallo
@mrkubax10 mrkubax10 added involves:functionality category:code status:needs-review Work needs to be reviewed by other people labels Aug 11, 2023
src/supertux/physic.hpp Outdated Show resolved Hide resolved
@mrkubax10 mrkubax10 requested a review from tobbi August 16, 2023 17:34
src/badguy/crystallo.hpp Outdated Show resolved Hide resolved
src/badguy/rcrystallo.hpp Outdated Show resolved Hide resolved
src/badguy/scrystallo.hpp Outdated Show resolved Hide resolved
@Narre Narre requested a review from Vankata453 August 16, 2023 18:19
@Vankata453 Vankata453 merged commit 864ff52 into SuperTux:master Aug 16, 2023
33 of 36 checks passed
@mrkubax10 mrkubax10 removed the status:needs-review Work needs to be reviewed by other people label Aug 17, 2023
Rusty-Box pushed a commit that referenced this pull request Aug 25, 2023
…#2588)

This adds back the missing jumping sprite actions for crystallo (I accidentally removed them in #2576 ).
It also re-disables gravity for Sleeping Crystallo, which I enabled in the same PR, but apparently, there is a legitimate use case and a reason for why it was disabled before, so I'm re-disabling it.
The gravity will also be disabled for Roof Crystallos created by waking roof-attached Sleeping Crystallos (until they drop).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants