Skip to content

Commit

Permalink
Added roofs onto gun store roof access shacks (#74625)
Browse files Browse the repository at this point in the history
  • Loading branch information
@PatrikLundell
PatrikLundell authored Jun 17, 2024
1 parent 780fea8 commit 6a6567c
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 5 deletions.
68 changes: 68 additions & 0 deletions data/json/mapgen/s_gun.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,40 @@
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "s_gun_upper_roof",
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ---- ",
" -..- ",
" ---- ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
Expand Down Expand Up @@ -270,6 +304,40 @@
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "s_gun_upper_roof_1",
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ---- ",
" -..- ",
" ---- ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
Expand Down
24 changes: 20 additions & 4 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1487,25 +1487,41 @@
"type": "city_building",
"id": "s_gun",
"locations": [ "land" ],
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_gun_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_north" } ]
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "s_gun_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_north" },
{ "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_north" }
]
},
{
"type": "city_building",
"id": "s_gun_looted",
"locations": [ "land" ],
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_gun_looted_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_north" } ]
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "s_gun_looted_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_north" },
{ "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_north" }
]
},
{
"type": "city_building",
"id": "s_gun_1",
"locations": [ "land" ],
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_gun_1_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_1_north" } ]
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "s_gun_1_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_1_north" },
{ "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_1_north" }
]
},
{
"type": "city_building",
"id": "s_gun_2",
"locations": [ "land" ],
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_gun_2_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_1_north" } ]
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "s_gun_2_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_1_north" },
{ "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_1_north" }
]
},
{
"type": "city_building",
Expand Down
10 changes: 9 additions & 1 deletion data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,15 @@
},
{
"type": "overmap_terrain",
"id": [ "s_gun_roof", "s_gun_roof_1", "s_gun_roof_3", "s_gun_roof_4", "s_gunstore_roof" ],
"id": [
"s_gun_roof",
"s_gun_upper_roof",
"s_gun_roof_1",
"s_gun_upper_roof_1",
"s_gun_roof_3",
"s_gun_roof_4",
"s_gunstore_roof"
],
"name": "gun store roof",
"looks_like": "s_gun_roof",
"copy-from": "generic_city_building",
Expand Down

0 comments on commit 6a6567c

Please sign in to comment.