Skip to content

Commit

Permalink
Merge pull request #34433 from curstwist/add-faction-base-to-shelter-
Browse files Browse the repository at this point in the history 
add faction base to the main shelter
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Oct 8, 2019
2 parents 55c8063 + 3f39750 commit 4feecd9
Show file tree
Hide file tree
Showing 13 changed files with 1,866 additions and 1 deletion.
437 changes: 437 additions & 0 deletions data/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json
View file

Large diffs are not rendered by default.

126 changes: 126 additions & 0 deletions data/json/mapgen/basecamps/modular_shelter/modular_shelter_log.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
[
{
"type": "palette",
"id": "fbmc_shelter_palette_log",
"terrain": { "w": "t_wall_log", "d": "t_door_c" },
"furniture": {
"h": "f_chair",
"t": "f_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_bedroom_SE_log",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
"w ",
"d ",
"w "
],
"palettes": [ "fbmc_shelter_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_se_log",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SE_log" ], "x": 15, "y": 19 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_E_log",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
"w ",
"d ",
"w "
],
"palettes": [ "fbmc_shelter_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_e_log",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_E_log" ], "x": 15, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_SW_log",
"object": {
"mapgensize": [ 5, 5 ],
"rows": [
" wwww",
" w",
" d",
" w",
" www"
],
"palettes": [ "fbmc_shelter_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_SW_log",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SW_log" ], "x": 4, "y": 16 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_W_log",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
" w",
" d",
" w"
],
"palettes": [ "fbmc_shelter_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_W_log",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_W_log" ], "x": 5, "y": 12 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_NW_log",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
" ",
" w",
" d",
" w"
],
"palettes": [ "fbmc_shelter_palette_log" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_NW_log",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_NW_log" ], "x": 5, "y": 8 } ] }
}
]
126 changes: 126 additions & 0 deletions data/json/mapgen/basecamps/modular_shelter/modular_shelter_rock.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
[
{
"type": "palette",
"id": "fbmc_shelter_palette_rock",
"terrain": { "w": "t_rock_wall", "d": "t_door_c" },
"furniture": {
"h": "f_chair",
"t": "f_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_bedroom_SE_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
"w ",
"d ",
"w "
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_se_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SE_rock" ], "x": 15, "y": 19 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_E_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
"w ",
"d ",
"w "
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_e_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_E_rock" ], "x": 15, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_SW_rock",
"object": {
"mapgensize": [ 5, 5 ],
"rows": [
" wwww",
" w",
" d",
" w",
" www"
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_SW_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SW_rock" ], "x": 4, "y": 16 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_W_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
" w",
" d",
" w"
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_W_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_W_rock" ], "x": 5, "y": 12 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_NW_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
" ",
" w",
" d",
" w"
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_NW_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_NW_rock" ], "x": 5, "y": 8 } ] }
}
]
126 changes: 126 additions & 0 deletions data/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
[
{
"type": "palette",
"id": "fbmc_shelter_palette_rock",
"terrain": { "w": "t_rock_wall", "d": "t_door_c" },
"furniture": {
"h": "f_chair",
"t": "f_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_bedroom_SE_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
"w ",
"d ",
"w "
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_se_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SE_rock" ], "x": 15, "y": 19 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_E_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
"w ",
"d ",
"w "
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_e_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_E_rock" ], "x": 15, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_SW_rock",
"object": {
"mapgensize": [ 5, 5 ],
"rows": [
" wwww",
" w",
" d",
" w",
" www"
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_SW_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SW_rock" ], "x": 4, "y": 16 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_W_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"wwww",
" w",
" d",
" w"
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_W_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_W_rock" ], "x": 5, "y": 12 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbmc_shelter_bedroom_NW_rock",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
" ",
" w",
" d",
" w"
],
"palettes": [ "fbmc_shelter_palette_rock" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbmc_shelter_bedroom_NW_rock",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_NW_rock" ], "x": 5, "y": 8 } ] }
}
]
Loading

0 comments on commit 4feecd9

Please sign in to comment.