From 7159683abbf5e2b3d3a79f776e079aa0f795a596 Mon Sep 17 00:00:00 2001 From: Jerimee Richir Date: Sat, 28 Dec 2019 10:20:18 -0500 Subject: [PATCH] more variety in shelter_supplies (#36282) * shelter_supplies * Update generic.json * Update data/json/itemgroups/item_groups.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * Update shelter.json * Update shelter.json * Update data/json/mapgen/shelter.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/itemgroups/item_groups.json | 1 + data/json/mapgen/shelter.json | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 821569189d947..77d5d600ad53b 100644 --- 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 index 08c04be62d0d2..c334dc18539ce 100644 --- 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 ] } ] },