Skip to content

Commit

Permalink
more variety is SUS shelter items (#36284)
Browse files Browse the repository at this point in the history
* Update evac_shelter.json

* Update generic.json

* Update data/json/itemgroups/SUS/evac_shelter.json

Co-Authored-By: I-am-Erk <[email protected]>

* Update evac_shelter.json

* Update evac_shelter.json

* Update evac_shelter.json

* Update evac_shelter.json

Co-authored-by: I-am-Erk <[email protected]>
  • Loading branch information
Jerimee and I-am-Erk committed Dec 24, 2019
1 parent 5f963d1 commit 0ab5f48
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
15 changes: 11 additions & 4 deletions data/json/itemgroups/SUS/evac_shelter.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "SUS_evac_shelter_locker",
"type": "item_group",
"//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
"//2": "Each locker contains by spec one jacket, one blanket, one gas mask, a flashlight, a plastic bowl and utensils, a lighter, and two bottles of water. Not every locker is fully stocked.",
"//2": "Each locker contains by spec one jacket, one blanket, one gas mask, a flashlight, a whistle, a plastic bowl and utensils, a lighter, and two bottles of water. Not every locker is fully stocked.",
"subtype": "collection",
"entries": [
{ "item": "evac_pamphlet", "prob": 99 },
Expand All @@ -13,6 +13,7 @@
{ "item": "flashlight", "prob": 50 },
{ "item": "light_disposable_cell", "prob": 10 },
{ "item": "lighter", "prob": 20 },
{ "item": "whistle", "prob": 70 },
{ "item": "water_clean", "count": [ 1, 2 ], "prob": 80 },
{ "item": "protein_bar_evac", "count": [ 2, 3 ] },
{
Expand Down Expand Up @@ -83,7 +84,8 @@
{ "item": "1st_aid", "count": [ 1, 3 ], "prob": 65 },
{ "item": "two_way_radio", "prob": 65 },
{ "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 },
{ "item": "electric_lantern", "prob": 35 }
{ "item": "electric_lantern", "prob": 35 },
{ "item": "barometer", "prob": 8 }
],
"prob": 10
},
Expand All @@ -92,7 +94,8 @@
{ "item": "detergent", "count": [ 0, 2 ] },
{ "item": "brush", "prob": 85 },
{ "item": "bleach", "prob": 45 },
{ "item": "ammonia", "prob": 15 }
{ "item": "ammonia", "prob": 15 },
{ "item": "vinegar", "prob": 10 }
],
"prob": 15
},
Expand Down Expand Up @@ -121,6 +124,7 @@
"distribution": [
{
"collection": [
{ "item": "folding_poncho", "count": [ 1, 10 ], "prob": 60 },
{ "item": "emer_blanket", "count": [ 1, 10 ], "prob": 60 },
{ "item": "jacket_evac", "count": [ 1, 10 ], "prob": 50 }
],
Expand All @@ -139,7 +143,8 @@
{ "item": "extinguisher", "prob": 50 },
{ "item": "1st_aid", "prob": 5 },
{ "item": "two_way_radio", "prob": 25 },
{ "item": "electric_lantern", "prob": 5 }
{ "item": "electric_lantern", "prob": 5 },
{ "item": "wearable_light", "prob": 5 }
],
"prob": 10
},
Expand All @@ -163,6 +168,7 @@
{ "item": "box_small", "prob": 5 },
{ "item": "bag_plastic", "prob": 5 },
{ "item": "bowl_plastic", "prob": 5 },
{ "item": "vitamins", "prob": 5 },
{ "item": "can_food_unsealed", "count": [ 1, 30 ], "prob": 90 },
{ "item": "can_opener", "prob": 90 }
],
Expand All @@ -184,6 +190,7 @@
{ "item": "brush", "prob": 90 },
{ "item": "bleach", "prob": 45 },
{ "item": "ammonia", "prob": 25 },
{ "item": "mirror", "prob": 12 },
{ "item": "1st_aid", "prob": 60 },
{ "item": "paper", "count": [ 1, 3 ] },
{ "item": "evac_pamphlet", "prob": 10 }
Expand Down
13 changes: 13 additions & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2403,6 +2403,19 @@
"volume": "750 ml",
"flags": [ "SLEEP_AID" ]
},
{
"type": "GENERIC",
"id": "teddy_bear",
"symbol": "o",
"color": "brown",
"name": "teddy bear",
"description": "A mass produced plush teddy bear. It is wearing a little red tshirt but no pants.",
"price": 200,
"material": [ "cotton" ],
"weight": "444 g",
"volume": "850 ml",
"flags": [ "SLEEP_AID" ]
},
{
"type": "GENERIC",
"id": "money_bundle",
Expand Down

0 comments on commit 0ab5f48

Please sign in to comment.