Skip to content

Commit

Permalink
Explicit roofs on workshop version 2 expansion
Browse files Browse the repository at this point in the history
  • Loading branch information
@PatrikLundell
PatrikLundell committed May 23, 2024
1 parent 2d02175 commit 3d9c555
Show file tree
Hide file tree
Showing 3 changed files with 305 additions and 47 deletions.
53 changes: 18 additions & 35 deletions data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
[
{
"type": "palette",
"id": "fbmw_2_common_palette",
"terrain": { ";": "t_dirt" },
"furniture": {
"t": "f_table",
"L": "f_dresser",
"x": "f_kiln_empty",
"f": "f_forge_rock",
"c": "f_workbench",
"h": "f_stool",
"A": "f_anvil",
"r": "f_rack_wood",
"Q": "f_bellows",
"b": "f_bench",
"z": "f_55gal_firebarrel",
"k": "f_clay_kiln",
"M": "f_armchair",
"B": "f_bookcase",
";": "f_clear"
}
},
{
"type": "mapgen",
"method": "json",
Expand Down Expand Up @@ -69,10 +47,11 @@
"method": "json",
"object": {
"set": [
{ "point": "furniture", "id": "f_fireplace", "x": 14, "y": 17 },
{ "point": "furniture", "id": "f_forge_rock", "x": 16, "y": 17 },
{ "point": "furniture", "id": "f_table", "x": 17, "y": 17 },
{ "point": "furniture", "id": "f_dresser", "x": 18, "y": 17 }
{ "point": "furniture", "id": "f_fireplace", "x": 14, "y": 17, "z": 0 },
{ "point": "furniture", "id": "f_chimney", "x": 14, "y": 17, "z": 1 },
{ "point": "furniture", "id": "f_forge_rock", "x": 16, "y": 17, "z": 0 },
{ "point": "furniture", "id": "f_table", "x": 17, "y": 17, "z": 0 },
{ "point": "furniture", "id": "f_dresser", "x": 18, "y": 17, "z": 0 }
],
"place_loot": [ { "item": "makeshift_hammer", "x": 17, "y": 17, "chance": 100 } ]
}
Expand All @@ -83,8 +62,8 @@
"method": "json",
"object": {
"set": [
{ "point": "furniture", "id": "f_kiln_empty", "x": 17, "y": 14 },
{ "point": "furniture", "id": "f_kiln_empty", "x": 18, "y": 14 }
{ "point": "furniture", "id": "f_kiln_empty", "x": 17, "y": 14, "z": 0 },
{ "point": "furniture", "id": "f_kiln_empty", "x": 18, "y": 14, "z": 0 }
],
"place_loot": [ { "item": "crucible", "x": 17, "y": 17, "chance": 100 } ]
}
Expand Down Expand Up @@ -154,7 +133,10 @@
"type": "mapgen",
"update_mapgen_id": "fbmw_2_common_pottery",
"method": "json",
"object": { "set": [ { "point": "furniture", "id": "f_clay_kiln", "x": 1, "y": 18 } ] }
"object": { "set": [
{ "point": "furniture", "id": "f_clay_kiln", "x": 1, "y": 18, "z": 0 },
{ "point": "furniture", "id": "f_chimney", "x": 1, "y": 18, "z": 1 }
] }
},
{
"type": "mapgen",
Expand Down Expand Up @@ -184,12 +166,13 @@
"method": "json",
"object": {
"set": [
{ "point": "furniture", "id": "f_bookcase", "x": 1, "y": 8 },
{ "point": "furniture", "id": "f_forge_rock", "x": 3, "y": 8 },
{ "point": "furniture", "id": "f_bookcase", "x": 1, "y": 9 },
{ "point": "furniture", "id": "f_bookcase", "x": 1, "y": 10 },
{ "point": "furniture", "id": "f_armchair", "x": 2, "y": 10 },
{ "point": "furniture", "id": "f_workbench", "x": 3, "y": 10 }
{ "point": "furniture", "id": "f_bookcase", "x": 1, "y": 8, "z": 0 },
{ "point": "furniture", "id": "f_forge_rock", "x": 3, "y": 8, "z": 0 },
{ "point": "furniture", "id": "f_chimney", "x": 3, "y": 8, "z": 1 },
{ "point": "furniture", "id": "f_bookcase", "x": 1, "y": 9, "z": 0 },
{ "point": "furniture", "id": "f_bookcase", "x": 1, "y": 10, "z": 0 },
{ "point": "furniture", "id": "f_armchair", "x": 2, "y": 10, "z": 0 },
{ "point": "furniture", "id": "f_workbench", "x": 3, "y": 10, "z": 0 }
],
"place_loot": [
{ "item": "tongs", "x": 3, "y": 10, "chance": 100 },
Expand Down
220 changes: 214 additions & 6 deletions .../mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_construction.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,51 @@
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmw_2_smithy_1_roof_construction",
"object": {
"parameters": {
"fbmw_2_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmw_2_concrete_palette",
"fbmw_2_log_palette",
"fbmw_2_metal_palette",
"fbmw_2_migo_resin_palette",
"fbmw_2_rammed_earth_palette",
"fbmw_2_rock_palette",
"fbmw_2_wad_palette",
"fbmw_2_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
"rrrrrr",
"rrrrrr",
"rrrrrr",
"rrrrrr",
"rrrrrr",
"rrrrrr"
],
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmw_2_smithy_1_construction",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmw_2_smithy_1_construction" ], "x": 14, "y": 17 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbmw_2_smithy_1_construction" ], "x": 14, "y": 17, "z": 0 },
{ "chunks": [ "fbmw_2_smithy_1_roof_construction" ], "x": 14, "y": 17, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -77,11 +117,51 @@
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmw_2_smithy_2_roof_construction",
"object": {
"parameters": {
"fbmw_2_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmw_2_concrete_palette",
"fbmw_2_log_palette",
"fbmw_2_metal_palette",
"fbmw_2_migo_resin_palette",
"fbmw_2_rammed_earth_palette",
"fbmw_2_rock_palette",
"fbmw_2_wad_palette",
"fbmw_2_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
" rrrr",
" rrrr",
"rrrrrr",
" ",
" ",
" "
],
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmw_2_smithy_2_construction",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmw_2_smithy_2_construction" ], "x": 14, "y": 14 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbmw_2_smithy_2_construction" ], "x": 14, "y": 14, "z": 0 },
{ "chunks": [ "fbmw_2_smithy_2_roof_construction" ], "x": 14, "y": 14, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -121,11 +201,53 @@
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmw_2_pottery_roof_construction",
"object": {
"parameters": {
"fbmw_2_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmw_2_concrete_palette",
"fbmw_2_log_palette",
"fbmw_2_metal_palette",
"fbmw_2_migo_resin_palette",
"fbmw_2_rammed_earth_palette",
"fbmw_2_rock_palette",
"fbmw_2_wad_palette",
"fbmw_2_wood_palette"
]
}
}
},
"mapgensize": [ 8, 8 ],
"rows": [
"rrrrrrrr",
"rrrrrrrr",
"rrrrrrrr",
"rrrrrrrr",
"rrrrrrrr",
"rrrrrrrr",
"rrrrrrrr",
" "
],
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmw_2_pottery_construction",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmw_2_pottery_construction" ], "x": 0, "y": 16 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbmw_2_pottery_construction" ], "x": 0, "y": 16, "z": 0 },
{ "chunks": [ "fbmw_2_pottery_roof_construction" ], "x": 0, "y": 16, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -164,11 +286,52 @@
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmw_2_smithy_3_roof_construction",
"object": {
"parameters": {
"fbmw_2_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmw_2_concrete_palette",
"fbmw_2_log_palette",
"fbmw_2_metal_palette",
"fbmw_2_migo_resin_palette",
"fbmw_2_rammed_earth_palette",
"fbmw_2_rock_palette",
"fbmw_2_wad_palette",
"fbmw_2_wood_palette"
]
}
}
},
"mapgensize": [ 7, 7 ],
"rows": [
"rrrrrr ",
"rrrrrr ",
"rrrrrr ",
"rrrrrr ",
"rrrrrr ",
"rrrrrr ",
"rrrrrr "
],
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmw_2_smithy_3_construction",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmw_2_smithy_3_construction" ], "x": 8, "y": 16 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbmw_2_smithy_3_construction" ], "x": 8, "y": 16, "z": 0 },
{ "chunks": [ "fbmw_2_smithy_3_roof_construction" ], "x": 8, "y": 16, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -206,11 +369,51 @@
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmw_2_6x5_roof_construction",
"object": {
"parameters": {
"fbmw_2_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmw_2_concrete_palette",
"fbmw_2_log_palette",
"fbmw_2_metal_palette",
"fbmw_2_migo_resin_palette",
"fbmw_2_rammed_earth_palette",
"fbmw_2_rock_palette",
"fbmw_2_wad_palette",
"fbmw_2_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
"rrrrrr",
"rrrrrr",
"rrrrrr",
"rrrrrr",
"rrrrrr",
" "
],
"palettes": [ { "param": "fbmw_2_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmw_2_glassblower_construction",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmw_2_glassblower_construction" ], "x": 0, "y": 7 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbmw_2_glassblower_construction" ], "x": 0, "y": 7, "z": 0 },
{ "chunks": [ "fbmw_2_6x5_roof_construction" ], "x": 0, "y": 7, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down Expand Up @@ -252,6 +455,11 @@
"type": "mapgen",
"update_mapgen_id": "fbmw_2_tanner_construction",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmw_2_tanner_construction" ], "x": 14, "y": 0 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbmw_2_tanner_construction" ], "x": 14, "y": 0, "z": 0 },
{ "chunks": [ "fbmw_2_6x5_roof_construction" ], "x": 14, "y": 0, "z": 1 }
]
}
}
]
Loading

0 comments on commit 3d9c555

Please sign in to comment.