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 Bayonets (remove reach atk. mode flag, and other stuff too) #69666

Merged
merged 1 commit into from
Nov 23, 2023

Conversation

tenmillimaster
Copy link
Member

Summary

None

Purpose of change

Makeshift bayonet still gave a reach attack. Also I thought about it some more and figure underbarrel was the right home for it afterall, not bayonet lug, as we'd want this to be installed on pretty much everything.
The mode_modifier entry in bayonets added an unnecessary REACH_ATTACK flag in reachless bayonets.
Also I missed adding the enfield bayonet to all the underbarrel slot conflicting items .

Describe the solution

Adds Enfield Bayonet as a conflict on appropriate gunmods.
Removes vestigial reach attack flag.
Removes reach attack range from makeshift bayonet.
Flips makeshift bayonet back to underbarrel slot.

Describe alternatives you've considered

None

Testing

Loaded game. Made sure bayonets were still adding additional damage and beat up the poor debug monster a bit.

Additional context

None.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 23, 2023
@Maleclypse Maleclypse merged commit 5c2611d into CleverRaven:master Nov 23, 2023
@tenmillimaster tenmillimaster deleted the stabbies branch November 23, 2023 16:10
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 [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants