Cataclysm through a child's eyes (#63311)

CleverRaven · Mar 19, 2023 · 5e8c045 · 5e8c045
1 parent a577338
commit 5e8c045
Show file tree

Hide file tree

Showing 33 changed files with 878 additions and 248 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -4334,28 +4334,43 @@
     "type": "item_group",
     "//": "unisex personal accessories",
     "subtype": "collection",
+    "items": [
+      { "group": "accesories_personal_unisex_child", "prob": 185 },
+      { "group": "accessory_cat", "prob": 1 },
+      { "group": "accessory_weaponcarry", "prob": 5 },
+      { "group": "accessory_sportsgear", "prob": 5 },
+      { "item": "ring_wedding", "prob": 1 },
+      { "item": "american_flag", "prob": 1 },
+      { "item": "pride_flag", "prob": 1 },
+      { "item": "state_flag", "prob": 1 },
+      { "item": "tool_belt", "prob": 2 },
+      { "group": "flask_liquor", "prob": 3 }
+    ]
+  },
+  {
+    "id": "accesories_personal_unisex_child",
+    "type": "item_group",
+    "//": "unisex personal accessories that a kid could have on them",
+    "subtype": "collection",
     "items": [
       { "group": "clothing_glasses", "prob": 50 },
       { "group": "clothing_watch", "prob": 15 },
-      { "group": "accessory_ring", "prob": 15 },
+      { "item": "copper_ring", "prob": 6, "count": [ 1, 3 ] },
+      { "item": "silver_ring", "prob": 4, "count": [ 1, 3 ] },
+      { "item": "gold_ring", "prob": 3, "count": [ 1, 3 ] },
+      { "item": "diamond_ring", "prob": 1 },
+      { "item": "platinum_ring", "prob": 1 },
       { "group": "accessory_earring", "prob": 15 },
       { "group": "accessory_bracelet", "prob": 15 },
       { "group": "accessory_teeth", "prob": 2 },
       { "group": "accessory_necklace", "prob": 15 },
-      { "group": "accessory_cat", "prob": 1 },
-      { "group": "accessory_weaponcarry", "prob": 5 },
       { "group": "accessory_sportsgear", "prob": 5 },
       { "item": "folding_poncho", "prob": 5 },
-      { "item": "american_flag", "prob": 1 },
-      { "item": "pride_flag", "prob": 1 },
-      { "item": "state_flag", "prob": 1 },
-      { "item": "tool_belt", "prob": 2 },
       { "item": "leather_belt", "prob": 30 },
       { "item": "wearable_light", "prob": 10, "charges": [ 0, 100 ] },
       { "item": "binoculars", "prob": 2 },
       { "item": "whistle", "prob": 3 },
       { "item": "harmonica_holder", "prob": 1 },
-      { "group": "flask_liquor", "prob": 3 },
       { "group": "costume_accessories", "prob": 1 },
       { "group": "costume_jewelry", "prob": 1 },
       { "group": "costume_accessories", "prob": 30, "event": "halloween" },
@@ -4367,15 +4382,24 @@
     "type": "item_group",
     "//": "womens personal accessories",
     "subtype": "distribution",
+    "items": [
+      { "group": "accesories_personal_womens_child", "prob": 380 },
+      { "item": "ring_engagement", "prob": 5 },
+      { "item": "ring_purity", "prob": 10 }
+    ]
+  },
+  {
+    "id": "accesories_personal_womens_child",
+    "type": "item_group",
+    "//": "womens personal accessories that do not contain the adult-specific ones",
+    "subtype": "distribution",
     "items": [
       { "item": "hairpin", "prob": 90 },
       { "item": "fc_hairpin", "prob": 70 },
       { "item": "copper_hairpin", "prob": 60 },
       { "item": "silver_hairpin", "prob": 50 },
       { "item": "gold_hairpin", "prob": 30 },
       { "item": "platinum_hairpin", "prob": 10 },
-      { "item": "ring_engagement", "prob": 5 },
-      { "item": "ring_purity", "prob": 10 },
       { "item": "barrette", "prob": 60 },
       { "item": "pearl_collar", "prob": 5 },
       { "item": "jade_brooch", "prob": 5 }

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -63,7 +63,8 @@
       [ "thermos", 5 ],
       [ "hairbrush", 25 ],
       [ "comb_pocket", 50 ],
-      [ "ankle_wallet_pouch", 1 ]
+      [ "ankle_wallet_pouch", 1 ],
+      { "group": "lunchbox_with_contents", "prob": 50 }
     ]
   },
   {
@@ -89,12 +90,9 @@
     "type": "item_group",
     "id": "child_items",
     "items": [
-      { "group": "candy_chocolate", "prob": 360 },
-      { "item": "toastem", "prob": 10, "charges": [ 1, 8 ] },
-      { "item": "toastem2", "prob": 10, "charges": [ 1, 8 ] },
-      { "item": "toastem3", "prob": 12, "charges": [ 1, 8 ] },
+      { "group": "candy_chocolate", "prob": 200 },
+      { "group": "toastems", "prob": 25 },
       { "item": "cookies", "prob": 80, "charges": [ 1, 4 ] },
-      { "item": "crack", "prob": 8, "charges": [ 1, 4 ] },
       { "item": "licorice", "prob": 10, "charges": [ 1, 4 ] },
       [ "bat", 40 ],
       [ "bat_nerf", 20 ],
@@ -103,16 +101,7 @@
       { "item": "mp3", "prob": 80, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 30, "charges": [ 0, 100 ] },
       { "group": "softdrinks_canned", "prob": 55 },
-      { "item": "cola", "prob": 6, "container-item": "bottle_plastic", "sealed": false },
-      { "item": "creamsoda", "prob": 6, "container-item": "bottle_plastic", "sealed": false },
-      { "item": "lemonlime", "prob": 6, "container-item": "bottle_plastic", "sealed": false },
-      { "item": "orangesoda", "prob": 5, "container-item": "bottle_plastic", "sealed": false },
-      { "item": "colamdew", "prob": 7, "container-item": "bottle_plastic", "sealed": false },
-      { "item": "cola", "prob": 4, "container-item": "bottle_twoliter" },
-      { "item": "creamsoda", "prob": 4, "container-item": "bottle_twoliter" },
-      { "item": "lemonlime", "prob": 4, "container-item": "bottle_twoliter" },
-      { "item": "orangesoda", "prob": 3, "container-item": "bottle_twoliter" },
-      { "item": "colamdew", "prob": 5, "container-item": "bottle_twoliter" },
+      { "group": "softdrinks_bottled", "prob": 30 },
       [ "backpack", 48 ],
       [ "purse", 20 ],
       [ "slingpack", 19 ],
@@ -124,25 +113,20 @@
       [ "bookstrap", 1 ],
       [ "pockknife", 14 ],
       [ "knife_swissarmy", 10 ],
-      [ "hairpin", 5 ],
-      [ "fc_hairpin", 1 ],
-      [ "wristwatch", 10 ],
-      [ "game_watch", 10 ],
       [ "umbrella", 5 ],
       [ "teleumbrella", 2 ],
       [ "usb_drive", 10 ],
       { "group": "writing_utensils", "prob": 40 },
-      { "group": "kids_books", "prob": 155 },
-      { "group": "book_school", "prob": 35 },
+      { "group": "child_schoolbag_1", "prob": 500 },
+      { "group": "child_schoolbag_2", "prob": 150 },
+      { "group": "child_bugout_bag_1", "prob": 100 },
+      { "group": "child_bugout_bag_2", "prob": 25 },
       [ "novel_pulp", 16 ],
       { "group": "toy_radio_car", "prob": 1 },
       { "group": "toy_makerspace_kit", "prob": 1 },
       { "group": "toy_robot_kit", "prob": 1 },
       { "group": "toy_engine_kit", "prob": 1 },
       { "item": "air_launcher", "prob": 1 },
-      [ "breadboard", 30 ],
-      { "item": "voltmeter", "prob": 20, "charges": [ 0, 100 ] },
-      { "item": "multimeter", "prob": 20, "charges": [ 0, 100 ] },
       [ "mouthpiece", 3 ],
       [ "basketball", 8 ],
       [ "beach_volleyball", 8 ],
@@ -151,7 +135,6 @@
       [ "elbow_pads", 20 ],
       [ "knee_pads", 20 ],
       { "item": "radiocontrol", "prob": 5, "charges": [ 0, 100 ] },
-      [ "whistle", 3 ],
       [ "slingshot", 10 ],
       [ "frisbee", 10 ],
       [ "dnd_handbook", 1 ],
@@ -199,6 +182,58 @@
       { "item": "boots", "prob": 25 }
     ]
   },
+  {
+    "id": "child_schoolbag_1",
+    "type": "item_group",
+    "container-item": "backpack",
+    "on_overflow": "spill",
+    "items": [ { "group": "child_schoolbag_contents" } ]
+  },
+  {
+    "id": "child_schoolbag_2",
+    "type": "item_group",
+    "container-item": "backpack_leather",
+    "on_overflow": "spill",
+    "items": [ { "group": "child_schoolbag_contents" } ]
+  },
+  {
+    "id": "child_schoolbag_contents",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "A list of items that would have had a decent chance to appear in a pre-apocalypse child schoolbag.",
+    "items": [
+      { "group": "pencil_case_with_contents", "prob": 70 },
+      { "group": "book_school", "prob": 65 },
+      { "group": "book_school", "prob": 55 },
+      { "group": "kids_books", "prob": 15 },
+      { "group": "lunchbox_with_contents", "prob": 45 },
+      { "group": "candy_chocolate", "prob": 12 },
+      { "group": "softdrinks_canned", "prob": 5 },
+      { "group": "softdrinks_bottled", "prob": 7 },
+      { "group": "bugout_toys", "prob": 2 }
+    ]
+  },
+  {
+    "id": "lunchbox_with_contents",
+    "type": "item_group",
+    "container-item": "lunchbox",
+    "on_overflow": "spill",
+    "items": [ { "group": "lunchbox_contents", "prob": 7 } ]
+  },
+  {
+    "id": "lunchbox_contents",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "A list of items that would have had a decent chance to appear in a pre-apocalypse lunchbox, be it child or adult (but I did a pretty poor job at variety, I am not sure what could actually go there).",
+    "items": [
+      { "group": "lunchbox_food", "prob": 90 },
+      { "group": "lunchbox_fruit", "prob": 35 },
+      { "item": "plastic_fork", "prob": 30 },
+      { "item": "plastic_knife", "prob": 30 },
+      { "item": "plastic_spoon", "prob": 15 },
+      { "item": "napkin", "prob": 15, "count": [ 1, 5 ] }
+    ]
+  },
   {
     "type": "item_group",
     "id": "npc_hacker",

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -458,6 +458,22 @@
       { "item": "choc_drink", "prob": 25 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "softdrinks_bottled",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "cola", "prob": 60, "container-item": "bottle_plastic" },
+      { "item": "colamdew", "prob": 55, "container-item": "bottle_plastic" },
+      { "item": "creamsoda", "prob": 50, "container-item": "bottle_plastic" },
+      { "item": "lemonlime", "prob": 50, "container-item": "bottle_plastic" },
+      { "item": "orangesoda", "prob": 45, "container-item": "bottle_plastic" },
+      { "item": "rootbeer", "prob": 40, "container-item": "bottle_plastic" },
+      { "item": "crispycran", "prob": 35, "container-item": "bottle_plastic" },
+      { "item": "purple_drink", "prob": 35, "container-item": "bottle_plastic" },
+      { "item": "choc_drink", "prob": 25, "container-item": "bottle_plastic" }
+    ]
+  },
   {
     "type": "item_group",
     "id": "candy_chocolate",
@@ -499,6 +515,12 @@
       { "item": "fried_seeds", "prob": 25 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "toastems",
+    "subtype": "distribution",
+    "entries": [ { "item": "toastem" }, { "item": "toastem2" }, { "item": "toastem3" } ]
+  },
   {
     "type": "item_group",
     "id": "snacks",
@@ -541,6 +563,26 @@
       { "item": "pine_nuts", "prob": 20 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "sandwiches",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "sandwich_cucumber", "prob": 15 },
+      { "item": "sandwich_deluxe", "prob": 10 },
+      { "item": "sandwich_reuben", "prob": 15 },
+      { "item": "sandwich_veggy", "prob": 30 },
+      { "item": "sandwich_t", "prob": 30 },
+      { "item": "sandwich_pb", "prob": 1 },
+      { "item": "sandwich_pbj", "prob": 1 },
+      { "item": "sandwich_pbh", "prob": 1 },
+      { "item": "sandwich_pbm", "prob": 1 },
+      { "item": "fish_sandwich", "prob": 15 },
+      { "item": "sandwich_jam_butter", "prob": 5 },
+      { "item": "sandwich_jam", "prob": 5 },
+      { "item": "sandwich_cheese", "prob": 50 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "fridgesnacks",
@@ -955,5 +997,22 @@
       { "item": "egg_turkey", "prob": 1 },
       { "item": "egg_grouse", "prob": 1 }
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "lunchbox_fruit",
+    "subtype": "distribution",
+    "entries": [ { "item": "banana", "prob": 10 }, { "item": "apple", "prob": 10 }, { "item": "orange", "prob": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "lunchbox_food",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "sandwiches", "prob": 75 },
+      { "group": "lunchbox_fruit", "prob": 25 },
+      { "item": "cheeseburger", "prob": 5 },
+      { "item": "hamburger", "prob": 5 }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -2023,11 +2023,9 @@
       [ "cookbook_italian", 25 ],
       [ "cookbook_mexican", 14 ],
       [ "manual_electronics", 20 ],
-      [ "decoy_elfa", 5 ],
       [ "manual_tailor", 15 ],
       [ "manual_carpentry", 10 ],
       [ "101_carpentry", 10 ],
-      [ "manual_driving", 20 ],
       [ "textbook_speech", 12 ],
       { "group": "novels", "prob": 439 },
       { "group": "kids_books", "prob": 50 },
@@ -2072,7 +2070,9 @@
       [ "sandbox_kit", 1 ],
       [ "dnd_handbook", 1 ],
       [ "balloon", 5 ],
-      { "group": "writing_utensils", "prob": 40 }
+      { "item": "scissors_wavy", "prob": 7 },
+      { "group": "pencil_case_contents", "prob": 50 },
+      { "group": "pencil_case_with_contents", "prob": 30 }
     ]
   },
   {
@@ -2739,7 +2739,7 @@
       { "group": "jewelry_accessories", "prob": 35 },
       [ "story_book", 5 ],
       [ "syringe", 3 ],
-      [ "teddy", 15 ],
+      { "item": "teddy_bear", "custom-flags": [ "FILTHY" ], "damage": [ 0, 3 ], "prob": 15 },
       [ "arm", 5 ],
       [ "leg", 5 ],
       [ "fetus", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -618,7 +618,7 @@
       [ "gold_medal", 1 ],
       [ "freeze_dried_meal", 5 ],
       { "group": "tinware", "prob": 10 },
-      { "item": "pen", "prob": 10, "charges": [ 0, 100 ] },
+      { "group": "pens", "prob": 10 },
       { "group": "costume_all_clothing", "prob": 10 }
     ]
   },
@@ -1948,7 +1948,7 @@
       [ "mask_dust", 65 ],
       [ "glasses_safety", 10 ],
       [ "towel", 50 ],
-      [ "scissors", 50 ],
+      [ "scissors_medical", 50 ],
       [ "fungicide", 10 ],
       [ "insecticide", 10 ],
       { "item": "soap", "prob": 20, "charges": [ 1, 10 ] },