Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more variety is SUS shelter items #36284

Merged
merged 9 commits into from
Dec 24, 2019
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions data/json/itemgroups/SUS/evac_shelter.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"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.",
"//": "SUS item groups are collections (not distributions) that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
Jerimee marked this conversation as resolved.
Show resolved Hide resolved
"//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 @@ -56,6 +57,17 @@
{ "item": "bowl_plastic", "prob": 50 }
],
"prob": 90
},
{
"distribution": [
{ "item": "mask_dust", "prob": 70 },
{ "item": "whistle", "prob": 60 },
{ "item": "mirror", "prob": 20 },
{ "item": "pliers", "prob": 15 },
{ "item": "candle", "prob": 15 },
{ "item": "vitamins", "prob": 10 }
],
"prob": 20
Jerimee marked this conversation as resolved.
Show resolved Hide resolved
}
]
},
Expand Down Expand Up @@ -83,7 +95,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 +105,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 +135,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 +154,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 +179,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 +201,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 @@ -2386,6 +2386,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