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

12ga stocks and brass catcher fixes #35888

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
12ga stocks and brass catcher fixes
  • Loading branch information
tenmillimaster committed Dec 6, 2019

Verified

This commit was signed with the committer’s verified signature. The key has expired.
frenck Franck Nijhof
commit 4d309118b74acaeffabc68ae7487ff6d9cd4060d
15 changes: 12 additions & 3 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@
"burst": 6,
"ups_charges": 1,
"reload": 200,
"valid_mod_locations": [ [ "accessories", 4 ], [ "sights", 1 ], [ "sling", 1 ], [ "rail mount", 1 ] ],
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a specific reason to remove sling slot here? Not that it's very useful to carry a gun that can't be fired unmounted on your back, but still.

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you know of any gatling guns that come with sling swivels?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't. Though if the only issue is that it may lack sling swivels, guess I may later add a gunmod which allows attaching a sling on such unusual guns. Nevermind then.

"valid_mod_locations": [ [ "accessories", 4 ], [ "sights", 1 ], [ "rail mount", 1 ] ],
"magazines": [ [ "shot", [ "shotbelt_20" ] ] ],
"flags": [ "MOUNTED_GUN" ]
},
@@ -131,6 +131,7 @@
[ "barrel", 1 ],
[ "rail mount", 1 ],
[ "loading port", 1 ],
[ "brass catcher", 1 ],
[ "sights", 1 ],
[ "underbarrel mount", 1 ]
],
@@ -210,6 +211,7 @@
[ "barrel", 1 ],
[ "rail mount", 1 ],
[ "loading port", 1 ],
[ "brass catcher", 1 ],
[ "sights", 1 ],
[ "underbarrel mount", 1 ]
],
@@ -360,6 +362,7 @@
"valid_mod_locations": [
[ "accessories", 2 ],
[ "sling", 1 ],
[ "brass catcher", 1 ],
[ "barrel", 1 ],
[ "rail mount", 1 ],
[ "loading port", 1 ],
@@ -421,6 +424,7 @@
[ "stock mount", 1 ],
[ "mechanism", 4 ],
[ "barrel", 1 ],
[ "brass catcher", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
@@ -504,7 +508,8 @@
"clip_size": 12,
"reload": 220,
"barrel_length": "36 ml",
"default_mods": [ "wire_stock", "grip" ],
"default_mods": [ "grip" ],
"built_in_mods": [ "wire_stock" ],
"modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "3-round", 3 ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
@@ -538,7 +543,7 @@
"durability": 6,
"clip_size": 9,
"ranged_damage": 1,
"default_mods": [ "wire_stock" ],
"built_in_mods": [ "wire_stock" ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "bore", 1 ],
@@ -610,6 +615,7 @@
[ "sling", 1 ],
[ "muzzle", 1 ],
[ "grip", 1 ],
[ "brass catcher", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
@@ -643,6 +649,7 @@
[ "mechanism", 2 ],
[ "barrel", 1 ],
[ "grip mount", 1 ],
[ "brass catcher", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
@@ -672,6 +679,8 @@
[ "mechanism", 2 ],
[ "barrel", 1 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "brass catcher", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
2 changes: 1 addition & 1 deletion data/json/items/gunmod/stock.json
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
"color": "dark_gray",
"location": "stock",
"handling_modifier": 2,
"mod_targets": [ "pistol", "smg", "rifle" ],
"mod_targets": [ "pistol", "smg", "rifle", "shotgun" ],
"min_skills": [ [ "weapon", 3 ] ],
"flags": [ "NEEDS_UNFOLD" ]
},