Skip to content

Commit

Permalink
Add roofs to prison guard towers (#74482)
Browse files Browse the repository at this point in the history
  • Loading branch information
@PatrikLundell
PatrikLundell authored Jun 12, 2024
1 parent f160003 commit 22dc5fe
Show file tree
Hide file tree
Showing 4 changed files with 306 additions and 0 deletions.
144 changes: 144 additions & 0 deletions data/json/mapgen/prison/prison_alcatraz.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,5 +207,149 @@
"item": { ".": { "item": "feces_bird", "chance": 2 } },
"monster": { "_": { "monster": "mon_zombie_cop", "chance": 10 }, "#": { "monster": "mon_zombie_cop", "chance": 5 } }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "prison_alcatraz_10_3f", "prison_alcatraz_9_3f" ] ],
"weight": 250,
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "prison_alcatraz_6_3f" ],
"weight": 250,
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "prison_alcatraz_15_3f", "prison_alcatraz_14_3f" ] ],
"weight": 250,
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "prison_alcatraz_11_3f" ],
"weight": 250,
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
}
]
140 changes: 140 additions & 0 deletions data/json/mapgen/prison/prison_island.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,146 @@
"item": { ".": { "item": "feces_bird", "chance": 2 } }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "prison_island_1_3f_1" ],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "prison_island_1_3f_4", "prison_island_1_3f_5" ] ],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "prison_island_1_3f_11" ],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "prison_island_1_3f_14" ],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ----- ",
" -...- ",
" -...- ",
" ----- ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
Expand Down
11 changes: 11 additions & 0 deletions data/json/overmap/overmap_special/specials.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,12 @@
{ "point": [ 2, 2, 1 ], "overmap": "prison_alcatraz_13_2f_north" },
{ "point": [ 1, 2, 1 ], "overmap": "prison_alcatraz_14_2f_north" },
{ "point": [ 0, 2, 1 ], "overmap": "prison_alcatraz_15_2f_north" },
{ "point": [ 4, 1, 2 ], "overmap": "prison_alcatraz_6_3f_north" },
{ "point": [ 1, 1, 2 ], "overmap": "prison_alcatraz_9_3f_north" },
{ "point": [ 0, 1, 2 ], "overmap": "prison_alcatraz_10_3f_north" },
{ "point": [ 4, 2, 2 ], "overmap": "prison_alcatraz_11_3f_north" },
{ "point": [ 1, 2, 2 ], "overmap": "prison_alcatraz_14_3f_north" },
{ "point": [ 0, 2, 2 ], "overmap": "prison_alcatraz_15_3f_north" },
{ "point": [ 4, 0, -1 ], "overmap": "solid_earth", "locations": [ "lake_water_cube" ] },
{ "point": [ 3, 0, -1 ], "overmap": "solid_earth", "locations": [ "lake_water_cube" ] },
{ "point": [ 2, 0, -1 ], "overmap": "solid_earth", "locations": [ "lake_water_cube" ] },
Expand Down Expand Up @@ -1372,6 +1378,11 @@
{ "point": [ 2, 2, 1 ], "overmap": "prison_island_1_2f_13_north" },
{ "point": [ 3, 2, 1 ], "overmap": "prison_island_1_2f_14_north" },
{ "point": [ 4, 2, 1 ], "overmap": "prison_island_1_2f_15_north" },
{ "point": [ 0, 0, 2 ], "overmap": "prison_island_1_3f_1_north" },
{ "point": [ 3, 0, 2 ], "overmap": "prison_island_1_3f_4_north" },
{ "point": [ 4, 0, 2 ], "overmap": "prison_island_1_3f_5_north" },
{ "point": [ 0, 2, 2 ], "overmap": "prison_island_1_3f_11_north" },
{ "point": [ 3, 2, 2 ], "overmap": "prison_island_1_3f_14_north" },
{ "point": [ 0, 0, -1 ], "overmap": "prison_island_1_ug_1_north", "locations": [ "lake_water_cube" ] },
{ "point": [ 1, 0, -1 ], "overmap": "prison_island_1_ug_2_north", "locations": [ "lake_water_cube" ] },
{ "point": [ 2, 0, -1 ], "overmap": "prison_island_1_ug_3_north", "locations": [ "lake_water_cube" ] },
Expand Down
11 changes: 11 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,12 @@
"prison_alcatraz_13_2f",
"prison_alcatraz_14_2f",
"prison_alcatraz_15_2f",
"prison_alcatraz_10_3f",
"prison_alcatraz_9_3f",
"prison_alcatraz_6_3f",
"prison_alcatraz_15_3f",
"prison_alcatraz_14_3f",
"prison_alcatraz_11_3f",
"prison_island_1_1",
"prison_island_1_2",
"prison_island_1_3",
Expand Down Expand Up @@ -445,6 +451,11 @@
"prison_island_1_2f_13",
"prison_island_1_2f_14",
"prison_island_1_2f_15",
"prison_island_1_3f_1",
"prison_island_1_3f_4",
"prison_island_1_3f_5",
"prison_island_1_3f_11",
"prison_island_1_3f_14",
"prison_island_1_ug_1",
"prison_island_1_ug_2",
"prison_island_1_ug_3",
Expand Down

0 comments on commit 22dc5fe

Please sign in to comment.