Arrow rests now occupy their own "arrow rest" mod location (#62302)

* Arrow rests now occupy their own mod location of "arrow rest" * Added new "arrow rest" mod location to all bows * Lint
CleverRaven · Nov 20, 2022 · f6e4f2f · f6e4f2f
1 parent 09a7109
commit f6e4f2f
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 13 deletions.
diff --git a/data/json/items/gunmod/accessories.json b/data/json/items/gunmod/accessories.json
@@ -13,7 +13,7 @@
     "material": [ "plastic", "aluminum" ],
     "symbol": ":",
     "color": "dark_gray",
-    "location": "accessories",
+    "location": "arrow rest",
     "mod_targets": [ "bow" ],
     "dispersion_modifier": -20,
     "min_skills": [ [ "gun", 1 ] ]
@@ -32,7 +32,7 @@
     "material": [ "wood" ],
     "symbol": ":",
     "color": "dark_gray",
-    "location": "accessories",
+    "location": "arrow rest",
     "mod_targets": [ "bow" ],
     "dispersion_modifier": -20,
     "min_skills": [ [ "gun", 1 ] ]

diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json
@@ -420,7 +420,7 @@
     "sight_dispersion": 3000,
     "durability": 4,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ] ],
+    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
@@ -473,7 +473,7 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ] ],
+    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
@@ -507,7 +507,14 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
+    "valid_mod_locations": [
+      [ "underbarrel", 1 ],
+      [ "sights", 1 ],
+      [ "accessories", 2 ],
+      [ "stabilizer", 1 ],
+      [ "dampening", 1 ],
+      [ "arrow rest", 1 ]
+    ],
     "use_action": {
       "menu_text": "Tighten Limbs",
       "type": "transform",
@@ -607,7 +614,7 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ] ],
+    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
@@ -660,7 +667,7 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ] ],
+    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
@@ -716,7 +723,14 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
+    "valid_mod_locations": [
+      [ "underbarrel", 1 ],
+      [ "sights", 1 ],
+      [ "accessories", 2 ],
+      [ "stabilizer", 1 ],
+      [ "dampening", 1 ],
+      [ "arrow rest", 1 ]
+    ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
@@ -773,7 +787,14 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
+    "valid_mod_locations": [
+      [ "underbarrel", 1 ],
+      [ "sights", 1 ],
+      [ "accessories", 2 ],
+      [ "stabilizer", 1 ],
+      [ "dampening", 1 ],
+      [ "arrow rest", 1 ]
+    ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ],
     "use_action": {
@@ -806,7 +827,14 @@
     "bashing": 12,
     "flags": [ "NO_TURRET" ],
     "modes": [ [ "DEFAULT", "disassembled", 0, [ "MELEE" ] ] ],
-    "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
+    "valid_mod_locations": [
+      [ "underbarrel", 1 ],
+      [ "sights", 1 ],
+      [ "accessories", 2 ],
+      [ "stabilizer", 1 ],
+      [ "dampening", 1 ],
+      [ "arrow rest", 1 ]
+    ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ],
     "use_action": {
       "need_wielding": true,
@@ -865,7 +893,7 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ] ],
+    "valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
@@ -927,7 +955,14 @@
     "dispersion": 1000,
     "sight_dispersion": 3000,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
+    "valid_mod_locations": [
+      [ "underbarrel", 1 ],
+      [ "sights", 1 ],
+      [ "accessories", 2 ],
+      [ "stabilizer", 1 ],
+      [ "dampening", 1 ],
+      [ "arrow rest", 1 ]
+    ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
@@ -980,7 +1015,7 @@
     "sight_dispersion": 3000,
     "durability": 6,
     "clip_size": 1,
-    "valid_mod_locations": [ [ "sights", 1 ], [ "accessories", 2 ], [ "dampening", 1 ] ],
+    "valid_mod_locations": [ [ "sights", 1 ], [ "accessories", 2 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   }