Skip to content

Commit

Permalink
fix: add a roof to the building above the movie theaters (#3943)
Browse files Browse the repository at this point in the history 
* mapgen

* overmap

* Roof for movie theater in town

* fix

* forget

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
@0Monet @autofix-ci
0Monet and autofix-ci[bot] authored Dec 18, 2023
1 parent fea6c75 commit 7e70561
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 0 deletions.
59 changes: 59 additions & 0 deletions data/json/mapgen/movie_theater.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,5 +260,64 @@
"furniture": { "Y": "f_standing_tank", "6": "f_water_heater", "7": "f_roof_turbine_vent" },
"items": { "C": { "item": "snacks", "chance": 30, "repeat": [ 6, 12 ] } }
}
},
{
"method": "json",
"type": "mapgen",
"om_terrain": [ [ "movietheater_roof2_2_0" ], [ "movietheater_roof2_2_1" ] ],
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
}
]
2 changes: 2 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2650,12 +2650,14 @@
{ "point": [ 1, 0, 1 ], "overmap": "movietheater_roof_1_0_north" },
{ "point": [ 2, 0, 0 ], "overmap": "movietheater_2_0_north" },
{ "point": [ 2, 0, 1 ], "overmap": "movietheater_roof_2_0_north" },
{ "point": [ 2, 0, 2 ], "overmap": "movietheater_roof2_2_0_north" },
{ "point": [ 0, 1, 0 ], "overmap": "movietheater_0_1_north" },
{ "point": [ 0, 1, 1 ], "overmap": "movietheater_roof_0_1_north" },
{ "point": [ 1, 1, 0 ], "overmap": "movietheater_1_1_north" },
{ "point": [ 1, 1, 1 ], "overmap": "movietheater_roof_1_1_north" },
{ "point": [ 2, 1, 0 ], "overmap": "movietheater_2_1_north" },
{ "point": [ 2, 1, 1 ], "overmap": "movietheater_roof_2_1_north" },
{ "point": [ 2, 1, 2 ], "overmap": "movietheater_roof2_2_1_north" },
{ "point": [ 0, 2, 0 ], "overmap": "movietheater_0_2_north" },
{ "point": [ 0, 2, 1 ], "overmap": "movietheater_roof_0_2_north" },
{ "point": [ 1, 2, 0 ], "overmap": "movietheater_1_2_north" },
Expand Down
2 changes: 2 additions & 0 deletions data/json/overmap/overmap_special/specials.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2555,12 +2555,14 @@
{ "point": [ 1, 0, 1 ], "overmap": "movietheater_roof_1_0_north" },
{ "point": [ 2, 0, 0 ], "overmap": "movietheater_2_0_north" },
{ "point": [ 2, 0, 1 ], "overmap": "movietheater_roof_2_0_north" },
{ "point": [ 2, 0, 2 ], "overmap": "movietheater_roof2_2_0_north" },
{ "point": [ 0, 1, 0 ], "overmap": "movietheater_0_1_north" },
{ "point": [ 0, 1, 1 ], "overmap": "movietheater_roof_0_1_north" },
{ "point": [ 1, 1, 0 ], "overmap": "movietheater_1_1_north" },
{ "point": [ 1, 1, 1 ], "overmap": "movietheater_roof_1_1_north" },
{ "point": [ 2, 1, 0 ], "overmap": "movietheater_2_1_north" },
{ "point": [ 2, 1, 1 ], "overmap": "movietheater_roof_2_1_north" },
{ "point": [ 2, 1, 2 ], "overmap": "movietheater_roof2_2_1_north" },
{ "point": [ 0, 2, 0 ], "overmap": "movietheater_0_2_north" },
{ "point": [ 0, 2, 1 ], "overmap": "movietheater_roof_0_2_north" },
{ "point": [ 1, 2, 0 ], "overmap": "movietheater_1_2_north" },
Expand Down
2 changes: 2 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,11 @@
"id": [
"movietheater_roof_0_0",
"movietheater_roof_2_0",
"movietheater_roof2_2_0",
"movietheater_roof_0_1",
"movietheater_roof_1_1",
"movietheater_roof_2_1",
"movietheater_roof2_2_1",
"movietheater_roof_0_2",
"movietheater_roof_1_2",
"movietheater_roof_2_2"
Expand Down

0 comments on commit 7e70561

Please sign in to comment.