Merge pull request #36484 from xanderrootslayer/SUS-Bathroom-December

Sus bathroom december

data/json/itemgroups/SUS/domestic.json

@@ -607,5 +607,37 @@
       { "item": "seasoning_italian", "prob": 65 },
       { "item": "seasoning_salt", "prob": 65 }
     ]
+  },
+  {
+    "id": "SUS_bathroom_toiletries",
+    "type": "item_group",
+    "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
+    "//2": "This is a category for all the items which appear in bathrooms, which are NOT immediately useful medicines. This list is created in part to not ruin player's chances of finding antibiotics, antifungals and asprin, as it suppliments the current bathroom drops instead of replacing. Item probabilities are loosely based on how likely families would take an item with them when evacuating.",
+    "subtype": "collection",
+    "entries": [
+      { "item": "soap_holder", "prob": 40 },
+      { "item": "soap", "count": [ 1, 4 ], "prob": 60 },
+      { "item": "bleach", "prob": 15 },
+      { "item": "ammonia", "prob": 20 },
+      { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 75 },
+      { "item": "shavingkit", "prob": 1 },
+      { "item": "mirror", "prob": 25 },
+      { "item": "toothbrush_plain", "count": [ 1, 3 ], "prob": 45 },
+      { "item": "hairbrush", "count": [ 1, 2 ], "prob": 60 },
+      { "item": "curler_hair", "prob": 25 },
+      { "item": "string_floss", "count": [ 1, 2 ], "prob": 50 },
+      { "item": "comb_pocket", "count": [ 1, 2 ], "prob": 55 },
+      { "item": "plunger_toilet", "prob": 90 },
+      { "item": "plunger_futuristic", "prob": 20 },
+      { "item": "cu_pipe", "prob": 10 },
+      { "item": "hose", "prob": 10 },
+      { "item": "sponge", "count": [ 1, 3 ], "prob": 75 },
+      { "item": "candle", "count": [ 1, 2 ], "prob": 20 },
+      { "item": "matches", "prob": 10 },
+      { "item": "toilet_paper", "prob": 80 },
+      { "item": "hair_dryer", "prob": 60 },
+      { "item": "curling_iron", "prob": 50 },
+      { "item": "brush_toilet", "prob": 75 }
+    ]
   }
 ]

data/json/itemgroups/gear.json

@@ -49,7 +49,9 @@
       [ "pocket_firearms", 5 ],
       [ "newest_newspaper", 75 ],
       [ "flyer", 10 ],
-      [ "thermos", 5 ]
+      [ "thermos", 5 ],
+      [ "hairbrush", 25 ],
+      [ "comb_pocket", 50 ]
     ]
   },
   {

data/json/itemgroups/item_groups.json

@@ -1199,7 +1199,10 @@
       [ "insecticide", 2 ],
       [ "soap", 80 ],
       [ "detergent", 80 ],
-      [ "chem_hydrogen_peroxide", 20 ]
+      [ "chem_hydrogen_peroxide", 20 ],
+      [ "plunger_toilet", 30 ],
+      [ "plunger_futuristic", 15 ],
+      [ "toilet_paper", 10 ]
     ]
   },
   {
@@ -1742,6 +1745,9 @@
       [ "shavingkit", 30 ],
       [ "elec_hairtrimmer", 15 ],
       [ "razor_blade", 5 ],
+      [ "razor_shaving", 5 ],
+      [ "toothbrush_plain", 10 ],
+      [ "string_floss", 10 ],
       [ "kilt", 5 ],
       [ "hobo_stove", 1 ],
       [ "tinder", 1 ],

data/json/itemgroups/locations.json

@@ -2246,7 +2246,9 @@
       [ "toolbox", 5 ],
       [ "apron_leather", 10 ],
       [ "bio_meteorologist", 10 ],
-      [ "chem_aluminium_sulphate", 20 ]
+      [ "chem_aluminium_sulphate", 20 ],
+      [ "plunger_toilet", 10 ],
+      [ "plunger_futuristic", 5 ]
     ]
   },
   {

data/json/itemgroups/locations_commercial.json

@@ -43,6 +43,7 @@
     "items": [
       [ "rope_6", 20 ],
       [ "string_36", 25 ],
+      [ "toilet_paper", 10 ],
       [ "handflare", 15 ],
       [ "duct_tape", 25 ],
       [ "flashlight", 25 ],

data/json/itemgroups/mall_item_groups.json

@@ -283,7 +283,13 @@
       [ "soap", 45 ],
       [ "tailors_kit", 25 ],
       [ "shavingkit", 20 ],
-      [ "elec_hairtrimmer", 20 ]
+      [ "elec_hairtrimmer", 20 ],
+      [ "razor_shaving", 20 ],
+      [ "curler_hair", 30 ],
+      [ "hair_dryer", 40 ],
+      [ "curling_iron", 40 ],
+      [ "comb_pocket", 10 ],
+      [ "hairbrush", 10 ]
     ]
   },
   {

data/json/itemgroups/mansion.json

@@ -976,6 +976,7 @@
       [ "38_casing", 20 ],
       [ "45_casing", 20 ],
       [ "bone_tainted", 1 ],
+      [ "toothbrush_plain", 10 ],
       { "group": "corpse_mansion", "prob": 1 }
     ]
   },
@@ -1144,7 +1145,10 @@
       [ "oxy_powder", 5 ],
       [ "fungicide", 5 ],
       [ "insecticide", 5 ],
-      { "item": "charcoal", "prob": 5, "container-item": "bag_canvas" }
+      { "item": "charcoal", "prob": 5, "container-item": "bag_canvas" },
+      [ "toilet_paper", 30 ],
+      [ "plunger_toilet", 10 ],
+      [ "plunger_futuristic", 25 ]
     ]
   },
   {
@@ -1301,7 +1305,12 @@
       [ "sewing_kit", 10 ],
       [ "mag_beauty", 10 ],
       [ "mag_glam", 10 ],
-      { "group": "harddrugs", "prob": 5 }
+      { "group": "harddrugs", "prob": 5 },
+      [ "hairbrush", 30 ],
+      [ "comb_pocket", 15 ],
+      [ "curler_hair", 10 ],
+      [ "curling_iron", 15 ],
+      [ "brush_toilet", 15 ]
     ]
   },
   {
@@ -1333,7 +1342,9 @@
       [ "nyquil", 5 ],
       { "group": "mansion_guns", "prob": 3 },
       { "group": "harddrugs", "prob": 1 },
-      [ "joint", 1 ]
+      [ "joint", 1 ],
+      [ "curler_hair", 10 ],
+      [ "hairbrush", 5 ]
     ]
   },
   {

data/json/itemgroups/supplies.json

@@ -108,7 +108,9 @@
       [ "pump_complex", 5 ],
       [ "well_pump", 5 ],
       [ "plastic_sheet", 20 ],
-      [ "recharge_station", 20 ]
+      [ "recharge_station", 20 ],
+      [ "plunger_toilet", 75 ],
+      [ "plunger_futuristic", 25 ]
     ]
   },
   {
@@ -128,7 +130,9 @@
       [ "jerrycan", 10 ],
       [ "pump_complex", 10 ],
       [ "well_pump", 10 ],
-      { "item": "scrap_copper", "prob": 15, "count": [ 1, 10 ] }
+      { "item": "scrap_copper", "prob": 15, "count": [ 1, 10 ] },
+      { "item": "plunger_toilet", "prob": 90, "count": [ 1, 2 ] },
+      [ "plunger_futuristic", 50 ]
     ]
   },
   {