From a18304687b6369416b9611cc1cfa21cf6f82dbc4 Mon Sep 17 00:00:00 2001
From: Anton Burmistrov <Night_Pryanik@mail.ru>
Date: Mon, 18 Nov 2019 11:09:35 +0400
Subject: [PATCH] Gender-specific clothing on corpses, part two (#35558)

* Gender-specific clothes

* Removed spawning of several copies

* Removed spawning several items from one category

* Added a separate zombie children loot table

* Reduced chance to spawn accessories

* Reverted to previous distribution with fixing a bug with incorrect use of "collection"-"definition"
---
 data/json/itemgroups/clothing.json        | 761 +++++++++-------------
 data/json/itemgroups/mansion.json         | 107 ++-
 data/json/monsterdrops/monster_drops.json | 193 +++++-
 data/json/monsters/zed_children.json      |   4 +-
 4 files changed, 584 insertions(+), 481 deletions(-)

diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
index 8e21b464125c2..ea7c33317b601 100644
--- a/data/json/itemgroups/clothing.json
+++ b/data/json/itemgroups/clothing.json
@@ -563,16 +563,24 @@
     "subtype": "distribution",
     "entries": [
       { "item": "jeans", "prob": 90 },
-      { "item": "pants_checkered", "prob": 5 },
+      { "item": "jeans_red", "prob": 50 },
       { "item": "shorts", "prob": 70 },
       { "item": "shorts_denim", "prob": 35 },
+      { "item": "b_shorts", "prob": 30 },
+      { "item": "shorts_cargo", "prob": 50 },
+      { "item": "postman_shorts", "prob": 12 },
+      { "item": "under_armor_shorts", "prob": 5 },
       { "item": "pants", "prob": 75 },
-      { "item": "leather_belt", "prob": 30 },
       { "item": "pants_leather", "prob": 60 },
       { "item": "pants_cargo", "prob": 70 },
-      { "item": "shorts_cargo", "prob": 50 },
-      { "item": "under_armor_shorts", "prob": 20 },
-      { "item": "postman_shorts", "prob": 5 },
+      { "item": "pants_checkered", "prob": 55 },
+      { "item": "pants_ski", "prob": 45 },
+      { "item": "pants_fur", "prob": 5 },
+      { "item": "pants_faux_fur", "prob": 15 },
+      { "item": "hot_pants", "prob": 30 },
+      { "item": "hot_pants_fur", "prob": 5 },
+      { "item": "hot_pants_leather", "prob": 25 },
+      { "item": "breeches", "prob": 25 },
       { "item": "kilt", "prob": 5 }
     ]
   },
@@ -585,10 +593,6 @@
       { "item": "skirt", "prob": 75 },
       { "item": "skirt_leather", "prob": 5 },
       { "item": "leggings", "prob": 15 },
-      { "item": "dress", "prob": 70 },
-      { "item": "sundress", "prob": 50 },
-      { "item": "dress_wedding", "prob": 1 },
-      { "item": "b_shorts", "prob": 15 },
       { "item": "nanoskirt", "prob": 10 }
     ]
   },
@@ -1000,7 +1004,16 @@
   {
     "type": "item_group",
     "id": "female_underwear_top",
-    "items": [ [ "bra", 70 ], [ "sports_bra", 50 ], [ "bikini_top", 10 ] ]
+    "items": [
+      [ "bra", 70 ],
+      [ "sports_bra", 50 ],
+      [ "camisole", 30 ],
+      [ "halter_top", 30 ],
+      [ "bikini_top", 10 ],
+      [ "bikini_top_leather", 7 ],
+      [ "bikini_top_fur", 5 ],
+      [ "corset", 5 ]
+    ]
   },
   {
     "type": "item_group",
@@ -1020,7 +1033,8 @@
       [ "briefs", 30 ],
       [ "boxer_briefs", 50 ],
       [ "long_underpants", 20 ],
-      [ "under_armor_shorts", 20 ]
+      [ "under_armor_shorts", 20 ],
+      [ "trunks", 10 ]
     ]
   },
   {
@@ -2211,72 +2225,52 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "tricorne", "prob": 5 },
-              { "item": "10gal_hat", "prob": 30 },
-              { "item": "tophat", "prob": 10 },
-              { "item": "hat_sombrero", "prob": 10 }
-            ],
-            "prob": 5
-          }
-        ]
+          { "item": "tricorne", "prob": 5 },
+          { "item": "10gal_hat", "prob": 30 },
+          { "item": "tophat", "prob": 10 },
+          { "item": "hat_sombrero", "prob": 10 }
+        ],
+        "prob": 5
       },
       {
-        "distribution": [
-          {
-            "collection": [ { "item": "kippah", "prob": 33 }, { "item": "turban", "prob": 33 }, { "item": "kufi", "prob": 33 } ],
-            "prob": 10
-          }
-        ]
+        "distribution": [ { "item": "kippah", "prob": 33 }, { "item": "turban", "prob": 33 }, { "item": "kufi", "prob": 33 } ],
+        "prob": 10
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "helmet_motor", "prob": 20 },
-              { "item": "helmet_bike", "prob": 50 },
-              { "item": "headgear", "prob": 10 },
-              { "item": "helmet_ball", "prob": 15 },
-              { "item": "wetsuit_hood", "prob": 5 }
-            ],
-            "prob": 30
-          }
-        ]
+          { "item": "helmet_motor", "prob": 20 },
+          { "item": "helmet_bike", "prob": 50 },
+          { "item": "headgear", "prob": 10 },
+          { "item": "helmet_ball", "prob": 15 },
+          { "item": "wetsuit_hood", "prob": 5 }
+        ],
+        "prob": 30
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "hat_hunting", "prob": 20 },
-              { "item": "hat_faux_fur", "prob": 10 },
-              { "item": "hat_fur", "prob": 5 },
-              { "item": "hat_boonie", "prob": 15 },
-              { "item": "cowl_wool", "prob": 15 },
-              { "item": "hood_rain", "prob": 25 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "hat_hunting", "prob": 20 },
+          { "item": "hat_faux_fur", "prob": 10 },
+          { "item": "hat_fur", "prob": 5 },
+          { "item": "hat_boonie", "prob": 15 },
+          { "item": "cowl_wool", "prob": 15 },
+          { "item": "hood_rain", "prob": 25 }
+        ],
+        "prob": 50
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bowhat", "prob": 10 },
-              { "item": "fedora", "prob": 40 },
-              { "item": "hat_newsboy", "prob": 5 },
-              { "item": "cowboy_hat", "prob": 20 },
-              { "item": "straw_fedora", "prob": 5 },
-              { "item": "hat_golf", "prob": 15 },
-              { "item": "straw_hat", "prob": 15 },
-              { "item": "beret_wool", "prob": 5 },
-              { "item": "beret", "prob": 10 },
-              { "item": "porkpie", "prob": 15 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "bowhat", "prob": 10 },
+          { "item": "fedora", "prob": 40 },
+          { "item": "hat_newsboy", "prob": 5 },
+          { "item": "cowboy_hat", "prob": 20 },
+          { "item": "straw_fedora", "prob": 5 },
+          { "item": "hat_golf", "prob": 15 },
+          { "item": "straw_hat", "prob": 15 },
+          { "item": "beret_wool", "prob": 5 },
+          { "item": "beret", "prob": 10 },
+          { "item": "porkpie", "prob": 15 }
+        ],
+        "prob": 50
       },
       { "item": "hat_knit", "prob": 30 },
       { "item": "hat_cotton", "prob": 40 },
@@ -2331,25 +2325,25 @@
     "//": "unisex shirts",
     "subtype": "distribution",
     "items": [
-      { "item": "longshirt", "prob": 70, "count": [ 1, 4 ] },
+      { "item": "longshirt", "prob": 70 },
       { "item": "arm_warmers", "prob": 20 },
       { "item": "armguard_soft", "prob": 10 },
-      { "item": "dress_shirt", "prob": 50, "count": [ 1, 4 ] },
+      { "item": "dress_shirt", "prob": 50 },
       { "item": "flag_shirt", "prob": 15 },
-      { "item": "jersey", "prob": 30, "count": [ 1, 4 ] },
+      { "item": "jersey", "prob": 30 },
       { "item": "linuxtshirt", "prob": 10 },
-      { "item": "polo_shirt", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "thermal_shirt", "prob": 20, "count": [ 1, 2 ] },
+      { "item": "polo_shirt", "prob": 30 },
+      { "item": "thermal_shirt", "prob": 20 },
       { "item": "sleeveless_tunic", "prob": 10 },
-      { "item": "sweater", "prob": 40, "count": [ 1, 2 ] },
-      { "item": "sweatshirt", "prob": 50, "count": [ 1, 2 ] },
-      { "item": "tank_top", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "tshirt", "prob": 80, "count": [ 1, 4 ] },
-      { "item": "tshirt_text", "prob": 50, "count": [ 1, 4 ] },
+      { "item": "sweater", "prob": 40 },
+      { "item": "sweatshirt", "prob": 50 },
+      { "item": "tank_top", "prob": 30 },
+      { "item": "tshirt", "prob": 80 },
+      { "item": "tshirt_text", "prob": 50 },
       { "item": "tunic", "prob": 10 },
       { "item": "waistcoat", "prob": 10 },
       { "item": "wool_hoodie", "prob": 10 },
-      { "item": "hoodie", "prob": 40, "count": [ 1, 4 ] }
+      { "item": "hoodie", "prob": 40 }
     ]
   },
   {
@@ -2367,11 +2361,11 @@
     "items": [
       { "item": "thermal_suit", "prob": 15 },
       { "item": "thermal_outfit", "prob": 5 },
-      { "item": "long_undertop", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "under_armor", "prob": 10, "count": [ 1, 4 ] },
-      { "item": "undershirt", "prob": 40, "count": [ 1, 4 ] },
-      { "item": "under_armor_shorts", "prob": 10, "count": [ 1, 4 ] },
-      { "item": "long_underpants", "prob": 30, "count": [ 1, 4 ] }
+      { "item": "long_undertop", "prob": 30 },
+      { "item": "under_armor", "prob": 10 },
+      { "item": "undershirt", "prob": 40 },
+      { "item": "under_armor_shorts", "prob": 10 },
+      { "item": "long_underpants", "prob": 30 }
     ]
   },
   {
@@ -2380,18 +2374,18 @@
     "//": "womens underwear.",
     "subtype": "distribution",
     "items": [
-      { "item": "bikini_bottom", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "boy_shorts", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "bra", "prob": 60, "count": [ 1, 4 ] },
-      { "item": "panties", "prob": 70, "count": [ 1, 4 ] },
-      { "item": "bikini_top", "prob": 20, "count": [ 1, 4 ] },
+      { "item": "bikini_bottom", "prob": 20 },
+      { "item": "boy_shorts", "prob": 30 },
+      { "item": "bra", "prob": 60 },
+      { "item": "panties", "prob": 70 },
+      { "item": "bikini_top", "prob": 20 },
       { "item": "bikini_top_fur", "prob": 5 },
       { "item": "bikini_top_leather", "prob": 10 },
-      { "item": "camisole", "prob": 30, "count": [ 1, 4 ] },
+      { "item": "camisole", "prob": 30 },
       { "item": "corset", "prob": 10 },
-      { "item": "sports_bra", "prob": 50, "count": [ 1, 4 ] },
-      { "item": "stockings", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "tights", "prob": 20, "count": [ 1, 2 ] }
+      { "item": "sports_bra", "prob": 50 },
+      { "item": "stockings", "prob": 20 },
+      { "item": "tights", "prob": 20 }
     ]
   },
   {
@@ -2400,9 +2394,9 @@
     "//": "mens underwear.",
     "subtype": "distribution",
     "items": [
-      { "item": "boxer_briefs", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "boxer_shorts", "prob": 50, "count": [ 1, 4 ] },
-      { "item": "briefs", "prob": 50, "count": [ 1, 4 ] },
+      { "item": "boxer_briefs", "prob": 30 },
+      { "item": "boxer_shorts", "prob": 50 },
+      { "item": "briefs", "prob": 50 },
       { "item": "trunks", "prob": 10 }
     ]
   },
@@ -2414,44 +2408,36 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "hot_pants", "prob": 40 },
-              { "item": "hot_pants_fur", "prob": 5 },
-              { "item": "hot_pants_leather", "prob": 35 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "hot_pants", "prob": 40 },
+          { "item": "hot_pants_fur", "prob": 5 },
+          { "item": "hot_pants_leather", "prob": 35 }
+        ],
+        "prob": 10
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "chaps_leather", "prob": 30 },
-              { "item": "motorbike_pants", "prob": 35 },
-              { "item": "breeches", "prob": 25 },
-              { "item": "pants_ski", "prob": 45 },
-              { "item": "pants_checkered", "prob": 55 },
-              { "item": "pants_fur", "prob": 5 },
-              { "item": "pants_faux_fur", "prob": 15 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "chaps_leather", "prob": 30 },
+          { "item": "motorbike_pants", "prob": 35 },
+          { "item": "breeches", "prob": 25 },
+          { "item": "pants_ski", "prob": 45 },
+          { "item": "pants_checkered", "prob": 55 },
+          { "item": "pants_fur", "prob": 5 },
+          { "item": "pants_faux_fur", "prob": 15 }
+        ],
+        "prob": 20
       },
-      { "item": "jeans", "prob": 80, "count": [ 1, 4 ] },
+      { "item": "jeans", "prob": 80 },
       { "item": "jeans_red", "prob": 20 },
-      { "item": "leg_warmers", "prob": 20, "count": [ 1, 4 ] },
+      { "item": "leg_warmers", "prob": 20 },
       { "item": "leggings", "prob": 30 },
       { "item": "legguard_hard", "prob": 3 },
-      { "item": "pants", "prob": 70, "count": [ 1, 4 ] },
-      { "item": "pants_cargo", "prob": 60, "count": [ 1, 4 ] },
-      { "item": "pants_leather", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "shorts", "prob": 50, "count": [ 1, 2 ] },
-      { "item": "shorts_cargo", "prob": 60, "count": [ 1, 2 ] },
-      { "item": "shorts_denim", "prob": 40, "count": [ 1, 2 ] },
-      { "item": "b_shorts", "prob": 60, "count": [ 1, 2 ] }
+      { "item": "pants", "prob": 70 },
+      { "item": "pants_cargo", "prob": 60 },
+      { "item": "pants_leather", "prob": 20 },
+      { "item": "shorts", "prob": 50 },
+      { "item": "shorts_cargo", "prob": 60 },
+      { "item": "shorts_denim", "prob": 40 },
+      { "item": "b_shorts", "prob": 60 }
     ]
   },
   {
@@ -2459,11 +2445,7 @@
     "type": "item_group",
     "//": "womens pants and leg coverings for domestic locations.",
     "subtype": "distribution",
-    "items": [
-      { "item": "nanoskirt", "prob": 10 },
-      { "item": "skirt", "prob": 50, "count": [ 1, 3 ] },
-      { "item": "skirt_leather", "prob": 10 }
-    ]
+    "items": [ { "item": "nanoskirt", "prob": 10 }, { "item": "skirt", "prob": 50 }, { "item": "skirt_leather", "prob": 10 } ]
   },
   {
     "id": "pants_mens",
@@ -2506,73 +2488,53 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "basket_laundry", "prob": 60 },
-              { "item": "straw_basket", "prob": 35 },
-              { "item": "suitcase_l", "prob": 15 },
-              { "item": "suitcase_m", "prob": 25 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "basket_laundry", "prob": 60 },
+          { "item": "straw_basket", "prob": 35 },
+          { "item": "suitcase_l", "prob": 15 },
+          { "item": "suitcase_m", "prob": 25 }
+        ],
+        "prob": 20
       },
       {
-        "distribution": [
-          {
-            "collection": [ { "item": "2lcanteen", "prob": 50 }, { "item": "camelbak", "prob": 25 }, { "item": "canteen", "prob": 70 } ],
-            "prob": 5
-          }
-        ]
+        "distribution": [ { "item": "2lcanteen", "prob": 50 }, { "item": "camelbak", "prob": 25 }, { "item": "canteen", "prob": 70 } ],
+        "prob": 5
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "fanny", "prob": 60 },
-              { "item": "mbag", "prob": 35 },
-              { "item": "runner_bag", "prob": 45 },
-              { "item": "slingpack", "prob": 65 },
-              { "item": "purse", "prob": 70 },
-              { "item": "briefcase", "prob": 40 },
-              { "item": "hk_briefcase", "prob": 1 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "fanny", "prob": 60 },
+          { "item": "mbag", "prob": 35 },
+          { "item": "runner_bag", "prob": 45 },
+          { "item": "slingpack", "prob": 65 },
+          { "item": "purse", "prob": 70 },
+          { "item": "briefcase", "prob": 40 },
+          { "item": "hk_briefcase", "prob": 1 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "case_violin", "prob": 5 },
-              { "item": "quiver", "prob": 20 },
-              { "item": "quiver_large", "prob": 15 },
-              { "item": "solarpack", "prob": 5 },
-              { "item": "ammo_satchel", "prob": 10 },
-              { "item": "chestrig", "prob": 20 },
-              { "item": "dive_bag", "prob": 50 },
-              { "item": "petpack", "prob": 50 }
-            ],
-            "prob": 30
-          }
-        ]
+          { "item": "case_violin", "prob": 5 },
+          { "item": "quiver", "prob": 20 },
+          { "item": "quiver_large", "prob": 15 },
+          { "item": "solarpack", "prob": 5 },
+          { "item": "ammo_satchel", "prob": 10 },
+          { "item": "chestrig", "prob": 20 },
+          { "item": "dive_bag", "prob": 50 },
+          { "item": "petpack", "prob": 50 }
+        ],
+        "prob": 30
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "daypack", "prob": 25 },
-              { "item": "backpack_leather", "prob": 40 },
-              { "item": "backpack", "prob": 85 },
-              { "item": "backpack_hiking", "prob": 25 },
-              { "item": "duffelbag", "prob": 80 },
-              { "item": "travelpack", "prob": 25 },
-              { "item": "gobag", "prob": 1 }
-            ],
-            "prob": 80
-          }
-        ]
+          { "item": "daypack", "prob": 25 },
+          { "item": "backpack_leather", "prob": 40 },
+          { "item": "backpack", "prob": 85 },
+          { "item": "backpack_hiking", "prob": 25 },
+          { "item": "duffelbag", "prob": 80 },
+          { "item": "travelpack", "prob": 25 },
+          { "item": "gobag", "prob": 1 }
+        ],
+        "prob": 80
       }
     ]
   },
@@ -2612,9 +2574,9 @@
     "subtype": "distribution",
     "items": [
       { "item": "dress_wedding", "prob": 5 },
-      { "item": "sundress", "prob": 60, "count": [ 1, 4 ] },
-      { "item": "gown", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "dress", "prob": 60, "count": [ 1, 4 ] },
+      { "item": "sundress", "prob": 60 },
+      { "item": "gown", "prob": 20 },
+      { "item": "dress", "prob": 60 },
       { "item": "veil_wedding", "prob": 5 }
     ]
   },
@@ -2626,101 +2588,77 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "cloak", "prob": 80 },
-              { "item": "cloak_wool", "prob": 40 },
-              { "item": "cloak_leather", "prob": 20 },
-              { "item": "cloak_fur", "prob": 10 },
-              { "item": "jedi_cloak", "prob": 5 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "cloak", "prob": 80 },
+          { "item": "cloak_wool", "prob": 40 },
+          { "item": "cloak_leather", "prob": 20 },
+          { "item": "cloak_fur", "prob": 10 },
+          { "item": "jedi_cloak", "prob": 5 }
+        ],
+        "prob": 20
       },
       {
-        "collection": [
-          {
-            "distribution": [
-              { "item": "duster", "prob": 80 },
-              { "item": "duster_leather", "prob": 60 },
-              { "item": "duster_faux_fur", "prob": 30 },
-              { "item": "duster_fur", "prob": 5 },
-              { "item": "sleeveless_duster", "prob": 70 },
-              { "item": "sleeveless_duster_leather", "prob": 50 },
-              { "item": "sleeveless_duster_fur", "prob": 20 },
-              { "item": "sleeveless_duster_faux_fur", "prob": 10 }
-            ],
-            "prob": 60
-          },
-          {
-            "distribution": [
-              { "item": "trenchcoat", "prob": 80 },
-              { "item": "trenchcoat_leather", "prob": 60 },
-              { "item": "trenchcoat_faux_fur", "prob": 30 },
-              { "item": "trenchcoat_fur", "prob": 5 },
-              { "item": "sleeveless_trenchcoat", "prob": 40 },
-              { "item": "sleeveless_trenchcoat_leather", "prob": 30 },
-              { "item": "sleeveless_trenchcoat_fur", "prob": 10 },
-              { "item": "sleeveless_trenchcoat_faux_fur", "prob": 20 }
-            ],
-            "prob": 40
-          }
-        ]
+        "distribution": [
+          { "item": "duster", "prob": 80 },
+          { "item": "duster_leather", "prob": 60 },
+          { "item": "duster_faux_fur", "prob": 30 },
+          { "item": "duster_fur", "prob": 5 },
+          { "item": "sleeveless_duster", "prob": 70 },
+          { "item": "sleeveless_duster_leather", "prob": 50 },
+          { "item": "sleeveless_duster_fur", "prob": 20 },
+          { "item": "sleeveless_duster_faux_fur", "prob": 10 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "coat_rain", "prob": 80 },
-              { "item": "coat_winter", "prob": 50 },
-              { "item": "peacoat", "prob": 50 },
-              { "item": "greatcoat", "prob": 35 },
-              { "item": "coat_faux_fur", "prob": 20 },
-              { "item": "coat_fur", "prob": 10 },
-              { "item": "coat_fur_sf", "prob": 5 }
-            ],
-            "prob": 80
-          }
-        ]
+          { "item": "trenchcoat", "prob": 80 },
+          { "item": "trenchcoat_leather", "prob": 60 },
+          { "item": "trenchcoat_faux_fur", "prob": 30 },
+          { "item": "trenchcoat_fur", "prob": 5 },
+          { "item": "sleeveless_trenchcoat", "prob": 40 },
+          { "item": "sleeveless_trenchcoat_leather", "prob": 30 },
+          { "item": "sleeveless_trenchcoat_fur", "prob": 10 },
+          { "item": "sleeveless_trenchcoat_faux_fur", "prob": 20 }
+        ],
+        "prob": 40
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "jacket_jean", "prob": 80 },
-              { "item": "jacket_flannel", "prob": 50 },
-              { "item": "jacket_leather", "prob": 50 },
-              { "item": "jacket_leather_red", "prob": 25 },
-              { "item": "jacket_light", "prob": 60 },
-              { "item": "jacket_windbreaker", "prob": 70 },
-              { "item": "poncho", "prob": 30 },
-              { "item": "ski_jacket", "prob": 25 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "coat_rain", "prob": 80 },
+          { "item": "coat_winter", "prob": 50 },
+          { "item": "peacoat", "prob": 50 },
+          { "item": "greatcoat", "prob": 35 },
+          { "item": "coat_faux_fur", "prob": 20 },
+          { "item": "coat_fur", "prob": 10 },
+          { "item": "coat_fur_sf", "prob": 5 }
+        ],
+        "prob": 80
       },
       {
         "distribution": [
-          {
-            "collection": [ { "item": "house_coat", "prob": 80 }, { "item": "kimono", "prob": 20 }, { "item": "robe", "prob": 10 } ],
-            "prob": 30
-          }
-        ]
+          { "item": "jacket_jean", "prob": 80 },
+          { "item": "jacket_flannel", "prob": 50 },
+          { "item": "jacket_leather", "prob": 50 },
+          { "item": "jacket_leather_red", "prob": 25 },
+          { "item": "jacket_light", "prob": 60 },
+          { "item": "jacket_windbreaker", "prob": 70 },
+          { "item": "poncho", "prob": 30 },
+          { "item": "ski_jacket", "prob": 25 }
+        ],
+        "prob": 60
+      },
+      {
+        "distribution": [ { "item": "house_coat", "prob": 80 }, { "item": "kimono", "prob": 20 }, { "item": "robe", "prob": 10 } ],
+        "prob": 30
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "vest", "prob": 80 },
-              { "item": "vest_leather", "prob": 20 },
-              { "item": "army_top", "prob": 40 },
-              { "item": "blazer", "prob": 70 }
-            ],
-            "prob": 40
-          }
-        ]
+          { "item": "vest", "prob": 80 },
+          { "item": "vest_leather", "prob": 20 },
+          { "item": "army_top", "prob": 40 },
+          { "item": "blazer", "prob": 70 }
+        ],
+        "prob": 40
       }
     ]
   },
@@ -2732,76 +2670,56 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "boots", "prob": 80 },
-              { "item": "boots_hiking", "prob": 50 },
-              { "item": "boots_steel", "prob": 50 },
-              { "item": "boots_combat", "prob": 45 },
-              { "item": "boots_fur", "prob": 10 },
-              { "item": "boots_western", "prob": 40 },
-              { "item": "boots_winter", "prob": 30 },
-              { "item": "knee_high_boots", "prob": 15 },
-              { "item": "motorbike_boots", "prob": 35 },
-              { "item": "thigh_high_boots", "prob": 5 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "boots", "prob": 80 },
+          { "item": "boots_hiking", "prob": 50 },
+          { "item": "boots_steel", "prob": 50 },
+          { "item": "boots_combat", "prob": 45 },
+          { "item": "boots_fur", "prob": 10 },
+          { "item": "boots_western", "prob": 40 },
+          { "item": "boots_winter", "prob": 30 },
+          { "item": "knee_high_boots", "prob": 15 },
+          { "item": "motorbike_boots", "prob": 35 },
+          { "item": "thigh_high_boots", "prob": 5 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bastsandals", "prob": 20 },
-              { "item": "straw_sandals", "prob": 20 },
-              { "item": "flip_flops", "prob": 40 },
-              { "item": "leathersandals", "prob": 35 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "bastsandals", "prob": 20 },
+          { "item": "straw_sandals", "prob": 20 },
+          { "item": "flip_flops", "prob": 40 },
+          { "item": "leathersandals", "prob": 35 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "cleats", "prob": 20 },
-              { "item": "golf_shoes", "prob": 20 },
-              { "item": "dance_shoes", "prob": 30 },
-              { "item": "roller_blades", "prob": 35 },
-              { "item": "rollerskates", "prob": 35 },
-              { "item": "roller_shoes_off", "prob": 45 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "cleats", "prob": 20 },
+          { "item": "golf_shoes", "prob": 20 },
+          { "item": "dance_shoes", "prob": 30 },
+          { "item": "roller_blades", "prob": 35 },
+          { "item": "rollerskates", "prob": 35 },
+          { "item": "roller_shoes_off", "prob": 45 }
+        ],
+        "prob": 20
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "dress_shoes", "prob": 50 },
-              { "item": "lowtops", "prob": 30 },
-              { "item": "mocassins", "prob": 10 },
-              { "item": "sneakers", "prob": 35 }
-            ],
-            "prob": 70
-          }
-        ]
+          { "item": "dress_shoes", "prob": 50 },
+          { "item": "lowtops", "prob": 30 },
+          { "item": "mocassins", "prob": 10 },
+          { "item": "sneakers", "prob": 35 }
+        ],
+        "prob": 70
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "boots_rubber", "prob": 50 },
-              { "item": "clogs", "prob": 20 },
-              { "item": "geta", "prob": 10 },
-              { "item": "slippers", "prob": 75 }
-            ],
-            "prob": 70
-          }
-        ]
+          { "item": "boots_rubber", "prob": 50 },
+          { "item": "clogs", "prob": 20 },
+          { "item": "geta", "prob": 10 },
+          { "item": "slippers", "prob": 75 }
+        ],
+        "prob": 70
       }
     ]
   },
@@ -2816,143 +2734,110 @@
     "id": "accesories_personal_unisex",
     "type": "item_group",
     "//": "unisex personal accessories",
-    "subtype": "distribution",
+    "subtype": "collection",
     "items": [
       { "group": "clothing_glasses", "prob": 10 },
       { "group": "clothing_watch", "prob": 10 },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "ring_wedding", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "copper_ring", "prob": 80, "count": [ 1, 3 ] },
-              { "item": "silver_ring", "prob": 50, "count": [ 1, 3 ] },
-              { "item": "gold_ring", "prob": 40, "count": [ 1, 3 ] },
-              { "item": "diamond_ring", "prob": 10 },
-              { "item": "platinum_ring", "prob": 10 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "ring_wedding", "prob": 50, "count": [ 1, 2 ] },
+          { "item": "copper_ring", "prob": 80, "count": [ 1, 3 ] },
+          { "item": "silver_ring", "prob": 50, "count": [ 1, 3 ] },
+          { "item": "gold_ring", "prob": 40, "count": [ 1, 3 ] },
+          { "item": "diamond_ring", "prob": 10 },
+          { "item": "platinum_ring", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "ear_spool", "prob": 20, "count": [ 1, 2 ] },
-              { "item": "bead_ear", "prob": 70, "count": [ 1, 2 ] },
-              { "item": "copper_ear", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "silver_ear", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_ear", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "platinum_ear", "prob": 10 },
-              { "item": "ear_plugs", "prob": 40 },
-              { "item": "attached_ear_plugs_off", "prob": 30 }
-            ],
-            "prob": 60
-          }
+          { "item": "ear_spool", "prob": 20, "count": [ 1, 2 ] },
+          { "item": "bead_ear", "prob": 70, "count": [ 1, 2 ] },
+          { "item": "copper_ear", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "silver_ear", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_ear", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "platinum_ear", "prob": 10 },
+          { "item": "ear_plugs", "prob": 40 },
+          { "item": "attached_ear_plugs_off", "prob": 30 }
         ]
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bead_bracelet", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "bracelet_friendship", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "copper_bracelet", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "silver_bracelet", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_bracelet", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "platinum_bracelet", "prob": 10 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "bead_bracelet", "prob": 80, "count": [ 1, 2 ] },
+          { "item": "bracelet_friendship", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "copper_bracelet", "prob": 50, "count": [ 1, 2 ] },
+          { "item": "silver_bracelet", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_bracelet", "prob": 10, "count": [ 1, 2 ] },
+          { "item": "platinum_bracelet", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "gold_dental_grill", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "platinum_dental_grill", "prob": 30, "count": [ 1, 2 ] },
-              { "item": "diamond_dental_grill", "prob": 10 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "gold_dental_grill", "prob": 50, "count": [ 1, 2 ] },
+          { "item": "platinum_dental_grill", "prob": 30, "count": [ 1, 2 ] },
+          { "item": "diamond_dental_grill", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bead_necklace", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "copper_necklace", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "silver_necklace", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_necklace", "prob": 20, "count": [ 1, 2 ] },
-              { "item": "platinum_necklace", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "copper_locket", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "silver_locket", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_locket", "prob": 20, "count": [ 1, 2 ] },
-              { "item": "platinum_locket", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "collarpin", "prob": 10 },
-              { "item": "bronze_medal", "prob": 6 },
-              { "item": "silver_medal", "prob": 4 },
-              { "item": "gold_medal", "prob": 2 },
-              { "item": "small_relic", "prob": 10 },
-              { "item": "holy_symbol", "prob": 10 },
-              { "item": "holy_symbol_wood", "prob": 10 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "bead_necklace", "prob": 80, "count": [ 1, 2 ] },
+          { "item": "copper_necklace", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "silver_necklace", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_necklace", "prob": 20, "count": [ 1, 2 ] },
+          { "item": "platinum_necklace", "prob": 10, "count": [ 1, 2 ] },
+          { "item": "copper_locket", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "silver_locket", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_locket", "prob": 20, "count": [ 1, 2 ] },
+          { "item": "platinum_locket", "prob": 10, "count": [ 1, 2 ] },
+          { "item": "collarpin", "prob": 10 },
+          { "item": "bronze_medal", "prob": 6 },
+          { "item": "silver_medal", "prob": 4 },
+          { "item": "gold_medal", "prob": 2 },
+          { "item": "small_relic", "prob": 10 },
+          { "item": "holy_symbol", "prob": 10 },
+          { "item": "holy_symbol_wood", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "faux_fur_cat_ears", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "leather_cat_ears", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "fur_cat_ears", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "faux_fur_cat_tail", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "leather_cat_tail", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "fur_cat_tail", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "faux_fur_collar", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "leather_collar", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "fur_collar", "prob": 10, "count": [ 1, 2 ] }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "faux_fur_cat_ears", "prob": 80 },
+          { "item": "leather_cat_ears", "prob": 50 },
+          { "item": "fur_cat_ears", "prob": 10 },
+          { "item": "faux_fur_cat_tail", "prob": 80 },
+          { "item": "leather_cat_tail", "prob": 50 },
+          { "item": "fur_cat_tail", "prob": 10 },
+          { "item": "faux_fur_collar", "prob": 80 },
+          { "item": "leather_collar", "prob": 50 },
+          { "item": "fur_collar", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bootstrap", "prob": 20 },
-              { "item": "bootsheath", "prob": 50 },
-              { "item": "sheath", "prob": 80 },
-              { "item": "back_holster", "prob": 10 },
-              { "item": "holster", "prob": 30 },
-              { "item": "sholster", "prob": 10 },
-              { "item": "bholster", "prob": 10 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "bootstrap", "prob": 20 },
+          { "item": "bootsheath", "prob": 50 },
+          { "item": "sheath", "prob": 80 },
+          { "item": "back_holster", "prob": 10 },
+          { "item": "holster", "prob": 30 },
+          { "item": "sholster", "prob": 10 },
+          { "item": "bholster", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "elbow_pads", "prob": 50 },
-              { "item": "knee_pads", "prob": 50 },
-              { "item": "iggaak", "prob": 5 },
-              { "item": "goggles_swim", "prob": 10 },
-              { "item": "glasses_bal", "prob": 10 },
-              { "item": "eclipse_glasses", "prob": 5 },
-              { "item": "goggles_ski", "prob": 10 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "elbow_pads", "prob": 50 },
+          { "item": "knee_pads", "prob": 50 },
+          { "item": "iggaak", "prob": 5 },
+          { "item": "goggles_swim", "prob": 10 },
+          { "item": "glasses_bal", "prob": 10 },
+          { "item": "eclipse_glasses", "prob": 5 },
+          { "item": "goggles_ski", "prob": 10 }
+        ],
+        "prob": 15
       },
       { "item": "folding_poncho", "prob": 10 },
       { "item": "american_flag", "prob": 2 },
diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json
index f77dffd401b87..353f90610d01a 100644
--- a/data/json/itemgroups/mansion.json
+++ b/data/json/itemgroups/mansion.json
@@ -57,37 +57,97 @@
     "subtype": "collection",
     "entries": [
       { "group": "everyday_gear", "prob": 40 },
-      { "group": "shoes", "prob": 30, "damage": [ 0, 4 ] },
-      { "group": "shirts", "prob": 60, "damage": [ 0, 4 ] },
-      { "group": "jackets", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "common_gloves", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "hatstore_hats", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "hatstore_accessories", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "clothing_glasses", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "jewelry_accessories", "prob": 15 },
-      {
-        "distribution": [
-          { "item": "wristwatch", "prob": 15 },
-          { "item": "pocketwatch", "prob": 5 },
-          { "item": "gold_watch", "prob": 5, "damage": [ 1, 4 ] },
-          { "item": "diving_watch", "prob": 10, "damage": [ 1, 4 ] },
-          { "item": "sf_watch", "prob": 5, "damage": [ 1, 4 ] }
-        ],
-        "prob": 20
-      },
+      { "group": "coats_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "scarfs_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "accesories_personal_unisex", "prob": 15 },
       {
         "distribution": [
           {
             "collection": [
-              { "group": "male_underwear", "prob": 90, "damage": [ 0, 4 ] },
-              { "group": "pants_male", "prob": 60, "damage": [ 0, 4 ] },
+              {
+                "distribution": [
+                  { "group": "male_underwear", "prob": 90, "damage": [ 1, 4 ] },
+                  { "item": "union_suit", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_male", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] }
+                    ]
+                  },
+                  { "item": "suit", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "tux", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "thawb", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "cassock", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "haori", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 },
+              { "group": "accesories_personal_mens", "prob": 15, "damage": [ 1, 4 ] },
               { "group": "corpse_male" }
             ]
           },
           {
             "collection": [
-              { "group": "female_underwear", "prob": 90, "damage": [ 0, 4 ] },
-              { "group": "pants_female", "prob": 60, "damage": [ 0, 4 ] },
+              { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] },
+              { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_female", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [
+                          {
+                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                          },
+                          { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      }
+                    ],
+                    "prob": 70
+                  },
+                  {
+                    "collection": [
+                      {
+                        "distribution": [
+                          { "item": "gown", "prob": 10, "damage": [ 1, 4 ] },
+                          { "item": "dress", "prob": 70, "damage": [ 1, 4 ] },
+                          { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 20
+                  },
+                  {
+                    "collection": [
+                      { "item": "dress_wedding", "damage": [ 1, 4 ] },
+                      { "item": "veil_wedding", "damage": [ 1, 4 ] },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 10
+                  }
+                ]
+              },
               { "group": "corpse_female" }
             ]
           },
@@ -95,6 +155,9 @@
             "collection": [
               { "group": "underwear", "prob": 90, "damage": [ 0, 4 ] },
               { "group": "pants", "prob": 60, "damage": [ 0, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] },
               { "group": "corpse_child" }
             ]
           }
diff --git a/data/json/monsterdrops/monster_drops.json b/data/json/monsterdrops/monster_drops.json
index 35945faecd42f..292cf5b945653 100644
--- a/data/json/monsterdrops/monster_drops.json
+++ b/data/json/monsterdrops/monster_drops.json
@@ -5,21 +5,99 @@
     "//": "contains cloth for an average zombie",
     "id": "default_zombie_clothes",
     "entries": [
-      { "group": "pants", "damage": [ 1, 4 ] },
-      { "group": "shirts", "damage": [ 1, 4 ] },
-      { "group": "shoes", "damage": [ 1, 4 ] },
-      { "group": "underwear", "damage": [ 1, 4 ] },
-      { "group": "jackets", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "suits", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "coats_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "scarfs_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "accesories_personal_unisex", "damage": [ 1, 4 ], "prob": 15 },
       {
         "distribution": [
-          { "item": "wristwatch", "prob": 15 },
-          { "item": "pocketwatch", "prob": 5 },
-          { "item": "gold_watch", "prob": 5, "damage": [ 1, 4 ] },
-          { "item": "diving_watch", "prob": 10, "damage": [ 1, 4 ] },
-          { "item": "sf_watch", "prob": 5, "damage": [ 1, 4 ] }
-        ],
-        "prob": 20
+          {
+            "collection": [
+              {
+                "distribution": [
+                  { "group": "male_underwear", "prob": 90, "damage": [ 1, 4 ] },
+                  { "item": "union_suit", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_male", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] }
+                    ]
+                  },
+                  { "item": "suit", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "tux", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "thawb", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "cassock", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "haori", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 },
+              { "group": "accesories_personal_mens", "prob": 15, "damage": [ 1, 4 ] }
+            ]
+          },
+          {
+            "collection": [
+              { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] },
+              { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_female", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [
+                          {
+                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                          },
+                          { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      }
+                    ],
+                    "prob": 70
+                  },
+                  {
+                    "collection": [
+                      {
+                        "distribution": [
+                          { "item": "gown", "prob": 10, "damage": [ 1, 4 ] },
+                          { "item": "dress", "prob": 70, "damage": [ 1, 4 ] },
+                          { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 20
+                  },
+                  {
+                    "collection": [
+                      { "item": "dress_wedding", "damage": [ 1, 4 ] },
+                      { "item": "veil_wedding", "damage": [ 1, 4 ] },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 10
+                  }
+                ]
+              }
+            ]
+          }
+        ]
       },
       {
         "distribution": [
@@ -27,12 +105,7 @@
           { "group": "clothing_biker", "damage": [ 1, 4 ], "prob": 50 }
         ],
         "prob": 10
-      },
-      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "hatstore_accessories", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "clothing_glasses", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "jewelry_accessories", "prob": 15 }
+      }
     ]
   },
   {
@@ -414,5 +487,87 @@
       { "item": "cable", "charges-min": 20, "charges-max": 50 },
       { "item": "amplifier", "count": [ 0, 3 ] }
     ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "contains cloth for an average zombie child",
+    "id": "default_zombie_children_clothes",
+    "entries": [
+      { "group": "coats_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "scarfs_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "accesories_personal_unisex", "damage": [ 1, 4 ], "prob": 15 },
+      {
+        "distribution": [
+          {
+            "collection": [
+              {
+                "distribution": [
+                  { "group": "male_underwear", "prob": 90, "damage": [ 1, 4 ] },
+                  { "item": "union_suit", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_male", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] }
+                    ]
+                  },
+                  { "item": "suit", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "tux", "prob": 5, "damage": [ 1, 4 ] }
+                ]
+              },
+              { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 },
+              { "group": "accesories_personal_mens", "prob": 15, "damage": [ 1, 4 ] }
+            ]
+          },
+          {
+            "collection": [
+              { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] },
+              { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_female", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [
+                          {
+                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                          },
+                          { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      }
+                    ],
+                    "prob": 80
+                  },
+                  {
+                    "collection": [
+                      {
+                        "distribution": [ { "item": "dress", "prob": 70, "damage": [ 1, 4 ] }, { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      }
+                    ],
+                    "prob": 20
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
   }
 ]
diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json
index acf825abd1f16..a61cdfa40a73c 100644
--- a/data/json/monsters/zed_children.json
+++ b/data/json/monsters/zed_children.json
@@ -60,8 +60,8 @@
     "special_attacks": [ [ "scratch", 15 ] ],
     "death_drops": {
       "subtype": "collection",
-      "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ],
-      "//": "cloth as any other zombie (always), additional items from child_items (sometimes)"
+      "groups": [ [ "default_zombie_children_clothes", 100 ], [ "child_items", 65 ] ],
+      "//": "default zombie children clothing (always), additional items from child_items (sometimes)"
     },
     "death_function": [ "NORMAL" ],
     "burn_into": "mon_zombie_child_scorched",