Skip to content

Commit

Permalink
Add city block (#36540)
Browse files Browse the repository at this point in the history 
* add support files

incl. palette, overmap terrain, map spawn entries

* add core mapgen

adds core mapgen and location dependent nested maps entries

* add nested chunks

* remove fill_ter from nested chunks

* Update retail_nested.json

* update item_groups
  • Loading branch information
@curstwist @I-am-Erk
curstwist authored and I-am-Erk committed Dec 31, 2019
1 parent 3f950bf commit f216867
Show file tree
Hide file tree
Showing 6 changed files with 1,878 additions and 0 deletions.
315 changes: 315 additions & 0 deletions data/json/mapgen/city_blocks/city_block_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,315 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "city_block2_1", "city_block2_2", "city_block2_3", "city_block2_4" ] ],
"weight": 250,
"object": {
"fill_ter": "t_floor",
"rows": [
"..MMMsssMMMss|ooooo|+||~~$M|o+o|...sss...|o+o|M.M.X.s|oo|+|oo|s.X.M$~~$ss|ooooooooo|MMMsssMMMsss",
".|ooo|+|ooo|s|y JE F|~~||| |o|<sss<|o|y y|o|MGGGs|y < y|sGGGM|~~~ss+ JA FFFy|ooo|+|ooo|ss",
".|1 |<| A? F|~~|y ||||||| y|ooo|+|||||||||+|ooo|~~<|o| JJ |1 |ss",
".| ||| JJJ F|~~|2 B | B2 |1 |1 |~~||5 | |ss",
".| |6 |~~| %%|%% | | |~~p| | |<s",
".| | |~~| B | B | | |~~p| | |||",
".| | |~~| %%|%% | | |~~~| | |j|",
".| | |~~| B | B | | |~~~| | * |",
".| | |~~| %%|%% | | |~~p| | |t|",
".| | |~~|y B | B | | |~~~| | |||",
".| | |~~| ||||| | | |~~~| | |t|",
".|| |||||||| |~~|4 vU|4 | | |~~~| || |||||| * |",
".|3 |t j| |~~| U| || ||||||||| ||||||||~||| |3 |U| |j|",
".| ||*|| |~~| P| |3 |t j|3 |t j|~|V| | |*|*|||",
".| | |~~| y| | ||*|| ||*||~|~| | | |V.",
".| |||||||||x||~~|||||||||x||||||||||x|| | |~~~| | |s.",
".| |Vsppssssss#~~#sppssssssV#Vspppsssss| | |~~~| | | |s.",
".||||||||x||psssssssss#~~#ssssssssss#ssssssssss| | |~~~|||||||||x||||||||||x||s.",
".#ssssppsss#ssssssssss#~~#ssssssssss#ssssssssss||||||||x|||||||||x||~~~#ssppssssssssssppsssss#s.",
".#sssssssss#ssssssssss#~~#ssssssssss#ssssssssss#sppssssssVssssppssss~~~#sssssssssssssssssssss#s.",
".###u##########u#######~~##u###############u####ssssssssssssssssssss~~~######u##########u#####s.",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
],
"palettes": [ "city_block_foundation_palette" ],
"terrain": { "G": "t_grass", "X": "t_grass" },
"nested": {
"1": {
"chunks": [
[ "city_block_2_candy_shop", 20 ],
[ "city_block_2_beauty_shop", 20 ],
[ "city_block_2_vitamin_shop", 20 ],
[ "city_block_2_cellphone_shop", 20 ],
[ "city_block_2_music_shop", 20 ],
[ "city_block_2_electronics_shop", 20 ],
[ "city_block_2_pizza_shop", 20 ]
]
},
"2": {
"chunks": [
[ "city_block_2_clothing_shop", 25 ],
[ "city_block_2_formal_clothing_shop", 25 ],
[ "city_block_2_leather_clothing_shop", 25 ],
[ "city_block_2_fur_clothing_shop", 25 ]
]
},
"3": { "chunks": [ [ "city_block_5x5_backroom_shop", 100 ] ] },
"4": { "chunks": [ [ "city_block_4x4_backroom_shop", 100 ] ] },
"5": { "chunks": [ [ "city_block_14x14_restaurant", 100 ] ] },
"6": { "chunks": [ [ "city_block_11x11_bar", 100 ] ] }
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "city_block2_flr2_1", "city_block2_flr2_2", "city_block2_flr2_3", "city_block2_flr2_4" ] ],
"weight": 250,
"object": {
"fill_ter": "t_floor",
"rows": [
"-------------|o|ooo|o||----|ooo|-,,,,,,,-|ooo|-||oo||oo||,||oo||oo||--sss||oo|||oo||------------",
"-||oo|||oo||,|4 5 |--|o|y y|o|>sss>|o| yH|o|2 R|>|R 2 |--sssoRHy 2 |ooo|||ooo|--",
"-|2 3 |>| |--|4 ||!|!|| 4 | R|!|R |-->|o|y |2 yHR|s-",
"-| |!| |--| 9 |9 | ! ! |--s! | !ss",
"-| | | |--| | | %%| |%% |--s|E | R|>s",
"-| ! ! AA|--| | | %t|||t% |---|K | R|||",
"-| y|||%%Q YJJJ|--@ DLD R%%%%|%%%%R DD | * j|j * |---|K JA %%%%%%| l|",
"-| A AA Y|Ttj%Q n@--@ DLD R%tjT|Tjt%R LL | RR%TT|TT%RR @---|n J *7 | DLD J K@",
"-|JJJJJJ Q|T * i|--| * T|T * DD | %%%%%|%%%%% |---|i JA % | DLD AJ n@",
"-|Q Q|%%%%*% KKl|--@y %%%%%%|%%%%%% y| *7 |6 * |---|K % | DLD AJ i@",
"-|lKinKK Q|1 %*%%%|--|Y *8 |1 * Y|LD % | % AL|---|% %% % |y J K@",
"-|%%%%%% R| %7 |--|Q l% | %l Q|LD % | % AL@---|Q Q% %%%%%%|%%%%%% Q|",
"-|1 * R| % |--|Q K% | %K Q|LD % | %y AL|-;;|QQQ% *8 |1 * QQQ|",
"-| %%*%| % @--|Q K% | %K Q| %%%%%|%%%%% |-;S|%%%% % | %%*%|||",
"-@ %j t| % |--|KinK% | %KinK|Q *7 |6 * Y|-;;|jYt% % | %j t|S-",
"-| % ||@|@|||@|||--||@@||||@|||||@|||||@||Q K% | %Q K|--;@ * % | % y@;-",
"-| %TTy|S;;;;----------------;;S;S;;-------@Y K% | %Q K@--;|TTy% % | %YTT|;-",
"-||@|@|||@||;;--------------------;;;;;--------|lniK% | %linK|--;|||||||||@|||||@|||||||;-",
"--------;;;;;;---------------------------------||@|||||@|||@@||||@||----------------------------",
"----------------------------------------------------;;;;;S;;;-----------------------------------",
"------------------------------------------------------------------------------------------------",
"------------------------------------------------------------------------------------------------",
"------------------------------------------------------------------------------------------------",
"------------------------------------------------------------------------------------------------"
],
"palettes": [ "city_block_foundation_palette" ],
"terrain": { "%": "t_wall_w" },
"nested": {
"1": {
"chunks": [
[ "bedroom_5x5_adult_N_1", 20 ],
[ "bedroom_5x5_adult_S_1", 20 ],
[ "bedroom_5x5_adult_W_1", 20 ],
[ "bedroom_5x5_adult_N_2", 20 ],
[ "bedroom_5x5_adult_E_2", 20 ],
[ "bedroom_5x5_adult_N_2", 20 ],
[ "bedroom_5x5_adult_N_2", 20 ],
[ "bedroom_5x5_adult_S_2", 20 ]
]
},
"2": { "chunks": [ [ "livingroom_5x5_E_1", 20 ], [ "livingroom_5x5_W_1", 20 ], [ "livingroom_5x5_E_2", 20 ] ] },
"3": { "chunks": [ [ "bonus_room_3x3_4", 20 ], [ "bonus_room_3x3_N_6", 20 ], [ "bonus_room_3x3_N_8", 20 ] ] },
"4": {
"chunks": [
[ "livingroom_5x5_E_1", 20 ],
[ "livingroom_5x5_E_2", 20 ],
[ "bonus_room_3x3_5", 20 ],
[ "bonus_room_3x3_E_5", 20 ],
[ "bonus_room_2x2_1", 20 ]
]
},
"5": {
"chunks": [
[ "bonus_room_3x3_E_5", 20 ],
[ "bonus_room_3x3_N_6", 20 ],
[ "bonus_room_3x3_S_6", 20 ],
[ "bonus_room_3x3_W_6", 20 ],
[ "bonus_room_3x3_N_8", 20 ],
[ "bonus_room_3x3_E_8", 20 ],
[ "bonus_room_3x3_E_6", 20 ]
]
},
"6": {
"chunks": [
[ "bedroom_4x4_adult_1_W", 20 ],
[ "bedroom_4x4_adult_1_S", 20 ],
[ "bedroom_4x4_adult_2_N", 20 ],
[ "bedroom_4x4_adult_2_W", 20 ],
[ "bedroom_4x4_adult_2_E", 20 ],
[ "bedroom_4x4_adult_2_S", 20 ],
[ "bedroom_4x4_adult_3_S", 20 ],
[ "bedroom_4x4_adult_3_N", 20 ],
[ "bedroom_4x4_adult_3_E", 20 ],
[ "bedroom_4x4_adult_3_W", 20 ]
]
},
"7": {
"chunks": [
[ "bedroom_4x4_adult_1_S", 20 ],
[ "bedroom_4x4_adult_3_S", 20 ],
[ "bedroom_4x4_adult_3_N", 20 ],
[ "bedroom_4x4_adult_3_E", 20 ],
[ "bedroom_4x4_adult_3_W", 20 ]
]
},
"8": {
"chunks": [
[ "bedroom_5x5_adult_N_1", 20 ],
[ "bedroom_5x5_adult_S_1", 20 ],
[ "bedroom_5x5_adult_E_1", 20 ],
[ "bedroom_5x5_adult_N_2", 20 ],
[ "bedroom_5x5_adult_S_2", 20 ],
[ "bedroom_5x5_adult_E_2", 20 ],
[ "bedroom_5x5_adult_W_2", 20 ]
]
},
"9": { "chunks": [ [ "bonus_room_3x3_S_6", 20 ], [ "bonus_room_3x3_S_8", 20 ] ] }
}
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines candy shop front & back 9x9 front, 3x3 back crates.",
"nested_mapgen_id": "city_block_2_candy_shop",
"object": {
"mapgensize": [ 15, 15 ],
"place_nested": [
{ "chunks": [ "city_block_9x9_candy_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_3x3_backroom_crates_candy" ], "x": 6, "y": 12 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines beauty shop front & back 9x9 front, 3x3 back crates.",
"nested_mapgen_id": "city_block_2_beauty_shop",
"object": {
"mapgensize": [ 15, 15 ],
"place_nested": [
{ "chunks": [ "city_block_9x9_beauty_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_3x3_backroom_crates_beauty" ], "x": 6, "y": 12 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines beauty shop front & back 9x9 front, 3x3 back crates.",
"nested_mapgen_id": "city_block_2_vitamin_shop",
"object": {
"mapgensize": [ 15, 15 ],
"place_nested": [
{ "chunks": [ "city_block_9x9_vitamin_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_3x3_backroom_crates_vitamin" ], "x": 6, "y": 12 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines cellphone shop front & back 9x9 front, 3x3 back crates.",
"nested_mapgen_id": "city_block_2_cellphone_shop",
"object": {
"mapgensize": [ 15, 15 ],
"place_nested": [
{ "chunks": [ "city_block_9x9_cellphone_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_3x3_backroom_crates_cellphone" ], "x": 6, "y": 12 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines music shop front & back 9x9 front, 3x3 back crates.",
"nested_mapgen_id": "city_block_2_music_shop",
"object": {
"mapgensize": [ 15, 15 ],
"place_nested": [
{ "chunks": [ "city_block_9x9_music_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_3x3_backroom_crates_music" ], "x": 6, "y": 12 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines electronics shop front & back 9x9 front, 3x3 back crates.",
"nested_mapgen_id": "city_block_2_electronics_shop",
"object": {
"mapgensize": [ 15, 15 ],
"place_nested": [
{ "chunks": [ "city_block_9x9_electronics_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_3x3_backroom_crates_electronics" ], "x": 6, "y": 12 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines pizza shop front & back 9x9 front, 3x3 back crates.",
"nested_mapgen_id": "city_block_2_pizza_shop",
"object": {
"mapgensize": [ 15, 15 ],
"place_nested": [
{ "chunks": [ "city_block_9x9_pizza_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_3x3_backroom_crates_pizza" ], "x": 6, "y": 12 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines general shop front & back 8x8 front, 4x4 back room.",
"nested_mapgen_id": "city_block_2_clothing_shop",
"object": {
"mapgensize": [ 12, 12 ],
"place_nested": [
{ "chunks": [ "city_block_8x8_clothing_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_4x4_backroom_clothing" ], "x": 4, "y": 8 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines formal clothing shop front & back 8x8 front, 4x4 back room.",
"nested_mapgen_id": "city_block_2_formal_clothing_shop",
"object": {
"mapgensize": [ 12, 12 ],
"place_nested": [
{ "chunks": [ "city_block_8x8_formal_clothing_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_4x4_backroom_clothing_formal" ], "x": 4, "y": 8 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines leather clothing shop front & back 8x8 front, 4x4 back room.",
"nested_mapgen_id": "city_block_2_leather_clothing_shop",
"object": {
"mapgensize": [ 12, 12 ],
"place_nested": [
{ "chunks": [ "city_block_8x8_leather_clothing_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_4x4_backroom_clothing_leather" ], "x": 4, "y": 8 }
]
}
},
{
"type": "mapgen",
"method": "json",
"//": "combines fur clothing shop front & back 8x8 front, 4x4 back room.",
"nested_mapgen_id": "city_block_2_fur_clothing_shop",
"object": {
"mapgensize": [ 12, 12 ],
"place_nested": [
{ "chunks": [ "city_block_8x8_fur_clothing_shop_front" ], "x": 0, "y": 0 },
{ "chunks": [ "city_block_4x4_backroom_clothing_fur" ], "x": 4, "y": 8 }
]
}
}
]
Loading

0 comments on commit f216867

Please sign in to comment.