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

Activate trap on force-moved enemies #2696

Merged
merged 4 commits into from
Apr 25, 2023

Conversation

MrLostman
Copy link
Contributor

@MrLostman MrLostman commented Apr 25, 2023

Summary

SUMMARY: BugFixes "Activate trap on force-moved enemies"

Purpose of change

To fix #2684 : Trap wont activated on forced moved enemies

Describe the solution

To check for traps when a creature is knocked back

Testing

knocked zombies into traps

@github-actions github-actions bot added the src PR changes related to source code. label Apr 25, 2023
@scarf005 scarf005 changed the title fixes #2684 : Trap wont activated on forced moved enemies Activate trap on force-moved enemies Apr 25, 2023
@scarf005 scarf005 self-requested a review April 25, 2023 08:13
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

Power hit

2023-04-25.17-26-18.mp4

Shockwave generator

2023-04-25.17-22-45.mp4

could you also check bio_shockwave? it triggers explosion_funcs::shockwave, which triggers game::knockback, and looks like this case is not handled. knockback from power hit is working well.

@MrLostman
Copy link
Contributor Author

That's strange I did all my testing with power hit, I wonder if it is something with debug monster

@scarf005
Copy link
Member

scarf005 commented Apr 25, 2023

could you also check bio_shockwave? it triggers explosion_funcs::shockwave, which triggers game::knockback, and looks like this case is not handled.

knockback from power hit is working well.

game::knockback needs to handle traps as well.

src/game.cpp Outdated Show resolved Hide resolved
@MrLostman MrLostman requested a review from scarf005 April 25, 2023 09:25
@scarf005 scarf005 merged commit c6c984a into cataclysmbnteam:upload Apr 25, 2023
16 checks passed
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

2023-04-25.21-32-15.mp4

knockback now works correctly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src PR changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Trap wont activated on forced moved enemies
2 participants