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

Merged
merged 24 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
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 ],
This conversation was marked as resolved.
Show resolved Hide resolved
[ "offset_grip", 5 ]
]
},
{
Expand Down
1 change: 1 addition & 0 deletions data/json/items/gun/robofac_gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@
"type": "GUNMOD",
"copy-from": "grip",
"name": { "str": "integrated front grip" },
"blacklist_mod": [ "offset_grip" ],
"flags": [ "PUMP_RAIL_COMPATIBLE", "IRREMOVABLE" ]
},
{
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",
This conversation was marked 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 ] ]
}
]
38 changes: 38 additions & 0 deletions data/json/items/gunmod/rail.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,43 @@
"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.",
"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,
"mod_targets": [ "shotgun", "smg", "rifle" ],
"blacklist_mod": [
"combination_gun_shotgun",
"grip",
"grip_mod",
"wooden_grip",
"m203",
"m203_mod",
"m320_mod",
"m320_mod_mod",
"m6_shotgun",
"masterkey",
"masterkey_mod",
"m26_mass",
"m26_mass_mod",
"rm121aux",
"rm121aux_mod",
"u_shotgun",
"u_shotgun_mod",
"robofac_handguard"
],
"min_skills": [ [ "gun", 2 ] ]
}
]
Loading