Skip to content

Commit

Permalink
Modular saltworks (CleverRaven#34136)
Browse files Browse the repository at this point in the history 
* WIP Saltworks

Creating Modular basecamp Saltworks with a Brewery. Still needs recipes for follower missions.  Still needs additional building materials versions but trying to get the camp site to build.

* Update data/json/recipes/basecamps/recipe_modular_saltworks_log.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>

* Update recipe_modular_saltworks_log.json

* Update data/json/mapgen/basecamps/modular_saltworks_log.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* Update modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* Update modular_saltworks_log.json

* Additional Materials

added other material's for buildings

* added recipes to basecamps

* Create recipe_modular_saltworks_stone.json

* Update modular_saltworks_wad.json

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_wad.json

* updates and corrections

* Update recipe_modular_saltworks_wad.json

* Update recipe_modular_saltworks_wood.json

* Update modular_saltworks_wad.json

* fixes and removing excess pallettes

* fbml to fmbs

* Update recipe_groups.json

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* Update recipe_modular_saltworks_log.json

* removing { on line 64 of each json

* Update recipe_modular_saltworks_stone.json

* Linting and repair

* Update modular_saltworks_rock.json

* fbms_0 to fbmsw_0

* Update recipe_modular_saltworks_wad.json

* fixed syntax and references

* Update recipe_modular_saltworks_stone.json

* Update overmap_terrain_faction_base.json

* Update modular_saltworks_log.json

* Update faction_buildings.json

* Update recipe_modular_saltworks_wad.json

* Update recipe_modular_saltworks_wood.json

* replace extraneous #

* fbms to fbmsw

Also created saltworks folder for recipes

* add recipe descriptor

* named upgrades appropriately

in blueprint provides requires excludes

* remove excess th's

fixed faction owner

* Update faction_buildings.json

* limiting upgrade options

Attempting to make it so it doesn't ask me if I want to replace with other designs

* Lintin new excludes

* changed west to southwest

See if this fixes the ability to upgrade to level 2 brewery

* Cursetwist fixes to Saltworks

* It's the final linting...doo da doot doot
  • Loading branch information
@Maleclypse @Ramza13
Maleclypse authored and Ramza13 committed Nov 5, 2019
1 parent 5b8ae59 commit 57c514a
Show file tree
Hide file tree
Showing 15 changed files with 905 additions and 0 deletions.
73 changes: 73 additions & 0 deletions data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_common.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbmsw_wood_palette" ]
}
},
{
"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_brewery1_still",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
" ",
" ",
" ",
" ^ ",
" # ",
" s tr ",
" "
],
"palettes": [ "fbmsw_wad_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_brewery1_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_brewery1_still" ], "x": 3, "y": 14 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_brewery2_kegs",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
" ",
" H r ",
" ",
" ",
" H ",
" H ",
" "
],
"palettes": [ "fbmsw_wad_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_brewery2_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_brewery2_kegs" ], "x": 3, "y": 14 } ] }
}
]
108 changes: 108 additions & 0 deletions data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_log.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
[
{
"type": "palette",
"id": "fbmsw_log_palette",
"terrain": {
".": "t_floor_primitive",
"b": "t_floor_primitive",
"r": "t_floor_primitive",
"t": "t_floor_primitive",
"#": "t_floor_primitive",
"H": "t_floor_primitive",
"^": "t_floor_primitive",
"s": "t_floor_primitive",
"~": "t_swater_sh",
"o": "t_window_no_curtains",
"w": "t_wall_log",
"+": "t_door_c"
},
"furniture": {
"b": "f_bench",
"r": "f_rack",
"t": "f_table",
"#": "f_stool",
"c": "f_counter",
"H": "f_wood_keg",
"O": "f_fvat_empty",
"^": "f_still",
"s": "f_woodstove"
}
},
{
"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_log",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"wwwowww",
"w.....w",
"w.c.c.w",
"o.~t~.o",
"w.~#~.w",
"w.....w",
"www+www"
],
"palettes": [ "fbmsw_log_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_saltpan_log_northeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_saltpan_log" ], "x": 14, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_shack_log",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" woww",
" wwrrw",
" +..to",
" orrrw",
" wwoww"
],
"palettes": [ "fbmsw_log_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_shack_log_southeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_shack_log" ], "x": 15, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_brewery0_log",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"wwwwwww",
"w.rrr.w",
"oH....+",
"wO....w",
"o.....w",
"w.....w",
"wwwwwww"
],
"palettes": [ "fbmsw_log_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_brewery0_log_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_brewery0_log" ], "x": 3, "y": 14 } ] }
}
]
102 changes: 102 additions & 0 deletions data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_metal.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
[
{
"type": "palette",
"id": "fbmsw_metal_palette",
"terrain": {
".": "t_metal_floor",
"b": "t_metal_floor",
"r": "t_metal_floor",
"t": "t_metal_floor",
"#": "t_metal_floor",
"H": "t_metal_floor",
"^": "t_metal_floor",
"s": "t_metal_floor",
"~": "t_swater_sh",
"o": "t_window_no_curtains",
"w": "t_scrap_wall",
"+": "t_door_c"
},
"furniture": {
"b": "f_bench",
"r": "f_rack",
"t": "f_table",
"#": "f_stool",
"c": "f_counter",
"H": "f_wood_keg",
"O": "f_fvat_empty",
"^": "f_still",
"s": "f_woodstove"
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_saltpan_metal",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"wwwowww",
"w.....w",
"w.c.c.w",
"o.~t~.o",
"w.~#~.w",
"w.....w",
"www+www"
],
"palettes": [ "fbmsw_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_saltpan_metal_northeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_saltpan_metal" ], "x": 14, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_shack_metal",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" woww",
" wwrrw",
" +..to",
" orrrw",
" wwoww"
],
"palettes": [ "fbmsw_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_shack_metal_southeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_shack_metal" ], "x": 15, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_brewery0_metal",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"wwwwwww",
"w.rrr.w",
"oH....+",
"wO....w",
"o.....w",
"w.....w",
"wwwwwww"
],
"palettes": [ "fbmsw_metal_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_brewery0_metal_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_brewery0_metal" ], "x": 3, "y": 14 } ] }
}
]
102 changes: 102 additions & 0 deletions data/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rock.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
[
{
"type": "palette",
"id": "fbmsw_rock_palette",
"terrain": {
".": "t_rock_floor",
"b": "t_rock_floor",
"r": "t_rock_floor",
"t": "t_rock_floor",
"#": "t_rock_floor",
"H": "t_rock_floor",
"^": "t_rock_floor",
"s": "t_rock_floor",
"~": "t_swater_sh",
"o": "t_window_no_curtains",
"w": "t_rock_wall",
"+": "t_door_c"
},
"furniture": {
"b": "f_bench",
"r": "f_rack",
"t": "f_table",
"#": "f_stool",
"c": "f_counter",
"H": "f_wood_keg",
"O": "f_fvat_empty",
"^": "f_still",
"s": "f_woodstove"
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_saltpan_rock",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"wwwowww",
"w.....w",
"w.c.c.w",
"o.~t~.o",
"w.~#~.w",
"w.....w",
"www+www"
],
"palettes": [ "fbmsw_rock_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_saltpan_rock_northeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_saltpan_rock" ], "x": 14, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_shack_rock",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" woww",
" wwrrw",
" +..to",
" orrrw",
" wwoww"
],
"palettes": [ "fbmsw_rock_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_shack_rock_southeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_shack_rock" ], "x": 15, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmsw_brewery0_rock",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"wwwwwww",
"w.rrr.w",
"oH....+",
"wO....w",
"o.....w",
"w.....w",
"wwwwwww"
],
"palettes": [ "fbmsw_rock_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmsw_brewery0_rock_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmsw_brewery0_rock" ], "x": 3, "y": 14 } ] }
}
]

0 comments on commit 57c514a

Please sign in to comment.