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

Add welding SUS group #36531

Merged
merged 1 commit into from
Dec 29, 2019
Merged
Show file tree
Hide file tree
Changes from all 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: 28 additions & 0 deletions data/json/itemgroups/SUS/garage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[
{
"id": "SUS_welding_gear",
"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": "This group is for a rack of welding gear.",
"subtype": "collection",
"entries": [
{
"distribution": [
{
"collection": [
{ "item": "oxy_torch" },
{ "item": "weldtank", "count": [ 1, 3 ], "prob": 80 },
{ "item": "tinyweldtank", "count": [ 1, 3 ], "prob": 60 }
],
"prob": 30
},
{
"collection": [ { "item": "welder" }, { "item": "medium_plus_battery_cell", "count": [ 1, 3 ], "prob": 80 } ],
"prob": 70
}
]
},
{ "distribution": [ { "item": "welding_mask", "prob": 70 }, { "item": "goggles_welding", "prob": 70 } ] }
]
}
]
10 changes: 6 additions & 4 deletions data/json/mapgen/garage.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@
"p": "f_hydraulic_press",
"l": "f_heavy_lathe",
"t": "f_toilet",
"x": "f_crate_c",
"x": "f_utility_shelf",
"h": "f_chair",
"U": [ "f_dumpster", "f_recycle_bin" ]
},
"items": {
"L": { "item": "clothing_work_set", "chance": 55 },
"c": { "item": "mechanics", "chance": 60 },
"S": { "item": "mechanics", "chance": 80, "repeat": [ 1, 6 ] },
"x": { "item": "mechanics", "chance": 80, "repeat": [ 1, 3 ] }
"x": { "item": "SUS_welding_gear", "chance": 80, "repeat": [ 1, 2 ] }
},
"place_vehicles": [
{ "vehicle": "garage", "x": [ 8, 8 ], "y": [ 9, 10 ], "chance": 25, "rotation": 90 },
Expand Down Expand Up @@ -263,8 +263,8 @@
" |c........c|-------+-|X",
" |c.xx..xx.p|xx.+T|<..OX",
" |l.xx..xx.c|x..-|----|X",
" |S.........O..xx|4UUXXX",
" |ScccccccSS|----|UXXXXX",
" |w.........O..xx|4UUXXX",
" |ScccccccwS|----|UXXXXX",
" |----------|WWWWWWWWWWW",
" "
],
Expand Down Expand Up @@ -305,6 +305,7 @@
"S": "f_utility_shelf",
"s": "f_sink",
"t": "f_toilet",
"w": "f_utility_shelf",
"x": "f_crate_c",
"f": "f_filing_cabinet",
"h": "f_chair",
Expand All @@ -316,6 +317,7 @@
"c": { "item": "mechanics", "chance": 60 },
"S": { "item": "mechanics", "chance": 80, "repeat": [ 1, 6 ] },
"x": { "item": "mechanics", "chance": 80, "repeat": [ 1, 6 ] },
"w": { "item": "SUS_welding_gear", "chance": 80, "repeat": [ 1, 2 ] },
"f": { "item": "office", "chance": 70, "repeat": [ 1, 6 ] },
"d": { "item": "office", "chance": 70, "repeat": [ 1, 6 ] },
"T": { "item": "cleaning", "chance": 70, "repeat": [ 1, 6 ] }
Expand Down