Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modular saltworks #34136

Merged
merged 59 commits into from
Nov 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
846a688
Merge pull request #1 from CleverRaven/master
Maleclypse Sep 6, 2019
d195e49
Merge pull request #2 from CleverRaven/master
Maleclypse Sep 20, 2019
883b92e
WIP Saltworks
Maleclypse Sep 20, 2019
3d9a5d0
Update data/json/recipes/basecamps/recipe_modular_saltworks_log.json
Maleclypse Sep 21, 2019
7d3e458
Update recipe_modular_saltworks_log.json
Maleclypse Sep 21, 2019
bf3abfa
Update data/json/mapgen/basecamps/modular_saltworks_log.json
Maleclypse Sep 21, 2019
672ada8
Update recipe_modular_saltworks_log.json
Maleclypse Sep 21, 2019
e836939
Trying to fix this
Maleclypse Sep 21, 2019
e7e2afe
Update recipe_modular_saltworks_log.json
Maleclypse Sep 21, 2019
f05f7f0
Update recipe_modular_saltworks_log.json
Maleclypse Sep 21, 2019
a7fcbbc
Update modular_saltworks_log.json
Maleclypse Sep 21, 2019
e1563c7
Update recipe_modular_saltworks_log.json
Maleclypse Sep 25, 2019
49b2a0a
Update recipe_modular_saltworks_log.json
Maleclypse Sep 25, 2019
5a445b2
Merge branch 'master' into Modular-Saltworks
Maleclypse Sep 25, 2019
1428787
Update modular_saltworks_log.json
Maleclypse Sep 27, 2019
09e77aa
Additional Materials
Maleclypse Sep 27, 2019
abc5f7e
added recipes to basecamps
Maleclypse Sep 27, 2019
9f2cc71
Create recipe_modular_saltworks_stone.json
Maleclypse Sep 27, 2019
08d2e67
Update modular_saltworks_wad.json
Maleclypse Sep 27, 2019
18702b6
Update recipe_modular_saltworks_log.json
Maleclypse Oct 5, 2019
d80aaee
Update recipe_modular_saltworks_wad.json
Maleclypse Oct 5, 2019
5089d63
updates and corrections
Maleclypse Oct 6, 2019
b8f4f3b
Update recipe_modular_saltworks_wad.json
Maleclypse Oct 6, 2019
65496b1
Update recipe_modular_saltworks_wood.json
Maleclypse Oct 6, 2019
92a408f
Update modular_saltworks_wad.json
Maleclypse Oct 6, 2019
8b97585
fixes and removing excess pallettes
Maleclypse Oct 6, 2019
ac59128
fbml to fmbs
Maleclypse Oct 6, 2019
eb5ec0f
Update recipe_groups.json
Maleclypse Oct 7, 2019
01f3204
Update recipe_modular_saltworks_log.json
Maleclypse Oct 7, 2019
f9ff861
Update recipe_modular_saltworks_log.json
Maleclypse Oct 7, 2019
116988e
Update recipe_modular_saltworks_log.json
Maleclypse Oct 7, 2019
40648bd
Update recipe_modular_saltworks_log.json
Maleclypse Oct 7, 2019
e9ff5b5
Update recipe_modular_saltworks_log.json
Maleclypse Oct 7, 2019
28f4348
removing { on line 64 of each json
Maleclypse Oct 7, 2019
fdf829d
Update recipe_modular_saltworks_stone.json
Maleclypse Oct 7, 2019
bd7e561
Merge pull request #4 from CleverRaven/master
Maleclypse Oct 16, 2019
6554c97
Merge branch 'master' into Modular-Saltworks
Maleclypse Oct 18, 2019
19a2ca4
Linting and repair
Maleclypse Oct 18, 2019
e52766b
Update modular_saltworks_rock.json
Maleclypse Oct 27, 2019
c88fbdb
fbms_0 to fbmsw_0
Maleclypse Oct 27, 2019
eb529fa
Update recipe_modular_saltworks_wad.json
Maleclypse Oct 27, 2019
3b0f7cb
fixed syntax and references
Maleclypse Oct 27, 2019
fd949c0
Update recipe_modular_saltworks_stone.json
Maleclypse Oct 27, 2019
17eee0d
Update overmap_terrain_faction_base.json
Maleclypse Oct 27, 2019
9d300f9
Update modular_saltworks_log.json
Maleclypse Oct 27, 2019
64d5a67
Update faction_buildings.json
Maleclypse Oct 27, 2019
599e011
Update recipe_modular_saltworks_wad.json
Maleclypse Oct 27, 2019
e54cc3a
Update recipe_modular_saltworks_wood.json
Maleclypse Oct 27, 2019
3284b72
replace extraneous #
Maleclypse Oct 27, 2019
3918d34
fbms to fbmsw
Maleclypse Oct 27, 2019
c7ae884
add recipe descriptor
Maleclypse Oct 29, 2019
91bb601
named upgrades appropriately
Maleclypse Oct 30, 2019
6fd10e9
remove excess th's
Maleclypse Oct 30, 2019
48b04fc
Update faction_buildings.json
Maleclypse Oct 31, 2019
9857a19
limiting upgrade options
Maleclypse Nov 2, 2019
98f3794
Lintin new excludes
Maleclypse Nov 2, 2019
aa358ac
changed west to southwest
Maleclypse Nov 2, 2019
e86dd8e
Cursetwist fixes to Saltworks
Maleclypse Nov 4, 2019
a33cc17
It's the final linting...doo da doot doot
Maleclypse Nov 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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 } ] }
}
]
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 } ] }
}
]
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 } ] }
}
]
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 } ] }
}
]