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

Add installable gunmods to provide slots for other gunmods #30817

Merged
merged 4 commits into from
Jun 23, 2019
Merged

Add installable gunmods to provide slots for other gunmods #30817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35e581d
Implement installable gunmods to mod other gunmods
ArkoselabsDoesNotWork-153164711 May 24, 2019
fbff721
Fix bottom mount and delete double empty line
ArkoselabsDoesNotWork-153164711 May 25, 2019
57d3f57
Update
ArkoselabsDoesNotWork-153164711 May 27, 2019
0f1c48e
Merge branch 'master' into tacticalflintlocks
ArkoselabsDoesNotWork-153164711 Jun 15, 2019
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
20 changes: 17 additions & 3 deletions data/json/items/classes/gun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"name": "base launcher",
"skill": "launcher",
"modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ] ],
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "sights", 1 ] ],
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "sights", 1 ], [ "sling", 1 ] ],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ]
},
{
Expand Down Expand Up @@ -58,7 +58,19 @@
"type": "GUN",
"name": "backup pistol",
"//": "diminuitive backup pistols that lack underbarrel rails, sight dovetails and decent places to affix stocks.",
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 2 ] ]
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "grip", 1 ],
[ "mechanism", 2 ],
[ "muzzle", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
]
},
{
"abstract": "pistol_revolver",
Expand All @@ -75,7 +87,9 @@
[ "grip", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ],
[ "stock", 1 ]
[ "stock", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
]
},
{
Expand Down
12 changes: 11 additions & 1 deletion data/json/items/crossbows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,17 @@
"durability": 6,
"clip_size": 1,
"reload": 500,
"valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "sling", 1 ], [ "stock", 1 ], [ "dampening", 1 ] ]
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "mechanism", 4 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "dampening", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
]
},
{
"id": "compositecrossbow",
Expand Down
24 changes: 22 additions & 2 deletions data/json/items/gun/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
{
"id": "moss_brownie",
"copy-from": "pistol_backup",
"copy-from": "pistol_base",
"type": "GUN",
"name": "Mossberg Brownie",
"name_plural": "Mossberg Brownie",
Expand All @@ -94,6 +94,17 @@
"dispersion": 520,
"durability": 6,
"clip_size": 4,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "grip", 1 ],
[ "mechanism", 2 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
{
Expand All @@ -120,7 +131,16 @@
"clip_size": 1,
"reload": 200,
"barrel_length": 2,
"valid_mod_locations": [ [ "accessories", 2 ], [ "muzzle", 1 ], [ "sling", 1 ], [ "stock", 1 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down
37 changes: 32 additions & 5 deletions data/json/items/gun/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"dispersion": 140,
"durability": 3,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
"valid_mod_locations": [ [ "accessories", 2 ], [ "brass catcher", 1 ], [ "sling", 1 ] ],
"valid_mod_locations": [ [ "accessories", 2 ], [ "brass catcher", 1 ], [ "muzzle", 1 ], [ "sling", 1 ] ],
"magazines": [ [ "223", [ "lw223mag", "lw223bigmag" ] ] ],
"flags": [ "DISABLE_SIGHTS" ]
},
Expand All @@ -147,6 +147,7 @@
"valid_mod_locations": [
[ "accessories", 2 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "barrel", 1 ],
Expand All @@ -170,6 +171,7 @@
"valid_mod_locations": [
[ "accessories", 2 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "barrel", 1 ],
Expand All @@ -192,6 +194,7 @@
"valid_mod_locations": [
[ "accessories", 2 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "barrel", 1 ],
Expand All @@ -209,7 +212,15 @@
"durability": 9,
"relative": { "weight": 1200, "volume": 2 },
"built_in_mods": [ "lead_acog_scope", "lead_red_dot_sight", "lead_grip", "lead_glm", "lead_stabilizer" ],
"valid_mod_locations": [ [ "accessories", 2 ], [ "brass catcher", 1 ], [ "sights", 2 ], [ "sling", 1 ], [ "underbarrel", 2 ], [ "rail", 1 ] ]
"valid_mod_locations": [
[ "accessories", 2 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "sights", 2 ],
[ "sling", 1 ],
[ "underbarrel", 2 ],
[ "rail", 1 ]
]
},
{
"id": "m249",
Expand Down Expand Up @@ -302,7 +313,16 @@
"clip_size": 1,
"reload": 200,
"barrel_length": 4,
"valid_mod_locations": [ [ "accessories", 2 ], [ "muzzle", 1 ], [ "sling", 1 ], [ "stock", 1 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -332,7 +352,11 @@
[ "mechanism", 4 ],
[ "muzzle", 1 ],
[ "sights", 1 ],
[ "sling", 1 ]
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"magazines": [ [ "223", [ "ruger5", "stanag10", "ruger30" ] ] ]
},
Expand Down Expand Up @@ -439,7 +463,10 @@
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ]
[ "underbarrel", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ]
],
"magazines": [ [ "223", [ "survivor223mag", "stanag30", "stanag50" ] ] ]
}
Expand Down
24 changes: 20 additions & 4 deletions data/json/items/gun/3006.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@
[ "mechanism", 4 ],
[ "muzzle", 1 ],
[ "sights", 1 ],
[ "sling", 1 ]
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"magazines": [ [ "3006", [ "3006_clip" ] ] ],
"flags": [ "RELOAD_ONE" ]
Expand Down Expand Up @@ -167,7 +171,7 @@
"name": "pipe rifle: .30-06",
"name_plural": "pipe rifles: .30-06",
"//": "It's the same size as the others, but it's still a scrap weapon.",
"description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds. This one is made to support more gun attachments.",
"description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
"weight": 4080,
"volume": 12,
"price": 110000,
Expand All @@ -185,7 +189,16 @@
"clip_size": 1,
"reload": 200,
"barrel_length": 4,
"valid_mod_locations": [ [ "accessories", 2 ], [ "muzzle", 1 ], [ "sling", 1 ], [ "stock", 1 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand All @@ -204,7 +217,10 @@
[ "mechanism", 4 ],
[ "muzzle", 1 ],
[ "sights", 1 ],
[ "sling", 1 ]
[ "sling", 1 ],
[ "rail mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"relative": { "durability": -3 },
"proportional": { "reload": 4 }
Expand Down
16 changes: 13 additions & 3 deletions data/json/items/gun/308.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@
[ "mechanism", 4 ],
[ "muzzle", 1 ],
[ "sights", 1 ],
[ "sling", 1 ]
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"magazines": [ [ "308", [ "m14mag", "m14smallmag" ] ] ]
},
Expand Down Expand Up @@ -231,7 +235,10 @@
[ "stock", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ],
[ "sling", 1 ]
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE" ]
},
Expand Down Expand Up @@ -299,7 +306,10 @@
[ "sling", 1 ],
[ "stock", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ]
[ "sights", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "NEVER_JAMS" ]
},
Expand Down
33 changes: 30 additions & 3 deletions data/json/items/gun/38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,19 @@
"durability": 3,
"clip_size": 2,
"reload": 200,
"valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "sights", 1 ],
[ "underbarrel", 1 ],
[ "rail mount", 1 ],
[ "stock mount", 1 ]
],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT" ]
},
{
"id": "cop_38",
"copy-from": "pistol_backup",
"copy-from": "pistol_base",
"type": "GUN",
"name": "COP .38",
"name_plural": "COP .38",
Expand All @@ -42,6 +49,17 @@
"dispersion": 520,
"durability": 6,
"clip_size": 4,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "grip", 1 ],
[ "mechanism", 2 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
{
Expand All @@ -67,7 +85,16 @@
"clip_size": 1,
"reload": 200,
"barrel_length": 3,
"valid_mod_locations": [ [ "accessories", 2 ], [ "muzzle", 1 ], [ "sling", 1 ], [ "stock", 1 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down
14 changes: 12 additions & 2 deletions data/json/items/gun/40.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,16 @@
"clip_size": 1,
"reload": 200,
"barrel_length": 3,
"valid_mod_locations": [ [ "accessories", 2 ], [ "muzzle", 1 ], [ "sling", 1 ], [ "stock", 1 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -162,7 +171,8 @@
[ "grip", 1 ],
[ "sights", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ]
[ "underbarrel", 1 ],
[ "rail mount", 1 ]
],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
Expand Down
Loading