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

Gun-shy #76536

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Gun-shy #76536

wants to merge 14 commits into from

Conversation

Consoleable
Copy link
Contributor

@Consoleable Consoleable commented Sep 18, 2024

Summary

Content "Adds Gun-shy Trait"

Purpose of change

Adds a gun-shy trait to character gen. Allows bows and the like but not firearms.

Describe the solution

adds gunshy trait, prevents user from firing guns and turret guns, similar functionality to brawler. Allows user to fire primitive ranged weapons like crossbows and bows.

Describe alternatives you've considered

Not adding the trait.

Testing

Tested crossbows with and without
Tested bow with and without
Tested glock 17 with and without
Tested firing mode of m16
Tested trying to fire m249 with and without
Tested firing double barrel shotgun with and without
Tested firing mp 40 with and without
Tested firing 3 inch ordinance rifle with and without
Teated firing staff sling with and without

Guns and ordinance cannot be fired, even if turret
Bows and crossbows and anything with "primitive_ranged_weapon" is allowed as per is_firearm()

I havent tested every gun but i did one in each category i think its ready for integration.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` labels Sep 18, 2024
@Consoleable Consoleable changed the title Gunshy Gun-shy Sep 18, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 18, 2024
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Sep 18, 2024
Copy link
Contributor

@TheShadowFerret TheShadowFerret left a comment

Choose a reason for hiding this comment

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

Since Gunshy encompasses what Brawler does + more, selecting both shouldn't be possible(esp. for people using legacy point select, since that's double points).

data/json/mutations/mutations.json Outdated Show resolved Hide resolved
data/json/mutations/mutations.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 19, 2024
@Consoleable
Copy link
Contributor Author

Since Gunshy encompasses what Brawler does + more, selecting both shouldn't be possible(esp. for people using legacy point select, since that's double points).

This is an excellent suggestion, dunno why i missed that!

@XygenSS
Copy link
Contributor

XygenSS commented Sep 19, 2024

Can you use rail mounted crossbows attached on a firearm?

@Consoleable
Copy link
Contributor Author

Can you use rail mounted crossbows attached on a firearm?

Will test this after work, most likely not though, still a WIP.
May have to add support in an additional update depending on how much work it would be to add.
Good suggestion!

@github-actions github-actions bot removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 19, 2024
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 19, 2024
@Consoleable Consoleable marked this pull request as ready for review September 19, 2024 15:08
@Aimless-dude
Copy link
Contributor

Will you still be able to use the crossbow turret, the Carroballista?

@Consoleable
Copy link
Contributor Author

Will you still be able to use the crossbow turret, the Carroballista?

The intention is yes, and the ballista does have Primitive_Ranged_weapon, so if it's not compatible it should be easy to patch.

Can you use rail mounted crossbows attached on a firearm?

This may not happen for some time as I think, as the weapon that the rail mounted crossbow is on would most likely be a firearm. Using it on a non-firearm with some kind it should still work though. The item is a gun mod, so the gun properties would be inherited from the base item.

@Consoleable
Copy link
Contributor Author

Will you still be able to use the crossbow turret, the Carroballista?

I've been looking into this, and it looks like it's a bit of a challenge to set up. I'm going to make an issue for this and handle it in a followup PR, because addressing this will require changing some more things in turrret.cpp and i don't want to scope creep
The ballistae isn't commonly used or easy to find, so i'll merge this version of the trait for now.

@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions and removed astyled astyled PR, label is assigned by github actions labels Sep 19, 2024
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 [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 Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants