diff --git a/data/json/itemgroups/SUS/garage.json b/data/json/itemgroups/SUS/garage.json new file mode 100644 index 0000000000000..c00aa5f661177 --- /dev/null +++ b/data/json/itemgroups/SUS/garage.json @@ -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 } ] } + ] + } +] diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json index f09175017c530..0b8dfc194b2c7 100644 --- a/data/json/mapgen/garage.json +++ b/data/json/mapgen/garage.json @@ -64,7 +64,7 @@ "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" ] }, @@ -72,7 +72,7 @@ "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 }, @@ -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", " " ], @@ -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", @@ -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 ] }