more variety in shelter_supplies (#36282)

* shelter_supplies * Update generic.json * Update data/json/itemgroups/item_groups.json Co-Authored-By: I-am-Erk <[email protected]> * Update shelter.json * Update shelter.json * Update data/json/mapgen/shelter.json Co-Authored-By: I-am-Erk <[email protected]> Co-authored-by: I-am-Erk <[email protected]>
CleverRaven · Dec 28, 2019 · 7159683 · 7159683
1 parent f8ba267
commit 7159683
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -1842,6 +1842,7 @@
       [ "scorecard", 10 ],
       [ "talking_doll", 60 ],
       [ "marble", 65 ],
+      [ "handflare_dead", 3 ],
       [ "creepy_doll", 1 ],
       [ "straw_doll", 1 ],
       [ "striped_shirt", 1 ],

diff --git a/data/json/mapgen/shelter.json b/data/json/mapgen/shelter.json
@@ -5,16 +5,29 @@
     "subtype": "collection",
     "//": "now used for shelters that have been looted by kids, see SUS groups for general shelter supplies",
     "items": [
-      [ "jacket_evac", 10 ],
-      [ "emer_blanket", 40 ],
       [ "wrapper", 90 ],
+      [ "evac_pamphlet", 80 ],
       [ "glass_shard", 80 ],
+      [ "emer_blanket", 40 ],
       [ "bottle_plastic", 30 ],
       [ "plastic_knife", 20 ],
       [ "plastic_spoon", 20 ],
       [ "plastic_fork", 20 ],
       [ "bowl_plastic", 10 ],
-      [ "evac_pamphlet", 80 ],
+      [ "jacket_evac", 15 ],
+      [ "folding_poncho", 10 ],
+      [ "sponge", 10 ],
+      [ "mask_dust", 9 ],
+      [ "handflare_dead", 9 ],
+      [ "whistle", 7 ],
+      [ "teddy_bear", 7 ],
+      { "item": "vinegar", "prob": 6, "charges-min": 1 },
+      [ "candle", 5 ],
+      [ "pliers", 4 ],
+      [ "mirror", 4 ],
+      [ "wearable_light", 2 ],
+      [ "calcium_tablet", 1 ],
+      [ "vitamins", 1 ],
       { "item": "protein_bar_evac", "count": [ 0, 3 ] }
     ]
   },