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

Fix water cannons #1654

Merged
merged 5 commits into from
Jun 28, 2022
Merged

Conversation

olanti-p
Copy link
Contributor

Summary

SUMMARY: Bugfixes "Fixed debugmsg when firing water cannons"

Purpose of change

Fix #1638

Describe the solution

Move the flag from water cannon to water.
Validate gun (and gunmod) ammo effects on load.

Describe alternatives you've considered

Something more complex that allows gun(mods) to alter ammo recovery rates, but upon searching through BN repo and Kenan's modpack there seemed to be no cases of that actually being used in some meaningful way.

Testing

Loaded a random world, spawned fire engine, fired the water cannons.
Before fix: a debugmsg, no puddles.
After fix: a puddle, no debugmsgs.

@Coolthulhu Coolthulhu self-assigned this Jun 28, 2022
@Coolthulhu Coolthulhu merged commit 5ce81ea into cataclysmbnteam:upload Jun 28, 2022
joveeater pushed a commit to joveeater/Cataclysm-BN that referenced this pull request Jul 10, 2022
* Move RECOVER_10 from water cannon to water

* Validate gun(mod) ammo effects on startup

* Fix couple errors found by the new check

* Fix No Hope

* Fix Aftershock
@olanti-p olanti-p deleted the fix-water-cannon branch July 17, 2022 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Water cannon "RECOVER_10" error message
2 participants