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

feat: fire extinguishers put out creatures too #4489

Merged

Conversation

chaosvolt
Copy link
Member

Purpose of change

A lil thing that was requested a while back, this allows hosing someone down (including yourself) with a fire extinguisher to also fix being on fire, instead of leaving you to continue patting yourself down and only fixing the ground being on fire.

Describe the solution

In iuse.cpp, added a section to iuse::extinguisher that checks if a creature of any sort is present in the targeted tile after affecting fields and blinding monsters, then removing the on fire status if present on them.

Describe alternatives you've considered

Procrastinating even more.

Testing

  1. Compiled and load-tested.
  2. Spawned myself in some fire and used extinguisher on myself afterward, puts myself out now in addition to removing the fire.
  3. Repeated this on my starter NPC, likewise they're put out by it.
  4. Lit up a tough zombie (had to use raging fire specifically to confirm they'd show as extinguished) then hit them with a dose of the extinguisher, it blinds them as well as putting out the fire both on the ground and on them.
  5. Checked affected file for astyle.

Additional context

Checklist

@github-actions github-actions bot added the src changes related to source code. label Apr 15, 2024
@Lamandus
Copy link
Contributor

ah yes. !!SCIENCE!!

@scarf005 scarf005 self-requested a review April 16, 2024 04:55
@scarf005 scarf005 self-assigned this Apr 16, 2024
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.

image
image

@scarf005 scarf005 merged commit 84e56da into cataclysmbnteam:main Apr 16, 2024
13 checks passed
@chaosvolt chaosvolt deleted the fire-extinguisher-goes-fwoosh branch April 16, 2024 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants