Skip to content

Commit

Permalink
Merge pull request #34161 from curstwist/reorganize-livestock-files
Browse files Browse the repository at this point in the history 
reorganize basecamp livestock expansion files
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Sep 22, 2019
2 parents 20e1ca1 + cf1220d commit d459981
Show file tree
Hide file tree
Showing 12 changed files with 406 additions and 190 deletions.
117 changes: 117 additions & 0 deletions data/json/mapgen/basecamps/modular_livestock/modular_livestock_common.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
[
{
"type": "mapgen",
"update_mapgen_id": "faction_base_livestock_0",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_0" ], "x": 15, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_coop_yard_chickenwire",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"f f",
"f f",
"f f",
"f f",
"f f",
"fdffff"
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_coop_yard_chickenwire_east",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_coop_yard_chickenwire" ], "x": 15, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_pasture0_splitrail",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"FFDFFF",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_pasture0_splitrail_north",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_pasture0_splitrail" ], "x": 9, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_pasture1_splitrail",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" FF"
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_pasture1_splitrail_center",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_pasture1_splitrail" ], "x": 9, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_pasture2_splitrail",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" F ",
" F ",
" D ",
" F ",
" F ",
"FFDFF "
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_pasture2_splitrail_south",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_pasture2_splitrail" ], "x": 9, "y": 15 } ] }
}
]
0 ...pgen/basecamps/modular_livestock_log.json → ...ular_livestock/modular_livestock_log.json
View file
File renamed without changes.
0 ...en/basecamps/modular_livestock_metal.json → ...ar_livestock/modular_livestock_metal.json
View file
File renamed without changes.
0 ...gen/basecamps/modular_livestock_rock.json → ...lar_livestock/modular_livestock_rock.json
View file
File renamed without changes.
135 changes: 135 additions & 0 deletions data/json/mapgen/basecamps/modular_livestock/modular_livestock_wad.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
[
{
"type": "palette",
"id": "fbml_wad_palette",
"terrain": {
".": "t_dirtfloor",
"b": "t_dirtfloor",
"r": "t_dirtfloor",
"t": "t_dirtfloor",
"d": "t_chickenwire_gate_c",
"f": "t_chickenwire_fence",
"o": "t_wall_wattle_half",
"F": "t_splitrail_fence",
"D": "t_splitrail_fencegate_c",
"w": "t_wall_wattle",
"+": "t_door_makeshift_c"
},
"furniture": { "b": "f_bench", "r": "f_rack_wood", "t": "f_table" }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_coop_wad",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"wwwwww",
"w....w",
"w....w",
"w....w",
"w....w",
"wwdfww"
],
"palettes": [ "fbml_wad_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_coop_wad_northeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_coop_wad" ], "x": 15, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_shack_wad",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" woww",
" wwrrw",
" +..to",
" orrrw",
" wwoww"
],
"palettes": [ "fbml_wad_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_shack_wad_southeast",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_shack_wad" ], "x": 15, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_stable0_wad",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"wwww.w",
"w..D..",
"w..F..",
"w..F..",
"w..Fbb",
"wwwwww"
],
"palettes": [ "fbml_wad_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_stable0_wad_southwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_stable0_wad" ], "x": 3, "y": 15 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_stable1_wad",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"wwww.w",
"w..F..",
"w..D..",
"wwwwb.",
"w..Fb.",
"w..D.."
],
"palettes": [ "fbml_wad_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_stable1_wad_west",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_stable1_wad" ], "x": 3, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_stable2_wad",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"wwwwww",
"w..F..",
"w..D..",
"wwwwb.",
"w..Fb.",
"w..D.."
],
"palettes": [ "fbml_wad_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_stable2_wad_northwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_stable2_wad" ], "x": 3, "y": 3 } ] }
}
]
115 changes: 0 additions & 115 deletions ...gen/basecamps/modular_livestock_wood.json → ...lar_livestock/modular_livestock_wood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,6 @@
},
"furniture": { "b": "f_bench", "r": "f_rack", "t": "f_table" }
},
{
"type": "mapgen",
"update_mapgen_id": "faction_base_livestock_0",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_0" ], "x": 15, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_0",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
Expand All @@ -63,29 +40,6 @@
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_coop_wood" ], "x": 15, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_coop_yard_chickenwire",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"f f",
"f f",
"f f",
"f f",
"f f",
"fdffff"
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_coop_yard_chickenwire_east",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_coop_yard_chickenwire" ], "x": 15, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
Expand Down Expand Up @@ -177,74 +131,5 @@
"update_mapgen_id": "fbml_stable2_wood_northwest",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_stable2_wood" ], "x": 3, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_pasture0_splitrail",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"FFDFFF",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_pasture0_splitrail_north",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_pasture0_splitrail" ], "x": 9, "y": 3 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_pasture1_splitrail",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" FF"
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_pasture1_splitrail_center",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_pasture1_splitrail" ], "x": 9, "y": 9 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "fbml_pasture2_splitrail",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
" F ",
" F ",
" D ",
" F ",
" F ",
"FFDFF "
],
"palettes": [ "fbml_wood_palette" ]
}
},
{
"type": "mapgen",
"update_mapgen_id": "fbml_pasture2_splitrail_south",
"method": "json",
"object": { "place_nested": [ { "chunks": [ "fbml_pasture2_splitrail" ], "x": 9, "y": 15 } ] }
}
]
Loading

0 comments on commit d459981

Please sign in to comment.