Cleanup crossbow bolts (#68377)

* initial commit * Apply suggestions from code review
CleverRaven · Sep 29, 2023 · 1400e51 · 1400e51
1 parent efcf956
commit 1400e51
Show file tree

Hide file tree

Showing 11 changed files with 113 additions and 173 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -802,7 +802,6 @@
     "id": "recycle_iron",
     "type": "item_group",
     "items": [
-      { "item": "bolt_metal", "prob": 15, "charges-min": 1, "charges-max": 3 },
       { "item": "oil_lamp", "prob": 20, "charges-min": 0, "charges-max": 3 },
       [ "steam_triple_small", 1 ],
       [ "steam_triple_medium", 1 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -673,7 +673,7 @@
       [ "duffelbag", 25 ],
       [ "backpack_tactical_large", 10 ],
       [ "binoculars", 20 ],
-      [ "bolt_steel", 7 ],
+      { "group": "crossbow_bolts", "prob": 7 },
       [ "crossbow", 2 ],
       { "group": "book_gunmags", "prob": 70 },
       [ "mag_fieldrepair", 100 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1563,7 +1563,7 @@
     "items": [
       { "group": "ammo_obscure", "prob": 90 },
       { "group": "archery_ammo", "prob": 60 },
-      [ "bolt_metal", 60 ],
+      { "group": "crossbow_bolts", "prob": 60 },
       { "group": "ammo_reloaded", "prob": 30 },
       { "group": "mags_obscure", "prob": 30 },
       { "group": "ammo_cannon", "prob": 10 }

diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
@@ -275,8 +275,9 @@
       [ "cowboy_hat", 4 ],
       [ "10gal_hat", 4 ],
       { "item": "bb", "prob": 8, "charges": [ 1, 500 ] },
-      [ "bolt_steel", 7 ],
-      [ "bolt_cf", 5 ],
+      { "group": "knife_rambo_cont", "prob": 20 },
+      { "group": "crossbow_bolts", "prob": 5 },
+      { "group": "crossbow_bolts_makeshift", "prob": 7 },
       { "item": "bbgun", "prob": 10, "charges": [ 0, 150 ] },
       [ "crossbow", 2 ],
       [ "compcrossbow", 2 ],

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -154,9 +154,6 @@
       { "item": "arrow_wood", "prob": 100, "count": [ 10, 30 ] },
       { "item": "arrow_field_point_fletched", "prob": 50, "count": [ 10, 30 ] },
       { "item": "arrow_cf", "prob": 100, "count": [ 10, 30 ] },
-      { "item": "bolt_wood", "prob": 100, "count": [ 10, 30 ] },
-      { "item": "bolt_wood_bodkin", "prob": 50, "count": [ 10, 30 ] },
-      { "item": "bolt_cf", "prob": 100, "count": [ 10, 30 ] },
       { "item": "arrow_small_game_fletched", "prob": 100, "count": [ 10, 30 ] },
       { "item": "arrow_heavy_field_point_fletched", "prob": 100, "count": [ 10, 30 ] },
       { "item": "arrow_metal", "prob": 100, "count": [ 10, 30 ] },
@@ -186,5 +183,35 @@
     "id": "archery_quivers",
     "subtype": "distribution",
     "entries": [ { "item": "quiver", "prob": 100 }, { "item": "quiver_large", "prob": 50 }, { "item": "nylon_quiver", "prob": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "crossbow_bolts",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "bolt_makeshift", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_wood", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_wood_bodkin", "prob": 50, "count": [ 10, 30 ] },
+      { "item": "bolt_wood_small_game", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_metal", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_steel", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_steel_bodkin", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_steel_target", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_cf", "prob": 100, "count": [ 10, 30 ] }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "crossbow_bolts_makeshift",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "bolt_crude", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_simple_wood", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_simple_small_game", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_makeshift", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_wood", "prob": 100, "count": [ 10, 30 ] },
+      { "item": "bolt_wood_bodkin", "prob": 50, "count": [ 10, 30 ] },
+      { "item": "bolt_wood_small_game", "prob": 100, "count": [ 10, 30 ] }
+    ]
   }
 ]