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

Merge Bomb with MrBomb #3002

Merged
merged 9 commits into from
Aug 4, 2024
Merged

Merge Bomb with MrBomb #3002

merged 9 commits into from
Aug 4, 2024

Conversation

MatusGuy
Copy link
Member

@MatusGuy MatusGuy commented Jul 7, 2024

This PR internally rewrites MrBomb to be more like GoldBomb. It doesn't add any considerable features.

It also removes lots of code duplication. The Bomb class is now obsolete.

As a result, the death script stays consistent between MrBomb and GoldBomb.

This PR also fixes a bug with gold bomb, in which getting out of the safe distance and going back in would freeze gold bomb in the same sprite action until another state change.

@MatusGuy MatusGuy marked this pull request as ready for review July 23, 2024 22:57
Copy link
Contributor

@tylerandari13 tylerandari13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just what I needed. Works great.

Copy link
Member

@Frostwithasideofsalt Frostwithasideofsalt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah this really does work yup mhm

Copy link
Member

@Vankata453 Vankata453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mr. Bomb and Gold Bomb seem to work fine. I'm not sure what the mentioned issue was, so I trust you that it's been fixed.

Left some code-related comments.

src/badguy/mrbomb.cpp Outdated Show resolved Hide resolved
src/badguy/goldbomb.hpp Show resolved Hide resolved
src/badguy/goldbomb.hpp Outdated Show resolved Hide resolved
@MatusGuy
Copy link
Member Author

@weluvgoatz I accidentally requested your review.

src/badguy/goldbomb.hpp Outdated Show resolved Hide resolved
@MatusGuy MatusGuy merged commit 4435a3d into SuperTux:master Aug 4, 2024
33 checks passed
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.

5 participants