Skip to content

Commit

Permalink
Merge pull request #73744 from PatrikLundell/livestock1
Browse files Browse the repository at this point in the history 
Added roofs to livestock 1
  • Loading branch information
@Maleclypse
Maleclypse authored May 14, 2024
2 parents f98e947 + fdc71aa commit e160e0d
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 21 deletions.
140 changes: 135 additions & 5 deletions ...apgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_construction.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,51 @@
"palettes": [ { "param": "fbml_construction_palette" }, "fbml_common_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_coop_roof_construction",
"object": {
"parameters": {
"fbml_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbml_concrete_palette",
"fbml_log_palette",
"fbml_metal_palette",
"fbml_migo_resin_palette",
"fbml_rammed_earth_palette",
"fbml_rock_palette",
"fbml_wad_palette",
"fbml_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR"
],
"palettes": [ { "param": "fbml_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_coop_construction_northeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_coop_construction" ], "x": 15, "y": 3 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbml_coop_construction" ], "x": 15, "y": 3, "z": 0 },
{ "chunks": [ "fbml_coop_roof_construction" ], "x": 15, "y": 3, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -78,11 +118,51 @@
"palettes": [ { "param": "fbml_construction_palette" }, "fbml_common_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_shack_roof_construction",
"object": {
"parameters": {
"fbml_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbml_concrete_palette",
"fbml_log_palette",
"fbml_metal_palette",
"fbml_migo_resin_palette",
"fbml_rammed_earth_palette",
"fbml_rock_palette",
"fbml_wad_palette",
"fbml_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" RRRR",
" RRRRR",
" RRRRR",
" RRRRR",
" RRRRR"
],
"palettes": [ { "param": "fbml_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_shack_construction_southeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_shack_construction" ], "x": 15, "y": 15 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbml_shack_construction" ], "x": 15, "y": 15, "z": 0 },
{ "chunks": [ "fbml_shack_roof_construction" ], "x": 15, "y": 15, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -121,11 +201,51 @@
"palettes": [ { "param": "fbml_construction_palette" }, "fbml_common_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_stable_roof_construction",
"object": {
"parameters": {
"fbml_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbml_concrete_palette",
"fbml_log_palette",
"fbml_metal_palette",
"fbml_migo_resin_palette",
"fbml_rammed_earth_palette",
"fbml_rock_palette",
"fbml_wad_palette",
"fbml_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR"
],
"palettes": [ { "param": "fbml_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_stable0_construction_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_stable0_construction" ], "x": 3, "y": 15 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbml_stable0_construction" ], "x": 3, "y": 15, "z": 0 },
{ "chunks": [ "fbml_stable_roof_construction" ], "x": 3, "y": 15, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -168,7 +288,12 @@
"type": "mapgen",
"update_mapgen_id": "fbml_stable1_construction_west",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_stable1_construction" ], "x": 3, "y": 9 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbml_stable1_construction" ], "x": 3, "y": 9, "z": 0 },
{ "chunks": [ "fbml_stable_roof_construction" ], "x": 3, "y": 9, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -211,6 +336,11 @@
"type": "mapgen",
"update_mapgen_id": "fbml_stable2_construction_northwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_stable2_construction" ], "x": 3, "y": 3 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbml_stable2_construction" ], "x": 3, "y": 3, "z": 0 },
{ "chunks": [ "fbml_stable_roof_construction" ], "x": 3, "y": 3, "z": 1 }
]
}
}
]
32 changes: 16 additions & 16 deletions ...on/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_palettes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,49 +26,49 @@
{
"type": "palette",
"id": "fbml_concrete_palette",
"terrain": { "+": "t_door_metal_c", "o": "t_window_no_curtains", "w": "t_sconc_wall" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_door_metal_c", "o": "t_window_no_curtains", "R": "t_concrete_roof", "w": "t_sconc_wall" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbml_log_palette",
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "w": "t_wall_wood" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "R": "t_wood_treated_roof", "w": "t_wall_wood" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbml_metal_palette",
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "w": "t_scrap_wall" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "R": "t_metal_flat_roof", "w": "t_scrap_wall" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbml_migo_resin_palette",
"terrain": { "+": "t_resin_hole_c", "o": "t_wall_resin_cage", "w": "t_wall_resin" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_resin_hole_c", "o": "t_wall_resin_cage", "R": "t_resin_roof", "w": "t_wall_resin" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbml_rammed_earth_palette",
"terrain": { "+": "t_door_makeshift_c", "o": "t_window_empty", "w": "t_wall_rammed_earth" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_door_makeshift_c", "o": "t_window_empty", "R": "t_log_sod_roof", "w": "t_wall_rammed_earth" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbml_rock_palette",
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "w": "t_rock_wall" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "R": "t_wood_treated_roof", "w": "t_rock_wall" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbml_wad_palette",
"terrain": { "+": "t_door_makeshift_c", "o": "t_wall_wattle_half", "w": "t_wall_wattle" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_door_makeshift_c", "o": "t_wall_wattle_half", "R": "t_log_sod_roof", "w": "t_wall_wattle" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbml_wood_palette",
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "w": "t_wall_wood" },
"furniture": { "+": "f_clear", "o": "f_clear", "w": "f_clear" }
"terrain": { "+": "t_door_c", "o": "t_window_no_curtains", "R": "t_wood_treated_roof", "w": "t_wall_wood" },
"furniture": { "+": "f_clear", "o": "f_clear", "R": "f_clear", "w": "f_clear" }
}
]

0 comments on commit e160e0d

Please sign in to comment.