Skip to content

Commit

Permalink
Merge pull request #74718 from PatrikLundell/fema_2
Browse files Browse the repository at this point in the history 
Added roofs to FEMA 2 buildings
  • Loading branch information
@Maleclypse
Maleclypse authored Jun 22, 2024
2 parents 09cce88 + 18f86c3 commit 32d74af
Show file tree
Hide file tree
Showing 18 changed files with 686 additions and 18 deletions.
39 changes: 38 additions & 1 deletion data/json/mapgen/fema/FEMA_blc_01.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
[
{
"type": "mapgen",
"nested_mapgen_id": "fema_blc_01_roof",
"//": "bottom left corner.",
"method": "json",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" ",
" "
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
"type": "mapgen",
"om_terrain": "FEMA_blc",
Expand Down Expand Up @@ -35,7 +71,8 @@
],
"rotation": 3,
"palettes": [ "FEMA_camp" ],
"items": { "x": { "item": "dresser", "chance": 30 } }
"items": { "x": { "item": "dresser", "chance": 30 } },
"place_nested": [ { "chunks": [ "fema_blc_01_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
39 changes: 38 additions & 1 deletion data/json/mapgen/fema/FEMA_blc_03.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
[
{
"type": "mapgen",
"nested_mapgen_id": "fema_blc_03_roof",
"//": "bottom left corner.",
"method": "json",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" ",
" "
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
"type": "mapgen",
"om_terrain": "FEMA_blc",
Expand Down Expand Up @@ -35,7 +71,8 @@
],
"rotation": 3,
"palettes": [ "FEMA_camp" ],
"items": { "X": { "item": "mil_surplus", "chance": 40 } }
"items": { "X": { "item": "mil_surplus", "chance": 40 } },
"place_nested": [ { "chunks": [ "fema_blc_03_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
39 changes: 38 additions & 1 deletion data/json/mapgen/fema/FEMA_brc_01.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
[
{
"type": "mapgen",
"nested_mapgen_id": "fema_brc_01_roof",
"//": "bottom right corner.",
"method": "json",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" RRRRRRRRRRRRRRRRRR ",
" ",
" "
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
"type": "mapgen",
"om_terrain": "FEMA_brc",
Expand Down Expand Up @@ -35,7 +71,8 @@
],
"rotation": 2,
"palettes": [ "FEMA_camp" ],
"items": { "x": { "item": "dresser", "chance": 30 } }
"items": { "x": { "item": "dresser", "chance": 30 } },
"place_nested": [ { "chunks": [ "fema_brc_01_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
39 changes: 38 additions & 1 deletion data/json/mapgen/fema/FEMA_brc_03.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
[
{
"type": "mapgen",
"nested_mapgen_id": "fema_brc_03_roof",
"//": "bottom right corner.",
"method": "json",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" RRRR RRRR RRRR ",
" ",
" "
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
"type": "mapgen",
"om_terrain": "FEMA_brc",
Expand Down Expand Up @@ -35,7 +71,8 @@
],
"rotation": 2,
"palettes": [ "FEMA_camp" ],
"items": { ",": { "item": "dresser", "chance": 6 } }
"items": { ",": { "item": "dresser", "chance": 6 } },
"place_nested": [ { "chunks": [ "fema_brc_03_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
39 changes: 38 additions & 1 deletion data/json/mapgen/fema/FEMA_entrance_01.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
[
{
"type": "mapgen",
"nested_mapgen_id": "fema_entrance_01_roof",
"//": "entrance. bottom edge",
"method": "json",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" -------------- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -------------- ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"om_terrain": "FEMA_entrance",
Expand Down Expand Up @@ -36,7 +72,8 @@
"rotation": 2,
"palettes": [ "FEMA_camp" ],
"terrain": { "z": "t_dirt" },
"monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }
"monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } },
"place_nested": [ { "chunks": [ "fema_entrance_01_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
39 changes: 38 additions & 1 deletion data/json/mapgen/fema/FEMA_entrance_02.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
[
{
"type": "mapgen",
"nested_mapgen_id": "fema_entrance_02_roof",
"//": "entrance. bottom edge",
"method": "json",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" ------------- ",
" -...........- ",
" -...........- ",
" -...........- ",
" -...........- ",
" -...........- ",
" ------------- ",
" ",
" ",
" ",
" ",
" ------------ ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" ------------ ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"om_terrain": "FEMA_entrance",
Expand Down Expand Up @@ -36,7 +72,8 @@
"rotation": 2,
"palettes": [ "FEMA_camp" ],
"items": { "X": { "item": "mil_surplus", "chance": 60 } },
"monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }
"monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } },
"place_nested": [ { "chunks": [ "fema_entrance_02_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
39 changes: 38 additions & 1 deletion data/json/mapgen/fema/FEMA_entrance_03.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
[
{
"type": "mapgen",
"nested_mapgen_id": "fema_entrance_03_roof",
"//": "entrance. bottom edge",
"method": "json",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" ",
" -------------- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -............- ",
" -------------- ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
},
{
"type": "mapgen",
"om_terrain": "FEMA_entrance",
Expand Down Expand Up @@ -37,7 +73,8 @@
"palettes": [ "FEMA_camp" ],
"terrain": { "z": "t_dirt" },
"items": { "X": { "item": "mil_surplus", "chance": 60 } },
"monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }
"monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } },
"place_nested": [ { "chunks": [ "fema_entrance_03_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
Loading

0 comments on commit 32d74af

Please sign in to comment.