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 gun shy trait #76660

Merged
merged 2 commits into from
Sep 28, 2024
Merged

fix gun shy trait #76660

merged 2 commits into from
Sep 28, 2024

Conversation

KeremBabaG
Copy link
Contributor

@KeremBabaG KeremBabaG commented Sep 25, 2024

Summary

Bugfixes "Fix gun shy trait"

Purpose of change

Even when your weapon is not a firearm, gun shy trait prevented you from shooting it. It also crashes the game when you try to fire any turret mounted weapon
And oh my god it crashes when you try to draw out(f) a weapon as well, so fixing tis as well
fixes #76651

Describe the solution

Add the firearm condition along with the gun shy trait in gunmode_checks_common
include holding a firearm in gunshy condition in fire() (this fixes the holster and turret issues as well)

Describe alternatives you've considered

All bows use gunpowder to shoot

Testing

Bows and other stuff work and game no longer crashes hen firing a turret/drawing out a weapon

Additional context

glad to see that im still squeezed onto seats as a normal sized character

@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) labels Sep 25, 2024
@KeremBabaG KeremBabaG changed the title fix primitives fix gun shy trait Sep 25, 2024
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Sep 25, 2024
@KeremBabaG
Copy link
Contributor Author

KeremBabaG commented Sep 25, 2024

Oh and the game crashes when I try to use a mounted gun which is troubling
Edit: Yup, fired up the dry version of latest experimental and it crashed with the trait as well.

@KeremBabaG KeremBabaG marked this pull request as ready for review September 26, 2024 20:22
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 27, 2024
@Maleclypse Maleclypse merged commit 8c79924 into CleverRaven:master Sep 28, 2024
38 of 46 checks passed
@KeremBabaG KeremBabaG deleted the gun-shy-fix branch September 28, 2024 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

"gun shy" trait still prevents use of bows.
2 participants