From a24aa2f9fa95c75188e4c2597bc773cd8d9c636b Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Thu, 5 Dec 2019 14:29:28 -0500 Subject: [PATCH 1/3] Change non-modern crossbows to require mod mounts --- data/json/items/crossbows.json | 32 ++++++++++++++++---------------- data/json/items/ranged.json | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/data/json/items/crossbows.json b/data/json/items/crossbows.json index cdd1f20007dc9..c9ecceaa27454 100644 --- a/data/json/items/crossbows.json +++ b/data/json/items/crossbows.json @@ -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 ] ] }, @@ -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 ], @@ -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 ] ] }, @@ -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 ] ] } diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index f176c72a8eb4b..8455d76e2a800 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -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 ] ] }, { From e835049cc97faefcbb3194ff3c90cb1f1578767d Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Thu, 5 Dec 2019 18:45:15 -0500 Subject: [PATCH 2/3] Add mod mount slots for non-modern bows, remove second accessories slot --- data/json/items/archery.json | 42 ++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/data/json/items/archery.json b/data/json/items/archery.json index 99e737071c557..b1139976c51e6 100644 --- a/data/json/items/archery.json +++ b/data/json/items/archery.json @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", From e195d602e68b5f2ae55c6749dcd1432f09cc308f Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Fri, 6 Dec 2019 15:43:41 -0500 Subject: [PATCH 3/3] Add bow sight mounts --- data/json/items/gunmod/mount.json | 56 ++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/data/json/items/gunmod/mount.json b/data/json/items/gunmod/mount.json index 8dc42f867fdfe..0650a0d459f0c 100644 --- a/data/json/items/gunmod/mount.json +++ b/data/json/items/gunmod/mount.json @@ -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" ] } ]