Add more locations for maid items

Fix typos

1 files changed, 88 insertions, 21 deletions

diff --git a/item_groups.json b/item_groups.json
index 328d727..72def2d 100644
--- a/item_groups.json
+++ b/item_groups.json
@@ -57,26 +57,93 @@
     ]
   },
   {
-    "type" : "item_group",
-    "id" : "dresser_stack",
-    "ammo": 100,
-    "magazine": 100,
+    "id": "dresser_stack",
+    "type": "item_group",
+    "subtype": "distribution",
     "items": [
-      [ "maid_dress_french", 3 ],
-      [ "kawaii_maid_hat", 3 ],
-      [ "kawaii_hat_cotton", 3 ],
-      [ "kawaii_maid_dress", 3 ],
-      [ "jokyu_fuku", 3 ],
-      [ "kawaii_maid_panties", 3 ],
-      [ "kawaii_maid_bra", 3 ],
-      [ "kawaii_maid_garter", 3 ],
-      [ "petticoat", 3 ],
-      [ "kawaii_maid_niso_thick", 3 ],
-      [ "kawaii_maid_niso_thin", 3 ],
-      [ "maid_gloves_cotton", 3 ],
-      [ "maid_gloves_long_cotton", 3 ],
-      [ "kawaii_dress_shoes", 3 ],
-      [ "kawaii_boots", 3 ]
+      [ "null", 80 ],
+      { "group": "dresser_male", "prob": 40 },
+      { "group": "dresser_female", "prob": 40 },
+      { "group": "dresser_winter", "prob": 20 },
+      { "group": "dresser_servant", "prob": 20 },
+      { "group": "dresser_shoes", "prob": 10 },
+      { "group": "dresser_shabby", "prob": 5 },
+      { "group": "dresser_fancy", "prob": 5 }
+    ]
+  },
+  {
+    "id": "cm_maid",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "cleaning", "prob": 40 },
+      { "group": "maid_underwear", "prob": 90, "damage": [ 0, 4 ] },
+      { "group": "shoes_maid", "prob": 30, "damage": [ 0, 4 ] },
+      { "distribution": [
+                  { "item": "kawaii_maid_hat", "prob": 50, "damage": [ 0, 4 ] },
+                  { "item": "maid_hat", "prob": 50, "damage": [ 0, 4 ] }
+                ]
+      },
+      { "distribution": [
+                  { "item": "maid_dress", "prob": 100, "damage": [ 0, 4 ] },
+                  { "item": "kawaii_maid_dress", "prob": 100, "damage": [ 0, 4 ] },
+                  { "item": "maid_dress_french", "prob": 100, "damage": [ 0, 4 ] }
+                ]
+      },
+      { "group": "corpse_female" }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "maid_underwear",
+    "groups": [ "maid_underwear_top", "maid_underwear_bottom" ]
+  },
+  {
+    "type": "item_group",
+    "id": "maid_underwear_top",
+    "items": [
+      [ "kawaii_maid_bra", 70 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "maid_underwear_bottom",
+    "items": [
+      [ "kawaii_maid_panties", 70 ]
+    ]
+  },
+  {
+    "type" : "item_group",
+    "id" : "shoes_maid",
+    "items":[
+      [ "kawaii_maid_niso_thick", 70 ],
+      [ "kawaii_maid_niso_thin", 70 ],
+      [ "kawaii_dress_shoes", 60 ],
+      [ "kawaii_boots", 50 ],
+      [ "kawaii_maid_garter", 20 ],
+      [ "petticoat", 20 ]
+    ]
+  },
+  {
+    "id": "private_resort_staff_female",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "maid_underwear" },
+      { "distribution":
+        [
+          { "group": "shoes_maid", "prob": 10 }
+        ]
+      },
+      { "distribution":
+        [
+          { "item": "maid_dress", "prob": 100 },
+          { "item": "kawaii_maid_dress", "prob": 100 },
+          { "item": "maid_dress_french", "prob": 100 }
+        ]
+      },
+      { "item": "maid_hat", "prob": 66 }
     ]
   },
   {
@@ -153,7 +220,7 @@
     "id" : "shoestore_accessories",
     "items":[
       [ "kawaii_maid_niso_thick", 10 ],
-      [ "kawaii_maid_niso_thin", 10 ],
+      [ "kawaii_maid_niso_thin", 10 ]
     ]
   },
   {
@@ -162,7 +229,7 @@
     "items":[
       [ "maid_dress_french", 35 ],
       [ "kawaii_maid_dress", 35 ],
-      [ "jokyu_fuku", 35 ]
+      [ "jokyu_fuku", 35 ],
       [ "kawaii_maid_hat", 10 ],
       [ "kawaii_scarf", 5 ],
       [ "kawaii_maid_bra", 5 ],