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

feat(port, content): freshwater research station #3762

Merged
merged 7 commits into from
Nov 27, 2023
Merged
Prev Previous commit
Next Next commit
Freshwater research station roof map added (#51323)
  • Loading branch information
RandDenner authored and Vollch committed Nov 26, 2023
commit 7ba2ea1321f72ebd130a9a7891b418af73e6ca92
38 changes: 37 additions & 1 deletion data/json/mapgen/lake_buildings/freshwater_research_station.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"~~~~~~~~~#~~~~#~~~~~~~~~",
"~~~~~~~~########~~~~~~~~",
"~~~~~~~~##||o|##~~~~~~~~",
"~~~~~~~~##|>A|##~~~~~~~~",
"~~~~~~~~#<|>A|##~~~~~~~~",
"~~~~~~~~##+..|##~~~~~~~~",
"~~~~~~~~##||o|##~~~~~~~~",
"~~~~~~~~########~~~~~~~~",
Expand Down Expand Up @@ -48,6 +48,42 @@
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "sealab_small_roof",
"weight": 250,
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" #___X ",
" >___& ",
" #___= ",
" #:__N ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "underwater_structure_roof" ]
}
},
{
"type": "mapgen",
"method": "json",
Expand Down
34 changes: 34 additions & 0 deletions data/json/mapgen_palettes/underwater_structures_palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,39 @@
"toilets": { "t": { } },
"gaspumps": { "!": { } },
"vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }
},
{
"type": "palette",
"id": "underwater_structure_roof",
"terrain": {
" ": "t_open_air",
"_": "t_metal_flat_roof",
".": "t_flat_roof",
"#": "t_grate",
">": "t_ladder_down",
"<": "t_ladder_up",
"|": "t_wall_bulkhead",
"+": "t_door_metal_bulkhead_c",
"o": "t_porthole",
"F": "t_chainfence",
"G": "t_chaingate_c",
"L": "t_chaingate_l",
"1": "t_gutter_north",
"2": "t_gutter_east",
"3": "t_gutter_south",
"4": "t_gutter_west",
"5": "t_gutter_downspout",
"6": "t_gutter_drop"
},
"furniture": {
"&": "f_roof_turbine_vent",
"N": "f_TV_antenna",
":": "f_cellphone_booster",
"X": "f_small_satelitte_dish",
"=": "f_vent_pipe"
},
"toilets": { "t": { } },
"gaspumps": { "!": { } },
"vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }
}
]
1 change: 1 addition & 0 deletions data/json/overmap/overmap_special/specials.json
Original file line number Diff line number Diff line change
Expand Up @@ -7009,6 +7009,7 @@
{ "point": [ 1, 0, 0 ], "overmap": "lake_surface" },
{ "point": [ 2, 0, 0 ], "overmap": "lake_surface" },
{ "point": [ 0, 1, 0 ], "overmap": "lake_surface" },
{ "point": [ 1, 1, 1 ], "overmap": "sealab_small_roof_north" },
{ "point": [ 1, 1, 0 ], "overmap": "sealab_small_surface_north" },
{ "point": [ 1, 1, -1 ], "overmap": "sealab_small_-1_north", "locations": [ "lake_water_cube" ] },
{ "point": [ 1, 1, -2 ], "overmap": "sealab_small_-2_north", "locations": [ "lake_water_cube" ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@
{
"type": "overmap_terrain",
"id": [
"sealab_small_roof",
"sealab_small_surface",
"sealab_small_-1",
"sealab_small_-2",
Expand Down