Skip to content

Commit

Permalink
Merge pull request #35489 from curstwist/add-new-faction-camp-in-a-sh…
Browse files Browse the repository at this point in the history 
…elter

Add new faction camp in a shelter
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Nov 18, 2019
2 parents 87d597c + cf46f15 commit e72a302
Show file tree
Hide file tree
Showing 14 changed files with 2,154 additions and 6 deletions.
494 changes: 494 additions & 0 deletions data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json
View file

Large diffs are not rendered by default.

157 changes: 157 additions & 0 deletions data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
[
{
"type": "palette",
"id": "fbmc_shelter_1_palette_log",
"terrain": { "w": "t_wall_log", "d": "t_door_c" },
"furniture": {
"h": "f_chair",
"t": "f_table",
"x": "f_coffee_table",
"c": "f_workbench",
"r": "f_rack",
"b": "f_bed",
"m": "f_straw_bed",
"n": "f_makeshift_bed",
"L": "f_locker",
"s": "f_sofa",
"C": "f_armchair",
"B": "f_bookcase"
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_log",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" w",
"wdw"
],
"palettes": [ "fbmc_shelter_1_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_NW_log",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_log" ], "x": 8, "y": 8 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_log",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" d",
"www"
],
"palettes": [ "fbmc_shelter_1_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_W1_log",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_log" ], "x": 5, "y": 10 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_log",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" d",
"www"
],
"palettes": [ "fbmc_shelter_1_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_W2",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_log" ], "x": 5, "y": 13 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_log",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" X ",
" d"
],
"palettes": [ "fbmc_shelter_1_palette_log" ],
"terrain": { "X": "t_floor" }
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_log",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
" ww",
" w ",
" w ",
" w "
],
"palettes": [ "fbmc_shelter_1_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_SW_log",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmc_shelter_1_bedroom_SW_log" ], "x": 5, "y": 19 },
{ "chunks": [ "fbmc_shelter_1_bedroom_W3_log" ], "x": 5, "y": 16 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_log",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
" dww",
" w",
" w",
" w"
],
"palettes": [ "fbmc_shelter_1_palette_log" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_log",
"object": { "mapgensize": [ 2, 2 ], "rows": [
"dw",
" "
], "palettes": [ "fbmc_shelter_1_palette_log" ] }
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_S_log",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmc_shelter_1_bedroom_S1_log" ], "x": 8, "y": 19 },
{ "chunks": [ "fbmc_shelter_1_bedroom_S2_log" ], "x": 12, "y": 19 }
]
}
}
]
157 changes: 157 additions & 0 deletions data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
[
{
"type": "palette",
"id": "fbmc_shelter_1_palette_rock",
"terrain": { "w": "t_rock_wall", "d": "t_door_c" },
"furniture": {
"h": "f_chair",
"t": "f_table",
"x": "f_coffee_table",
"c": "f_workbench",
"r": "f_rack",
"b": "f_bed",
"m": "f_straw_bed",
"n": "f_makeshift_bed",
"L": "f_locker",
"s": "f_sofa",
"C": "f_armchair",
"B": "f_bookcase"
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_rock",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" w",
"wdw"
],
"palettes": [ "fbmc_shelter_1_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_NW_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_rock" ], "x": 8, "y": 8 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_rock",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" d",
"www"
],
"palettes": [ "fbmc_shelter_1_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_W1_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_rock" ], "x": 5, "y": 10 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_rock",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" d",
"www"
],
"palettes": [ "fbmc_shelter_1_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_W2",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_rock" ], "x": 5, "y": 13 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_rock",
"object": {
"mapgensize": [ 3, 3 ],
"rows": [
" w",
" X ",
" d"
],
"palettes": [ "fbmc_shelter_1_palette_rock" ],
"terrain": { "X": "t_floor" }
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
" ww",
" w ",
" w ",
" w "
],
"palettes": [ "fbmc_shelter_1_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_SW_rock",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmc_shelter_1_bedroom_SW_rock" ], "x": 5, "y": 19 },
{ "chunks": [ "fbmc_shelter_1_bedroom_W3_rock" ], "x": 5, "y": 16 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
" dww",
" w",
" w",
" w"
],
"palettes": [ "fbmc_shelter_1_palette_rock" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_rock",
"object": { "mapgensize": [ 2, 2 ], "rows": [
"dw",
" "
], "palettes": [ "fbmc_shelter_1_palette_rock" ] }
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_1_bedroom_S_rock",
"method": "json",
"object": {
"place_nested": [
{ "chunks": [ "fbmc_shelter_1_bedroom_S1_rock" ], "x": 8, "y": 19 },
{ "chunks": [ "fbmc_shelter_1_bedroom_S2_rock" ], "x": 12, "y": 19 }
]
}
}
]
Loading

0 comments on commit e72a302

Please sign in to comment.