Improved random spawns (CleverRaven#68684)

* Quiver and Javelin bag spawns * Loaded Quivers * Lanyard spawns * Skateboard spawns * Lanyard fix
mqrause · Oct 16, 2023 · f10798b · f10798b
1 parent 356bfe5
commit f10798b
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 7 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1634,7 +1634,7 @@
       [ "eclipse_glasses", 1 ],
       [ "thermos", 20 ],
       [ "camera_bag", 5 ],
-      [ "quiver_takedown_bow", 1 ],
+      { "group": "archery_quivers", "prob": 1 },
       [ "santa_jacket", 1 ],
       [ "santa_jacket_short", 1 ],
       [ "santa_shorts", 1 ],
@@ -2711,6 +2711,7 @@
       [ "turtleneck_shirt", 25 ],
       [ "hoodie", 65 ],
       [ "jumpsuit", 20 ],
+      [ "lanyard", 10 ],
       [ "badge_doctor", 10 ],
       [ "hazmat_suit", 5 ],
       [ "cleansuit", 10 ]
@@ -3205,10 +3206,13 @@
       [ "dump_pouch", 6 ],
       [ "ragpouch", 22 ],
       [ "leather_pouch", 16 ],
+      { "group": "archery_loaded_quivers", "prob": 2 },
       [ "quiver", 10 ],
+      [ "nylon_quiver", 5 ],
       [ "quiver_birchbark", 4 ],
       [ "quiver_large", 6 ],
       [ "quiver_large_birchbark", 2 ],
+      [ "javelin_bag", 2 ],
       [ "wristwatch", 24 ],
       [ "diving_watch", 16 ],
       [ "pocketwatch", 14 ],
@@ -3911,7 +3915,8 @@
           { "item": "bookstrap", "prob": 5 },
           { "item": "camera_bag", "prob": 20 },
           { "item": "quiver_takedown_bow", "prob": 2 },
-          { "item": "quiver", "prob": 20 },
+          { "item": "nylon_quiver", "prob": 12 },
+          { "item": "quiver", "prob": 8 },
           { "item": "quiver_large", "prob": 15 },
           { "item": "solarpack", "prob": 5 },
           { "item": "ammo_satchel", "prob": 10 },

diff --git a/data/json/itemgroups/Clothing_Gear/wallets.json b/data/json/itemgroups/Clothing_Gear/wallets.json
@@ -15,9 +15,10 @@
     "type": "item_group",
     "id": "wallets_science",
     "items": [
-      { "group": "wallet_science_full", "prob": 50 },
-      { "group": "wallet_science_leather_full", "prob": 25 },
-      { "group": "wallet_science_stylish_full", "prob": 25 }
+      { "group": "wallet_science_full", "prob": 45 },
+      { "group": "wallet_science_leather_full", "prob": 20 },
+      { "group": "wallet_science_stylish_full", "prob": 20 },
+      { "group": "lanyard_science_full", "prob": 15 }
     ]
   },
   {
@@ -202,6 +203,24 @@
       [ "scorecard", 5 ]
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "lanyard_science_full",
+    "//": "No coins/cash cards and less physical money.",
+    "container-item": "lanyard",
+    "on_overflow": "discard",
+    "items": [
+      { "item": "id_science", "prob": 100 },
+      { "item": "id_science_visitor_1", "prob": 100 },
+      { "group": "banknotes", "prob": 80, "count": [ 1, 10 ] },
+      { "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
+      { "item": "condom", "prob": 10 },
+      { "item": "labmap", "prob": 20 },
+      { "item": "wallet_photo", "prob": 30 },
+      [ "scorecard", 20 ]
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "collection",

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -243,6 +243,7 @@
       [ "recipe_medicalmut", 1 ],
       [ "survnote", 1 ],
       [ "badge_doctor", 1 ],
+      [ "lanyard", 1 ],
       [ "tourist_table", 1 ],
       [ "thermos", 10 ],
       [ "left_leg_prosthetic", 40 ],
@@ -1983,6 +1984,7 @@
       [ "barometer", 3 ],
       [ "sextant", 2 ],
       [ "badge_doctor", 5 ],
+      [ "lanyard", 5 ],
       [ "dnd_handbook", 2 ],
       [ "bodypillow", 1 ],
       { "group": "writing_utensils", "prob": 10 }
@@ -2059,6 +2061,7 @@
       [ "roller_blades", 20 ],
       [ "rollerskates", 20 ],
       [ "roller_shoes_off", 20 ],
+      [ "folded_skateboard_generic", 20 ],
       [ "survnote", 3 ],
       { "group": "toy_radio_car", "prob": 3 },
       { "group": "toy_makerspace_kit", "prob": 1 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -469,7 +469,9 @@
       [ "oil_lamp", 5 ],
       [ "lamp_oil", 5 ],
       [ "flotation_vest", 1 ],
+      [ "javelin_bag", 1 ],
       [ "quiver_takedown_bow", 1 ],
+      [ "nylon_quiver", 2 ],
       [ "quiver", 2 ],
       [ "quiver_large", 1 ],
       [ "raging_bull", 1 ],
@@ -493,6 +495,7 @@
       [ "roller_blades", 20 ],
       [ "rollerskates", 10 ],
       [ "roller_shoes_off", 10 ],
+      [ "folded_skateboard_generic", 10 ],
       [ "runner_bag", 5 ],
       [ "gloves_tactical", 1 ],
       [ "glasses_bal", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -238,6 +238,7 @@
       [ "knee_pads", 80 ],
       [ "roller_blades", 40 ],
       [ "rollerskates", 10 ],
+      [ "folded_skateboard_generic", 10 ],
       { "prob": 80, "group": "aspirin_bottle_plastic_pill_painkiller_1_20" },
       { "item": "inhaler", "prob": 30, "charges-min": 10, "charges-max": 100 },
       { "group": "beer", "prob": 180 },

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -731,13 +731,17 @@
       [ "golf_club", 80 ],
       [ "roller_blades", 20 ],
       [ "rollerskates", 10 ],
+      [ "folded_skateboard_generic", 10 ],
+      [ "javelin_bag", 1 ],
       [ "longbow", 5 ],
       [ "compbow", 1 ],
       [ "shortbow", 5 ],
       [ "recurbow", 2 ],
       [ "takedown_recurbow", 1 ],
       [ "quiver_takedown_bow", 1 ],
       [ "reflexbow", 2 ],
+      { "group": "archery_loaded_quivers", "prob": 1 },
+      [ "nylon_quiver", 2 ],
       [ "quiver", 3 ],
       [ "fencing_jacket", 10 ],
       [ "fencing_mask", 10 ],

diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
@@ -118,6 +118,7 @@
       [ "knee_pads", 40 ],
       [ "roller_blades", 20 ],
       [ "rollerskates", 10 ],
+      [ "folded_skateboard_generic", 10 ],
       [ "wheel_skate", 50 ],
       [ "manual_throw", 12 ],
       { "prob": 12, "group": "protein_powder_bottle_plastic_small_1_9" },
@@ -199,8 +200,12 @@
       { "item": "recipe_bullets", "prob": 8 },
       { "item": "howto_traps", "prob": 16 },
       { "item": "extinguisher", "prob": 20, "charges": 100 },
+      { "item": "javelin_bag", "prob": 1 },
+      { "item": "nylon_quiver", "prob": 3 },
+      { "item": "quiver", "prob": 1 },
       { "item": "quiver_large", "prob": 1 },
       { "item": "quiver_takedown_bow", "prob": 1 },
+      { "group": "archery_loaded_quivers", "prob": 1 },
       { "item": "manual_archery", "prob": 7 },
       { "item": "book_archery", "prob": 12 },
       { "item": "protein_shake", "prob": 15 },
@@ -331,9 +336,12 @@
       [ "reflexbow", 2 ],
       [ "vambrace_larmor", 1 ],
       [ "quiver", 3 ],
+      [ "nylon_quiver", 3 ],
+      [ "quiver_large", 1 ],
       [ "hand_crossbow", 1 ],
       { "group": "makeshift_archery_ammo", "prob": 7 },
       { "group": "archery_ammo", "prob": 5 },
+      { "group": "archery_loaded_quivers", "prob": 2 },
       [ "wire", 50 ],
       [ "rollmat", 40 ],
       [ "tent_kit", 17 ],

diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json
@@ -81,6 +81,7 @@
       { "item": "huge_crossbow", "prob": 2 },
       { "item": "quiver", "prob": 2 },
       { "item": "quiver_large", "prob": 1 },
+      { "item": "javelin_bag", "prob": 1 },
       { "item": "baldric", "prob": 4 },
       { "item": "nodachi_inferior", "prob": 2 },
       { "item": "knife_baselard", "prob": 2 },

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -182,7 +182,56 @@
     "type": "item_group",
     "id": "archery_quivers",
     "subtype": "distribution",
-    "entries": [ { "item": "quiver", "prob": 100 }, { "item": "quiver_large", "prob": 50 }, { "item": "nylon_quiver", "prob": 10 } ]
+    "entries": [
+      { "item": "quiver", "prob": 50 },
+      { "item": "quiver_large", "prob": 50 },
+      { "item": "nylon_quiver", "prob": 75 },
+      { "item": "quiver_takedown_bow", "prob": 10 },
+      { "group": "archery_loaded_quivers", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "archery_loaded_quivers",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "loaded_quiver", "prob": 50 },
+      { "group": "loaded_quiver_large", "prob": 50 },
+      { "group": "loaded_nylon_quiver", "prob": 75 },
+      { "group": "loaded_takedown_quiver", "prob": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "loaded_quiver",
+    "container-item": "quiver",
+    "on_overflow": "discard",
+    "subtype": "distribution",
+    "entries": [ { "group": "archery_ammo", "prob": 80 }, { "group": "crossbow_bolts", "prob": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "loaded_quiver_large",
+    "container-item": "quiver_large",
+    "on_overflow": "discard",
+    "subtype": "distribution",
+    "entries": [ { "group": "archery_ammo", "prob": 80 }, { "group": "crossbow_bolts", "prob": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "loaded_nylon_quiver",
+    "container-item": "nylon_quiver",
+    "on_overflow": "discard",
+    "subtype": "distribution",
+    "entries": [ { "group": "archery_ammo", "prob": 80 }, { "group": "crossbow_bolts", "prob": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "loaded_takedown_quiver",
+    "container-item": "quiver_takedown_bow",
+    "on_overflow": "discard",
+    "subtype": "collection",
+    "entries": [ { "group": "archery_ammo" }, { "group": "archery_mods", "prob": 20 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json
@@ -23,6 +23,7 @@
       { "group": "wallets_science", "prob": 2 },
       { "item": "chem_ethanol", "prob": 10, "charges-min": 250 },
       [ "badge_doctor", 2 ],
+      [ "lanyard", 1 ],
       [ "cleansuit", 5 ],
       { "item": "laptop", "prob": 10, "charges": [ 0, 500 ] },
       { "item": "eink_tablet_pc", "prob": 20, "charges": [ 0, 100 ] },

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -222,7 +222,9 @@
       [ "chem_hexamine", 10 ],
       [ "light_snare_kit", 8 ],
       { "item": "esbit_stove", "prob": 15, "charges": [ 0, 50 ] },
-      { "item": "teargas_sprayer", "prob": 15, "charges": 10 }
+      { "item": "teargas_sprayer", "prob": 15, "charges": 10 },
+      { "group": "book_mag_surv", "prob": 10 },
+      { "group": "vfw_books", "prob": 20 }
     ]
   },
   {
@@ -803,6 +805,7 @@
       [ "socket_screwdriver_set", 20 ],
       { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] },
       [ "memory_card_science", 40 ],
+      [ "lanyard", 1 ],
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "container-item": "camera_bag", "prob": 1, "charges": [ 0, 150 ] },
       [ "element", 5 ],

diff --git a/data/json/mapgen/store/s_hunting.json b/data/json/mapgen/store/s_hunting.json
@@ -39,6 +39,8 @@
         { "group": "guns_shotgun_common_display", "x": 2, "y": 14, "chance": 70, "repeat": [ 3, 4 ] },
         { "group": "SUS_hunting_archery", "x": 2, "y": 15, "chance": 80, "repeat": [ 4, 5 ] },
         { "group": "archery_ammo", "x": 2, "y": 16, "chance": 80, "repeat": [ 4, 6 ] },
+        { "group": "archery_loaded_quivers", "x": 2, "y": 16, "chance": 40, "repeat": [ 2, 4 ] },
+        { "group": "archery_loaded_quivers", "x": [ 8, 9 ], "y": 11, "chance": 60 },
         { "group": "archery_mods", "x": 2, "y": 17, "chance": 70, "repeat": [ 3, 4 ] },
         { "group": "gun_cases", "x": [ 3, 9 ], "y": 6, "chance": 80, "repeat": [ 6, 7 ] },
         { "group": "archery_quivers", "x": [ 3, 9 ], "y": 6, "chance": 80 },