From de6c3acda328bb9acccdd05a7f1858b837d923ba Mon Sep 17 00:00:00 2001 From: 0Monet <146018959+0Monet@users.noreply.github.com> Date: Mon, 3 Jun 2024 01:19:33 +0200 Subject: [PATCH] fix: use regional terrain for open sewer (#4719) * Update zombies.json * Update utility.json * Update vehicle_groups.json * Update locations.json * Update cs_open_sewer_small.json --- .../Locations_MapExtras/locations.json | 27 ++++ data/json/mapgen/cs_open_sewer_small.json | 123 ++++-------------- data/json/monstergroups/zombies.json | 9 ++ data/json/vehicle_groups.json | 5 + data/json/vehicles/utility.json | 13 ++ 5 files changed, 80 insertions(+), 97 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 1ff87a0aa082..b32ee7ba2349 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -2733,5 +2733,32 @@ "type": "item_group", "id": "oa_ig_sb_water", "items": [ { "item": "water", "prob": 30, "charges-min": 0, "charges-max": 200, "container-item": "keg" } ] + }, + { + "type": "item_group", + "id": "os_items", + "items": [ + [ "flashlight", 50 ], + [ "heavy_flashlight", 40 ], + [ "gloves_work", 30 ], + [ "gloves_rubber", 60 ], + [ "boots_rubber", 60 ], + [ "hat_hard", 60 ], + [ "shovel", 40 ], + [ "jackhammer", 5 ], + [ "elec_jackhammer", 5 ], + [ "folding_poncho", 40 ], + [ "radio", 40 ], + [ "well_pump", 10 ], + [ "toolbox", 5 ], + [ "wrench", 15 ], + [ "bag_canvas", 40 ], + [ "jumper_cable", 40 ], + [ "jumper_cable_heavy", 20 ], + [ "glasses_safety", 30 ], + [ "crowbar", 15 ], + [ "mask_filter", 30 ], + [ "electric_lantern", 30 ] + ] } ] diff --git a/data/json/mapgen/cs_open_sewer_small.json b/data/json/mapgen/cs_open_sewer_small.json index 0f43a09004a2..dc0eb5ac7226 100644 --- a/data/json/mapgen/cs_open_sewer_small.json +++ b/data/json/mapgen/cs_open_sewer_small.json @@ -1,114 +1,43 @@ [ - { - "type": "monstergroup", - "name": "GROUP_ZOMBIE_SEWER", - "default": "mon_zombie_technician", - "monsters": [ - { "monster": "mon_zombie_technician", "freq": 250, "cost_multiplier": 3 }, - { "monster": "mon_zombie_electric", "freq": 150, "cost_multiplier": 5 } - ] - }, - { - "type": "vehicle", - "id": "oa_work_light", - "name": "work light", - "blueprint": [ "^" ], - "parts": [ - { "x": 0, "y": 0, "part": "xlframe_vertical_2" }, - { "x": 0, "y": 0, "part": "wheel_caster" }, - { "x": 0, "y": 0, "part": "small_storage_battery" }, - { "x": 0, "y": 0, "part": "floodlight" }, - { "x": 0, "y": 0, "part": "controls_electronic" } - ] - }, - { - "type": "vehicle_group", - "id": "os_work_vehicles", - "vehicles": [ [ "wheelbarrow", 60 ], [ "portable_generator", 40 ], [ "oa_work_light", 50 ] ] - }, - { - "type": "item_group", - "id": "os_items", - "items": [ - [ "flashlight", 50 ], - [ "heavy_flashlight", 40 ], - [ "gloves_work", 30 ], - [ "gloves_rubber", 60 ], - [ "boots_rubber", 60 ], - [ "hat_hard", 60 ], - [ "shovel", 40 ], - [ "jackhammer", 5 ], - [ "elec_jackhammer", 5 ], - [ "folding_poncho", 40 ], - [ "radio", 40 ], - [ "well_pump", 10 ], - [ "toolbox", 5 ], - [ "wrench", 15 ], - [ "bag_canvas", 40 ], - [ "jumper_cable", 40 ], - [ "jumper_cable_heavy", 20 ], - [ "glasses_safety", 30 ], - [ "crowbar", 15 ], - [ "mask_filter", 30 ], - [ "electric_lantern", 30 ] - ] - }, { "type": "mapgen", "method": "json", "om_terrain": [ "cs_open_sewer" ], "weight": 1000, "object": { + "fill_ter": "t_region_soil", "rows": [ - ",,.,,..,.,,.,,..,,.,..,.", - ".,bbbb..bbb.,.bbbb,..,b,", - ".,...,.,rr,r.,,..,.,.,b.", - "b..,.r,r,r,rr,r,,,,,,,b,", - "b.,o,,r,rrr,rr,,,,,,,,,,", - "b,oo.,r,rrrrr,r,,,w,ww,,", - ",b.o,,,,r,r,,r,,,ww,w,,b", - ".ooo,,,,,ssssss,wwww,w,b", - "..,o,,,,sswwwwwwww,w,w,.", - ",b.o,,,sswwwwwwwwwww,,b,", - ".b,o,,oooopooowwoopooo,b", - ".b.,,,sswwwwwwwwwwsw,o,,", - ",,oo,ooooopowwwooopowob.", - ".b,.,,,sswwwwwwwwwwo,ob,", - "..,oo,oooopoowwoopsosob.", - ",ooo,,,,,ssswwwwwoso,ob,", - ".b,..,,,,,,sssssso,owooo", - ",b,,-DOD-,,,.,,,,o,o,o.,", - ".,.,|fff|,.,,,,.oo,ooo,b", - ",b.,|fff|,.,.,.,o.,.,o.b", - ".b.,|LBB|.,.,,.,o,.,.o.b", - ",b,,-----,.,.,.,o.,.,.,.", - ",.,,.,.,bbbbb,..,.,..,b.", - ",.bbb,.,..,.,..,bbb,bb.," + " ", + " bbbb bbb bbbb b ", + " rr r b ", + "b r r r rr r b ", + "b o r rrr rr ", + "b oo r rrrrr r w ww ", + " b o r r r ww w b", + " ooo ssssss wwww w b", + " o sswwwwwwww w w ", + " b o sswwwwwwwwwww b ", + " b o oooopooowwoopooo b", + " b sswwwwwwwwwwsw o ", + " oo ooooopowwwooopowob ", + " b sswwwwwwwwwwo ob ", + " oo oooopoowwoopsosob ", + " ooo ssswwwwwoso ob ", + " b sssssso owooo", + " b |DOD| o o o ", + " |fff| oo ooo b", + " b |fff| o o b", + " b |LBB| o o b", + " b ||||| o ", + " bbbbb b ", + " bbb bbb bb " ], - "terrain": { - ",": "t_dirt", - ".": "t_grass", - "o": "t_sewage_pipe", - "p": "t_sewage_pump", - "w": "t_sewage", - "b": "t_dirt", - "r": "t_dirt", - "s": "t_dirt", - "S": "t_dirt", - "-": "t_dirt", - "|": "t_dirt", - "D": "t_dirt", - "O": "t_dirt", - "f": "t_dirt", - "L": "t_dirt", - "B": "t_dirt" - }, + "terrain": { "o": "t_sewage_pipe", "p": "t_sewage_pump", "w": "t_sewage" }, "furniture": { "b": "f_barricade_road", "r": "f_rubble", "s": "f_sandbag_half", "S": "f_sandbag_wall", - "-": "f_large_canvas_wall", "|": "f_large_canvas_wall", "D": "f_large_canvas_door", "O": "f_large_canvas_door_o", diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json index ac0fb8e2955f..326d1fc1f4e4 100644 --- a/data/json/monstergroups/zombies.json +++ b/data/json/monstergroups/zombies.json @@ -749,5 +749,14 @@ { "monster": "mon_zombie_child", "freq": 20, "cost_multiplier": 1 }, { "monster": "mon_zombie_crawler", "freq": 10, "cost_multiplier": 1 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_ZOMBIE_SEWER", + "default": "mon_zombie_technician", + "monsters": [ + { "monster": "mon_zombie_technician", "freq": 250, "cost_multiplier": 3 }, + { "monster": "mon_zombie_electric", "freq": 150, "cost_multiplier": 5 } + ] } ] diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json index 0556a8ebd4de..d8fe07c76419 100644 --- a/data/json/vehicle_groups.json +++ b/data/json/vehicle_groups.json @@ -864,5 +864,10 @@ "id": "military_display_vehicles", "type": "vehicle_group", "vehicles": [ [ "whillys_mb_display", 75 ], [ "cannon_3in", 20 ], [ "gatling_carriage", 5 ] ] + }, + { + "type": "vehicle_group", + "id": "os_work_vehicles", + "vehicles": [ [ "wheelbarrow", 60 ], [ "portable_generator", 40 ], [ "oa_work_light", 50 ] ] } ] diff --git a/data/json/vehicles/utility.json b/data/json/vehicles/utility.json index 279f64c35159..c92a1739fb5f 100644 --- a/data/json/vehicles/utility.json +++ b/data/json/vehicles/utility.json @@ -334,5 +334,18 @@ { "x": 0, "y": 0, "part": "engine_electric" }, { "x": 0, "y": 0, "part": "storage_battery" } ] + }, + { + "type": "vehicle", + "id": "oa_work_light", + "name": "work light", + "blueprint": [ "^" ], + "parts": [ + { "x": 0, "y": 0, "part": "xlframe_vertical_2" }, + { "x": 0, "y": 0, "part": "wheel_caster" }, + { "x": 0, "y": 0, "part": "small_storage_battery" }, + { "x": 0, "y": 0, "part": "floodlight" }, + { "x": 0, "y": 0, "part": "controls_electronic" } + ] } ]