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

make ammo_effect_WIDE actually work #78935

Merged
merged 2 commits into from
Jan 4, 2025
Merged

make ammo_effect_WIDE actually work #78935

merged 2 commits into from
Jan 4, 2025

Conversation

osuphobia
Copy link
Contributor

@osuphobia osuphobia commented Jan 4, 2025 •
edited
Loading

Summary

Bugfixes "make ammo_effect_WIDE actually work"

Purpose of change

Despite the description saying Prevent HARDTOSHOOT monster flag from having any effect, WIDE is applied to shots but not actually used.

Describe the solution

Make shots with ammo_effect_WIDE ignore mon_flag_HARDTOSHOOT.

Describe alternatives you've considered

WIDE also ignores json_flag_HARDTOHIT.

Testing

Before
2025-01-04 104729
After
2025-01-04 104857

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 4, 2025
moxian
moxian reviewed Jan 4, 2025
View reviewed changes
src/ballistics.cpp Outdated Show resolved Hide resolved
osuphobia
osuphobia commented Jan 4, 2025
View reviewed changes
src/ballistics.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jan 4, 2025
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jan 4, 2025
@osuphobia osuphobia changed the title make ammo_effect_WIDE to actually work make ammo_effect_WIDE actually work Jan 4, 2025
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 4, 2025
@Maleclypse Maleclypse merged commit 774f85b into CleverRaven:master Jan 4, 2025
23 of 28 checks passed
@osuphobia osuphobia deleted the WIDE branch January 4, 2025 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moxian moxian moxian left review comments

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] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Monsters Monsters both friendly and unfriendly.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@osuphobia @moxian @Maleclypse