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 mods + spawns #76416

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a310a3e
Update rail.json
Seb-The-SamMarten Sep 13, 2024
f52c9e0
Update brass_catcher.json
Seb-The-SamMarten Sep 13, 2024
88cf302
Update gunmod.json
Seb-The-SamMarten Sep 13, 2024
d80c13a
Update gunmod.json
Seb-The-SamMarten Sep 13, 2024
5221284
Update rail.json
Seb-The-SamMarten Sep 13, 2024
b013920
Update rail.json
Seb-The-SamMarten Sep 13, 2024
827b13c
Update rail.json
Seb-The-SamMarten Sep 14, 2024
a416a2b
Update rail.json
Seb-The-SamMarten Sep 14, 2024
0ebc082
Update brass_catcher.json
Seb-The-SamMarten Sep 14, 2024
3678e0a
Update rail.json
Seb-The-SamMarten Sep 14, 2024
83bdf7a
Update data/json/items/gunmod/rail.json
Seb-The-SamMarten Sep 14, 2024
8ebe2b9
Update rail.json
Seb-The-SamMarten Sep 14, 2024
2007506
Update data/json/items/gunmod/rail.json
Seb-The-SamMarten Sep 14, 2024
e9fbb34
Merge branch 'CleverRaven:master' into GunMods
Seb-The-SamMarten Sep 15, 2024
42ab181
Merge branch 'CleverRaven:master' into GunMods
Seb-The-SamMarten Sep 16, 2024
2fdbc67
Update rail.json
Seb-The-SamMarten Sep 17, 2024
877c66e
Update rail.json
Seb-The-SamMarten Sep 18, 2024
180a602
Merge branch 'CleverRaven:master' into GunMods
Seb-The-SamMarten Sep 18, 2024
6965a3d
Merge branch 'CleverRaven:master' into GunMods
Seb-The-SamMarten Sep 18, 2024
4591c60
Merge branch 'CleverRaven:master' into GunMods
Seb-The-SamMarten Sep 21, 2024
4b2f411
Adding necessary files
Seb-The-SamMarten Sep 21, 2024
efaa5be
Delete robofac_gun.json
Seb-The-SamMarten Sep 21, 2024
e8a733a
Added robofac_gun.json
SebTheSamMarten Sep 21, 2024
6180cf8
Update data/json/items/gun/robofac_gun.json
Seb-The-SamMarten Sep 21, 2024
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
4 changes: 3 additions & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
[ "cheek_pad", 25 ],
[ "rail_laser_sight", 40 ],
[ "red_dot_sight", 70 ],
[ "choke", 50 ]
[ "choke", 50 ],
[ "big_brass_catcher", 20 ],
Seb-The-SamMarten marked this conversation as resolved.
Show resolved Hide resolved
[ "offset_grip", 5 ]
]
},
{
Expand Down
19 changes: 19 additions & 0 deletions data/json/items/gunmod/brass_catcher.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,24 @@
"pocket_data": [ { "pocket_type": "CONTAINER", "rigid": true, "max_contains_volume": "249 ml", "max_contains_weight": "1 kg" } ],
"flags": [ "BRASS_CATCHER" ],
"min_skills": [ [ "weapon", 1 ] ]
},
{
"id": "big_brass_catcher",
Seb-The-SamMarten marked this conversation as resolved.
Show resolved Hide resolved
"type": "GUNMOD",
"name": { "str": "big brass catcher" },
"description": "A bag that hangs off the side of your gun and catches ejected casings so you don't have to pick them up. This one is larger and made of canvas, so it can catch more casings before needing to be emptied. Though the added convenience comes at the cost of being bulkier.",
"weight": "228 g",
"volume": "300 ml",
"price": "40 USD",
"price_postapoc": "1 USD",
"install_time": "45 s",
"material": [ "canvas" ],
"symbol": ":",
"color": "light_gray",
"location": "brass catcher",
"mod_targets": [ "shotgun", "smg", "rifle", "pistol", "launcher" ],
"pocket_data": [ { "pocket_type": "CONTAINER", "rigid": false, "max_contains_volume": "500 ml", "max_contains_weight": "2 kg" } ],
"flags": [ "BRASS_CATCHER" ],
"min_skills": [ [ "gun", 1 ] ]
}
]
20 changes: 20 additions & 0 deletions data/json/items/gunmod/rail.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,25 @@
"mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
"flags": [ "LASER_SIGHT" ],
"min_skills": [ [ "weapon", 2 ], [ "gun", 1 ] ]
},
{
"id": "offset_grip",
"type": "GUNMOD",
"name": { "str": "offset grip" },
"description": "An angled grip set at 45° that attaches to a side rail, allowing for a grip while leaving the underbarrel rail free, or on guns that have integral bipods. Also allows for slightly greater control with smaller movements.",
"weight": "125 g",
"volume": "250 ml",
"price": "300 USD",
"price_postapoc": "7 USD 50 cent",
"install_time": "2 m",
"material": [ "steel" ],
"symbol": ":",
"color": "light_gray",
"location": "rail",
"handling_modifier": 4,
"aim_speed_modifier": 3,
Seb-The-SamMarten marked this conversation as resolved.
Show resolved Hide resolved
"mod_targets": [ "shotgun", "smg", "rifle" ],
"blacklist_mod": [ "light_grip", "pistol_grip", "breacher_grip" ],
"min_skills": [ [ "gun", 2 ] ]
}
]
Loading