Merge pull request #35928 from I-am-Erk/cardboard-boxes1

Put some stuff into boxes
CleverRaven · Dec 8, 2019 · 77a4522 · 77a4522
2 parents 49b5702 + b9192f2
commit 77a4522
Showing 1 changed file with 29 additions and 24 deletions.
diff --git a/data/json/itemgroups/collections_trades.json b/data/json/itemgroups/collections_trades.json
@@ -14,31 +14,36 @@
     "type": "item_group",
     "id": "mischw",
     "//": "A general hardware group for retail, workshops, etc., with an odd assortment of extra items.",
+    "//2": "often spawns a box to hold everything, sometimes a plastic sheet to cover it, and then some stuff in the box.",
+    "subtype": "collection",
     "items": [
-      { "group": "tools_general", "prob": 90 },
-      { "group": "supplies_hardware", "prob": 50 },
-      { "group": "hardware_clothing", "prob": 20 },
-      { "group": "hardware_bulk", "prob": 10 },
-      { "group": "hardware_books", "prob": 10 },
-      [ "survnote", 1 ],
-      [ "box_medium", 5 ],
-      [ "box_large", 2 ],
-      [ "plastic_sheet", 2 ],
-      [ "machete", 5 ],
-      [ "boots_combat", 10 ],
-      [ "boots_hiking", 5 ],
-      [ "runner_bag", 3 ],
-      [ "bb", 8 ],
-      [ "bbgun", 10 ],
-      [ "beartrap", 3 ],
-      [ "radio", 20 ],
-      [ "hotplate", 10 ],
-      [ "extinguisher", 20 ],
-      [ "cable", 60 ],
-      [ "sm_extinguisher", 10 ],
-      [ "grapnel", 1 ],
-      [ "misc_repairkit", 5 ],
-      [ "knitting_needles", 1 ]
+      { "distribution": [ { "item": "box_medium", "prob": 75 }, { "item": "box_large", "prob": 25 } ], "prob": 25 },
+      [ "plastic_sheet", 10 ],
+      {
+        "distribution": [
+          { "group": "tools_general", "prob": 90 },
+          { "group": "supplies_hardware", "prob": 50 },
+          { "group": "hardware_clothing", "prob": 20 },
+          { "group": "hardware_bulk", "prob": 10 },
+          { "group": "hardware_books", "prob": 10 },
+          { "item": "survnote", "prob": 1 },
+          { "item": "machete", "prob": 5 },
+          { "item": "boots_combat", "prob": 10 },
+          { "item": "boots_hiking", "prob": 5 },
+          { "item": "runner_bag", "prob": 3 },
+          { "item": "bb", "prob": 8 },
+          { "item": "bbgun", "prob": 10 },
+          { "item": "beartrap", "prob": 3 },
+          { "item": "radio", "prob": 20 },
+          { "item": "hotplate", "prob": 10 },
+          { "item": "extinguisher", "prob": 20 },
+          { "item": "cable", "prob": 60 },
+          { "item": "sm_extinguisher", "prob": 10 },
+          { "item": "grapnel", "prob": 1 },
+          { "item": "misc_repairkit", "prob": 5 },
+          { "item": "knitting_needles", "prob": 1 }
+        ]
+      }
     ]
   },
   {