Cataclysm through a child's eyes

data/json/itemgroups/Clothing_Gear/gear_civilian.json

@@ -90,11 +90,8 @@
     "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": "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 +100,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 ],
@@ -140,9 +128,6 @@
       { "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 ],

data/json/itemgroups/Food/food.json

@@ -456,6 +456,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",
@@ -497,6 +513,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",

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -254,7 +254,7 @@
       [ "down_blanket", 10 ],
       [ "pillow", 50 ],
       [ "down_pillow", 15 ],
-      [ "teddy_bear", 2 ],
+      [ "toy_plush", 2 ],
       { "item": "smoxygen_tank", "prob": 10, "charges": [ 0, 12 ] },
       [ "antiparasitic", 3 ],
       { "item": "diazepam", "prob": 3, "charges": [ 1, 10 ] },
@@ -2514,7 +2514,7 @@
       [ "down_blanket", 10 ],
       [ "pillow", 20 ],
       [ "down_pillow", 15 ],
-      [ "teddy_bear", 1 ],
+      [ "toy_plush", 1 ],
       [ "emer_blanket", 20 ],
       [ "flyer", 10 ],
       { "item": "gasoline_lantern", "prob": 5, "charges": [ 0, 500 ] },
@@ -2736,7 +2736,7 @@
       { "group": "jewelry_accessories", "prob": 35 },
       [ "story_book", 5 ],
       [ "syringe", 3 ],
-      [ "teddy", 15 ],
+      { "item": "toy_plush", "custom-flags": [ "FILTHY" ], "damage": [ 0, 3 ], "prob": 15 },
       [ "arm", 5 ],
       [ "leg", 5 ],
       [ "fetus", 5 ],

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 }
     ]
   },
@@ -1896,7 +1896,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 ] },

data/json/itemgroups/SUS/domestic.json

@@ -153,9 +153,9 @@
       { "item": "lighter", "prob": 90, "charges-min": 0, "charges-max": 2 },
       { "item": "bag_garbage", "prob": 95, "count": [ 1, 25 ] },
       { "item": "bottle_opener", "prob": 90 },
-      { "item": "pen", "prob": 90, "charges-min": 1, "charges-max": 25 },
+      { "group": "pens", "prob": 90, "charges-min": 1, "charges-max": 25 },
       { "item": "coin_quarter", "prob": 90 },
-      { "item": "toothbrush_dirty", "prob": 80 },
+      { "item": "toothbrush_plain", "custom-flags": [ "FILTHY" ], "prob": 80 },
       { "item": "matches", "prob": 80, "count": [ 1, 5 ], "charges-min": 0, "charges-max": 2 },
       { "item": "ref_matches", "prob": 80, "count": [ 1, 5 ], "charges-min": 0, "charges-max": 2 },
       { "item": "coin_nickel", "prob": 70 },
@@ -205,7 +205,7 @@
       { "item": "bracelet_friendship", "prob": 10 },
       { "item": "paper", "prob": 10, "count": [ 5, 20 ] },
       { "item": "plastic_straw", "prob": 10, "count": [ 20, 30 ] },
-      { "item": "pen", "prob": 10, "count": [ 1, 30 ], "charges-min": 0, "charges-max": 15 },
+      { "group": "pens", "prob": 10, "count": [ 1, 30 ], "charges-min": 0, "charges-max": 15 },
       { "item": "polaroid_photo", "prob": 10 },
       { "item": "RPG_die", "prob": 8 },
       { "item": "bead_necklace", "prob": 8 },
@@ -244,6 +244,7 @@
       { "item": "pen", "count": [ 1, 20 ], "charges-min": 70 },
       { "item": "paper", "charges": [ 10, 30 ] },
       { "item": "scissors" },
+      { "item": "scissors_wavy", "prob": 10 },
       { "item": "string_36", "count": [ 1, 4 ], "prob": 80 },
       { "item": "string_36", "count": [ 1, 4 ], "prob": 70 },
       { "item": "string_6", "count": [ 1, 20 ], "prob": 70 },
@@ -301,15 +302,15 @@
       { "item": "boxcutter", "prob": 85 },
       { "item": "duct_tape", "prob": 85, "charges": [ 5, 200 ], "container-item": "box_small" },
       { "item": "flashlight", "prob": 80, "ammo-item": "light_disposable_cell", "charges": [ 100, 300 ] },
-      { "item": "toothbrush_dirty", "prob": 80 },
+      { "item": "toothbrush_plain", "custom-flags": [ "FILTHY" ], "prob": 80 },
       { "item": "bottle_opener", "prob": 75 },
       { "item": "pockknife", "prob": 75 },
       { "item": "cordless_drill", "prob": 70 },
       { "item": "scissors", "prob": 65 },
       { "item": "pliers", "prob": 65 },
       { "item": "permanent_marker", "prob": 70, "charges-min": 50 },
       { "item": "adhesive_bandages", "prob": 60, "count": [ 1, 20 ] },
-      { "item": "pen", "count": [ 1, 3 ], "prob": 55, "charges-min": 50 },
+      { "group": "pens", "count": [ 1, 3 ], "prob": 55, "charges-min": 50 },
       { "item": "sandpaper", "prob": 50 },
       { "item": "old_key", "prob": 50 },
       { "item": "medium_battery_cell", "prob": 40, "charges-min": 400, "charges-max": 500 },
@@ -352,7 +353,7 @@
     "//2": "A well-organized and deliberately selected collection of small objects useful to keep close at hand.",
     "subtype": "collection",
     "entries": [
-      { "item": "pen", "count": 2, "charges-min": 70 },
+      { "group": "pens", "count": 2, "charges-min": 70 },
       { "item": "paper", "charges": [ 25, 100 ] },
       { "item": "scissors", "prob": 80 },
       { "item": "stapler", "prob": 80 },

data/json/itemgroups/SUS/office.json

@@ -14,7 +14,7 @@
       { "item": "mobile_memory_card_encrypted", "count": [ 1, 2 ], "prob": 15 },
       { "item": "file", "count": [ 1, 8 ], "prob": 50 },
       { "item": "paper", "count": [ 2, 9 ], "prob": 60 },
-      { "item": "pen", "count": [ 1, 10 ], "prob": 95, "charges": [ 0, 100 ] },
+      { "group": "pens", "count": [ 1, 10 ], "prob": 95, "charges": [ 0, 100 ] },
       { "item": "book_binder", "prob": 90 },
       { "item": "stapler", "prob": 60 },
       { "item": "office_holepunch", "prob": 35 },

data/json/itemgroups/collections_domestic.json

@@ -326,7 +326,7 @@
           },
           {
             "collection": [
-              { "item": "teddy", "prob": 50 },
+              { "item": "toy_plush", "custom-flags": [ "FILTHY" ], "damage": [ 0, 3 ], "prob": 50 },
               { "item": "hat_ball", "prob": 20 },
               { "item": "baseball", "prob": 20 },
               { "item": "roller_shoes_off", "prob": 10 },
@@ -412,7 +412,7 @@
           },
           {
             "collection": [
-              { "item": "teddy", "prob": 50 },
+              { "item": "toy_plush", "custom-flags": [ "FILTHY" ], "damage": [ 0, 3 ], "prob": 50 },
               { "item": "hat_ball", "prob": 20 },
               { "item": "baseball", "prob": 20 },
               { "item": "roller_shoes_off", "prob": 10 },
@@ -1199,7 +1199,7 @@
       { "item": "rubber_harness_dog", "prob": 3 },
       { "item": "eclipse_glasses", "prob": 1 },
       { "item": "bodypillow", "prob": 2 },
-      { "item": "teddy_bear", "prob": 2 },
+      { "item": "toy_plush", "prob": 2 },
       { "item": "reading_light", "prob": 8, "charges": [ 0, 50 ] },
       { "item": "condom", "prob": 50, "count": [ 1, 5 ] },
       { "item": "air_launcher", "prob": 1 }

data/json/itemgroups/furniture.json

@@ -39,7 +39,7 @@
       { "item": "electric_blanket", "prob": 4 },
       { "item": "quilt", "prob": 10 },
       { "item": "quilt_patchwork", "prob": 8 },
-      { "item": "teddy_bear", "prob": 2 },
+      { "item": "toy_plush", "prob": 2 },
       { "item": "shark_plushie", "prob": 2 },
       { "item": "bodypillow", "prob": 1 }
     ]

data/json/itemgroups/misc.json

@@ -271,7 +271,7 @@
       { "item": "candle", "prob": 100, "count": [ 1, 3 ], "charges-max": 50 },
       { "item": "candle", "prob": 33, "count": [ 1, 2 ], "charges-min": 50 },
       { "item": "family_photo", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "teddy_bear", "prob": 5 }
+      { "item": "toy_plush", "prob": 5 }
     ]
   },
   {
@@ -289,5 +289,19 @@
       { "item": "chalice", "prob": 1 },
       { "item": "book_ruined", "prob": 1 }
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "pencil_case_contents",
+    "subtype": "collection",
+    "entries": [
+      { "group": "pens", "prob": 90 },
+      { "group": "pens", "prob": 30 },
+      { "item": "pencil", "prob": 30, "count": [ 10, 125 ], "charges": [ 0, 100 ] },
+      { "item": "scissors_child", "prob": 50 },
+      { "item": "eraser", "prob": 50 },
+      { "item": "sharpener", "prob": 50 },
+      { "item": "ruler", "prob": 50 }
+    ]
   }
 ]

data/json/itemgroups/science_and_tech.json

@@ -499,7 +499,7 @@
       [ "autoclave", 20 ],
       [ "syringe", 8 ],
       [ "cotton_patchwork", 1 ],
-      [ "scissors", 50 ],
+      [ "scissors_medical", 50 ],
       [ "boots_rubber", 20 ],
       [ "subsuit_xl", 4 ],
       { "item": "cotton_patchwork", "prob": 1, "custom-flags": [ "FILTHY" ] },

data/json/itemgroups/shops_trades.json

@@ -131,7 +131,7 @@
           { "item": "generic_figurine_plastic", "prob": 75, "count": [ 1, 10 ] },
           { "item": "deck_of_cards", "prob": 60, "count": [ 1, 5 ] },
           { "item": "monopoly", "prob": 5, "count": [ 1, 2 ] },
-          { "item": "teddy_bear", "prob": 10, "count": [ 1, 5 ] },
+          { "item": "toy_plush", "prob": 10, "count": [ 1, 5 ] },
           { "item": "creepy_doll", "prob": 5, "count": [ 1, 5 ] },
           { "item": "straw_doll", "prob": 5, "count": [ 1, 5 ] }
         ]

data/json/itemgroups/stashes.json

@@ -314,5 +314,60 @@
       [ "talking_doll", 40 ],
       [ "bondage_mask", 20 ]
     ]
+  },
+  {
+    "id": "child_bugout_bag",
+    "type": "item_group",
+    "container-item": "backpack",
+    "on_overflow": "spill",
+    "items": [ { "group": "child_bugout" } ]
+  },
+  {
+    "id": "child_bugout",
+    "type": "item_group",
+    "//": "a collection of items a kid could have haphazardly packed together before running away from home",
+    "subtype": "collection",
+    "entries": [
+      { "group": "bugout_toys", "prob": 50 },
+      { "group": "bugout_child_snacks", "prob": 100 },
+      { "group": "bugout_water", "prob": 75 },
+      { "item": "toothbrush_plain", "prob": 10 },
+      { "item": "childnote", "prob": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "bugout_toys",
+    "subtype": "distribution",
+    "//": "this list is for toys that children may have wanted to take with themselves while preparing to run away for whatever reason.",
+    "items": [
+      { "item": "talking_doll", "prob": 50 },
+      { "item": "toy_plush", "prob": 50 },
+      { "item": "toy_figurine_large", "prob": 35 },
+      { "item": "bath_toy", "prob": 30 },
+      { "item": "yoyo", "prob": 30 },
+      { "item": "fidget_spinner", "prob": 30 },
+      { "item": "portable_game", "prob": 30, "charges": [ 0, 100 ] },
+      { "group": "toy_radio_car", "prob": 10 },
+      { "group": "toy_makerspace_kit", "prob": 10 },
+      { "group": "toy_robot_kit", "prob": 10 },
+      { "group": "toy_engine_kit", "prob": 10 },
+      { "item": "shark_plushie", "prob": 2 },
+      { "item": "air_launcher", "prob": 2 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "bugout_child_snacks",
+    "subtype": "distribution",
+    "//": "this list is for food that children may have wanted to take with themselves while preparing to run away for whatever reason.",
+    "items": [
+      { "group": "candy_chocolate", "prob": 75 },
+      { "group": "salty_snacks", "prob": 75 },
+      { "group": "softdrinks_canned", "prob": 55 },
+      { "group": "softdrinks_bottled", "prob": 45 },
+      { "item": "cookies", "prob": 30, "charges": [ 1, 4 ] },
+      { "group": "toastems", "prob": 15 }
+    ]
   }
 ]

data/json/itemgroups/supplies.json

@@ -756,12 +756,19 @@
     "id": "writing_utensils",
     "type": "item_group",
     "items": [
-      { "item": "permanent_marker", "prob": 10, "charges": [ 0, 500 ] },
-      { "item": "pen", "prob": 15, "charges": [ 0, 100 ] },
-      { "item": "pencil", "prob": 35, "charges": [ 0, 100 ] },
-      { "item": "black_pen", "prob": 35, "charges": [ 0, 100 ] },
-      { "item": "blue_pen", "prob": 20, "charges": [ 0, 100 ] },
-      { "item": "red_pen", "prob": 10, "charges": [ 0, 100 ] },
+      { "item": "permanent_marker", "prob": 8, "charges": [ 0, 500 ] },
+      { "item": "pencil", "prob": 28, "charges": [ 0, 100 ] },
+      { "group": "pens", "prob": 64 }
+    ]
+  },
+  {
+    "id": "pens",
+    "type": "item_group",
+    "items": [
+      { "item": "pen", "prob": 30, "charges": [ 0, 100 ] },
+      { "item": "black_pen", "prob": 30, "charges": [ 0, 100 ] },
+      { "item": "blue_pen", "prob": 30, "charges": [ 0, 100 ] },
+      { "item": "red_pen", "prob": 5, "charges": [ 0, 100 ] },
       { "item": "green_pen", "prob": 5, "charges": [ 0, 100 ] }
     ]
   },