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

Jump to bottom

Change most (x)bows to require mod mounts, and add bow-specific mounts #35884

Closed
wants to merge 3 commits into from
Closed

Change most (x)bows to require mod mounts, and add bow-specific mounts #35884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24aa2f
Change non-modern crossbows to require mod mounts
TheShadowFerret Dec 5, 2019
e835049
Add mod mount slots for non-modern bows, remove second accessories slot
TheShadowFerret Dec 5, 2019
e195d60
Add bow sight mounts
TheShadowFerret Dec 6, 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
42 changes: 33 additions & 9 deletions data/json/items/archery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,13 @@
"durability": 6,
"clip_size": 1,
"reload": 30,
"valid_mod_locations": [ [ "dampening", 1 ] ]
"valid_mod_locations": [
[ "dampening", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ],
[ "accesories mount", 1 ],
[ "stabilizer mount", 1 ]
]
},
{
"id": "compbow",
Expand Down Expand Up @@ -391,7 +397,7 @@
"durability": 6,
"clip_size": 1,
"reload": 110,
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
"use_action": {
"menu_text": "Tighten Limbs",
"type": "transform",
Expand Down Expand Up @@ -466,7 +472,13 @@
"durability": 6,
"clip_size": 1,
"reload": 35,
"valid_mod_locations": [ [ "dampening", 1 ] ]
"valid_mod_locations": [
[ "dampening", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ],
[ "accesories mount", 1 ],
[ "stabilizer mount", 1 ]
]
},
{
"id": "recurbow",
Expand Down Expand Up @@ -494,7 +506,7 @@
"durability": 6,
"clip_size": 1,
"reload": 90,
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
},
{
"id": "reflexbow",
Expand Down Expand Up @@ -522,7 +534,13 @@
"durability": 6,
"clip_size": 1,
"reload": 40,
"valid_mod_locations": [ [ "dampening", 1 ] ]
"valid_mod_locations": [
[ "dampening", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ],
[ "accesories mount", 1 ],
[ "stabilizer mount", 1 ]
]
},
{
"id": "hybridbow",
Expand Down Expand Up @@ -550,7 +568,7 @@
"durability": 6,
"clip_size": 1,
"reload": 80,
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
},
{
"id": "longbow",
Expand Down Expand Up @@ -578,7 +596,13 @@
"durability": 6,
"clip_size": 1,
"reload": 70,
"valid_mod_locations": [ [ "dampening", 1 ] ]
"valid_mod_locations": [
[ "dampening", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ],
[ "accesories mount", 1 ],
[ "stabilizer mount", 1 ]
]
},
{
"id": "woodgreatbow",
Expand Down Expand Up @@ -623,7 +647,7 @@
"range": 22,
"dispersion": 100,
"clip_size": 1,
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
},
{
"id": "reflexrecurvebow",
Expand Down Expand Up @@ -651,7 +675,7 @@
"durability": 6,
"clip_size": 1,
"reload": 40,
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
"valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
},
{
"type": "GENERIC",
Expand Down
32 changes: 16 additions & 16 deletions data/json/items/crossbows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,12 @@
"clip_size": 1,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "grip", 1 ],
[ "grip mount", 1 ],
[ "mechanism", 4 ],
[ "rail", 1 ],
[ "sights", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ],
[ "dampening", 1 ]
]
},
Expand Down Expand Up @@ -301,10 +301,10 @@
"reload": 500,
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "grip mount", 1 ],
[ "mechanism", 4 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "stock mount", 1 ],
[ "dampening", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
Expand Down Expand Up @@ -413,13 +413,13 @@
"reload": 6000,
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "grip mount", 1 ],
[ "mechanism", 4 ],
[ "rail", 1 ],
[ "sights", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ],
[ "dampening", 1 ]
]
},
Expand Down Expand Up @@ -450,12 +450,12 @@
"reload": 50,
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "grip mount", 1 ],
[ "mechanism", 4 ],
[ "rail", 1 ],
[ "rail mount", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ],
[ "dampening", 1 ]
]
}
Expand Down
56 changes: 55 additions & 1 deletion data/json/items/gunmod/mount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,64 @@
"symbol": ":",
"color": "light_gray",
"location": "underbarrel mount",
"mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher", "bow" ],
"mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
"//install_time": 15000,
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "underbarrel", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "sight_mount_bow",
"type": "GUNMOD",
"name": "bow sight mount",
"description": "This is a steel and plastic mount for attaching a sight, designed to be permanently installed onto almost any bow, along with some fasteners. Ideal for bringing out your inner tacticool on traditional bows.",
"weight": "10 g",
"volume": "8ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "sights mount",
"mod_targets": [ "bow" ],
"//install_time": 15000,
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "sights", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "underbarrel_mount_bow",
"type": "GUNMOD",
"name": "bow bottom mount",
"description": "This is a plastic mount for attaching an underbarrel accessory, designed to be permanently installed onto almost any bow, along with some fasteners. Ideal for bringing out your inner tacticool on traditional bows.",
"weight": "10 g",
"volume": "8ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "underbarrel mount",
"mod_targets": [ "bow" ],
"//install_time": 15000,
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "underbarrel", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "stabalizer_mount_bow",
"type": "GUNMOD",
"name": "bow stabilizer mount",
"description": "This is a plastic mount for attaching a stabalizer, designed to be permanently installed onto almost any bow, along with some fasteners. Ideal for bringing out your inner tacticool on traditional bows.",
"weight": "10 g",
"volume": "8ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "stabilizer mount",
"mod_targets": [ "bow" ],
"//install_time": 15000,
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "stabilizer", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
}
]
10 changes: 5 additions & 5 deletions data/json/items/ranged.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,13 @@
"loudness": 3,
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "grip mount", 1 ],
[ "mechanism", 4 ],
[ "rail", 1 ],
[ "sights", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ]
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
]
},
{
Expand Down