Skip to content

Commit

Permalink
Merge branch 'CleverRaven:master' into plastic_molding_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@TealcOneill
TealcOneill authored May 26, 2024
2 parents 300b561 + 6a57dbd commit 963db4a
Show file tree
Hide file tree
Showing 117 changed files with 1,083 additions and 1,363 deletions.
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-pallet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"items": [
{ "item": "material_cement", "container-item": "bag_canvas", "charges": 500, "count": [ 80, 90 ] },
{ "item": "material_cement", "charges": [ 500, 1500 ] },
{ "item": "bag_canvas", "count": [ 2, 10 ], "damage": [ 1, 5 ] },
{ "item": "bag_durasack", "count": [ 2, 10 ], "damage": [ 1, 5 ] },
{ "item": "pallet", "count": 1 }
]
}
Expand Down
32 changes: 24 additions & 8 deletions ...json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
[
{
"type": "palette",
"id": "fbmsw_common_palette",
"terrain": { ".": "t_dirt" },
"//": "Didn't like an empty terrain section, so a dummy entry has been added",
"furniture": { "r": "f_rack", "t": "f_table", "#": "f_stool", "H": "f_wood_keg", "^": "f_still", "s": "f_woodstove" }
},
{
"type": "mapgen",
"method": "json",
Expand Down Expand Up @@ -36,11 +29,34 @@
"palettes": [ "fbmsw_common_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_brewery1_still_roof",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" C ",
" "
],
"palettes": [ "fbmsw_common_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_brewery1_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_brewery1_still" ], "x": 3, "y": 14 } ] }
"object": {
"place_nested": [
{ "chunks": [ "fbmsw_brewery1_still" ], "x": 3, "y": 14, "z": 0 },
{ "chunks": [ "fbmsw_brewery1_still_roof" ], "x": 3, "y": 14, "z": 1 }
]
}
},
{
"type": "mapgen",
Expand Down
252 changes: 252 additions & 0 deletions ...apgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_construction.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
[
{
"type": "mapgen",
"update_mapgen_id": "faction_base_saltworks_0",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_0" ], "x": 15, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_saltpan_construction",
"object": {
"parameters": {
"fbmsw_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmsw_log_palette",
"fbmsw_metal_palette",
"fbmsw_migo_resin_palette",
"fbmsw_rammed_earth_palette",
"fbmsw_rock_palette",
"fbmsw_wad_palette",
"fbmsw_wood_palette"
]
}
}
},
"mapgensize": [ 7, 7 ],
"rows": [
"wwwowww",
"w.....w",
"w.c.c.w",
"o.~t~.o",
"w.~#~.w",
"w.....w",
"www+www"
],
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ { "param": "fbmsw_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_saltpan_construction_roof",
"object": {
"parameters": {
"fbmsw_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmsw_log_palette",
"fbmsw_metal_palette",
"fbmsw_migo_resin_palette",
"fbmsw_rammed_earth_palette",
"fbmsw_rock_palette",
"fbmsw_wad_palette",
"fbmsw_wood_palette"
]
}
}
},
"mapgensize": [ 7, 7 ],
"rows": [
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR"
],
"palettes": [ { "param": "fbmsw_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_saltpan_construction_northeast",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmsw_saltpan_construction" ], "x": 14, "y": 3, "z": 0 },
{ "chunks": [ "fbmsw_saltpan_construction_roof" ], "x": 14, "y": 3, "z": 1 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_shack_construction",
"object": {
"parameters": {
"fbmsw_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmsw_log_palette",
"fbmsw_metal_palette",
"fbmsw_migo_resin_palette",
"fbmsw_rammed_earth_palette",
"fbmsw_rock_palette",
"fbmsw_wad_palette",
"fbmsw_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" woww",
" wwrrw",
" +..to",
" orrrw",
" wwoww"
],
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ { "param": "fbmsw_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_shack_construction_roof",
"object": {
"parameters": {
"fbmsw_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmsw_log_palette",
"fbmsw_metal_palette",
"fbmsw_migo_resin_palette",
"fbmsw_rammed_earth_palette",
"fbmsw_rock_palette",
"fbmsw_wad_palette",
"fbmsw_wood_palette"
]
}
}
},
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" RRRR",
" RRRRR",
" RRRRR",
" RRRRR",
" RRRRR"
],
"palettes": [ { "param": "fbmsw_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_shack_construction_southeast",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmsw_shack_construction" ], "x": 15, "y": 15, "z": 0 },
{ "chunks": [ "fbmsw_shack_construction_roof" ], "x": 15, "y": 15, "z": 1 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_brewery0_construction",
"object": {
"parameters": {
"fbmsw_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmsw_log_palette",
"fbmsw_metal_palette",
"fbmsw_migo_resin_palette",
"fbmsw_rammed_earth_palette",
"fbmsw_rock_palette",
"fbmsw_wad_palette",
"fbmsw_wood_palette"
]
}
}
},
"mapgensize": [ 7, 7 ],
"rows": [
"wwwwwww",
"w.rrr.w",
"oH....+",
"wO....w",
"o.....w",
"w.....w",
"wwwwwww"
],
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ { "param": "fbmsw_construction_palette" } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_brewery0_construction_roof",
"object": {
"parameters": {
"fbmsw_construction_palette": {
"type": "palette_id",
"scope": "omt",
"default": {
"distribution": [
"fbmsw_log_palette",
"fbmsw_metal_palette",
"fbmsw_migo_resin_palette",
"fbmsw_rammed_earth_palette",
"fbmsw_rock_palette",
"fbmsw_wad_palette",
"fbmsw_wood_palette"
]
}
}
},
"mapgensize": [ 7, 7 ],
"rows": [
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR"
],
"palettes": [ { "param": "fbmsw_construction_palette" } ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_brewery0_construction_southwest",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmsw_brewery0_construction" ], "x": 3, "y": 14, "z": 0 },
{ "chunks": [ "fbmsw_brewery0_construction_roof" ], "x": 3, "y": 14, "z": 1 }
]
}
}
]
Loading

0 comments on commit 963db4a

Please sign in to comment.