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.

Sign up for GitHub

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

Jump to bottom

Fixes "Bloodless monsters can still get bled by butchery, leave blood splatter on ranged hits" #62189

Merged
merged 5 commits into from Nov 17, 2022
Merged

Fixes "Bloodless monsters can still get bled by butchery, leave blood splatter on ranged hits" #62189

merged 5 commits into from Nov 17, 2022

Conversation

alef
Copy link
Contributor

@alef alef commented Nov 12, 2022 •
edited

Summary

Bugfixes "Bloodless monsters do no bleed #62113 "

Purpose of change

Fixes #62113

Describe the solution

Fix the C++ code on the way during debug sessions in VS/SDL.

Describe alternatives you've considered

None

Testing

Following the steps in #62113.

Additional context

From mtype.h: Bleed rate in percent, 0 makes the monster immune to bleeding
From MONSTERS.md: 0 translates to bleed immunity

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 12, 2022
@alef
Copy link
Contributor Author

alef commented Nov 12, 2022

map::add_splatter should now receive an fd_null, which should not have is_splattering.

@alef alef marked this pull request as ready for review November 12, 2022 19:15
dseguin
dseguin approved these changes Nov 14, 2022
View reviewed changes
Copy link
Member

@dseguin dseguin left a comment

Choose a reason for hiding this comment

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

LGTM, just a few minor changes to make things more explicit.

src/ballistics.cpp Outdated Show resolved Hide resolved
src/game.cpp Outdated Show resolved Hide resolved
src/mtype.cpp Outdated Show resolved Hide resolved
alef and others added 2 commits November 14, 2022 14:22
@alef @dseguin
Check for bleed_rate > 0
cd6e451 
Co-authored-by: dseguin <davidseguin@live.ca>
@alef @dseguin
Make blood_type explicit
ecc124c 
Co-authored-by: dseguin <davidseguin@live.ca>
@alef alef requested a review from dseguin November 14, 2022 13:23
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 14, 2022
@Rivet-the-Zombie Rivet-the-Zombie merged commit 25a0ca0 into CleverRaven:master Nov 17, 2022
@alef alef deleted the 62113 branch November 17, 2022 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dseguin dseguin Awaiting requested review from dseguin

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bloodless monsters can still get bled by butchery, leave blood splatter on ranged hits
3 participants
@alef @dseguin @Rivet-the-Zombie