Skip to content

Commit

Permalink
feat(content): 2storymodern05 house (#4080)
Browse files Browse the repository at this point in the history 
* 2storymodern05

add 2storymodern05

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
@LilShiningMan @autofix-ci
LilShiningMan and autofix-ci[bot] authored Jan 9, 2024
1 parent 3a24ce9 commit 75dd83f
Show file tree
Hide file tree
Showing 4 changed files with 230 additions and 1 deletion.
213 changes: 213 additions & 0 deletions data/json/mapgen/house/2storymodern05.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
[
{
"type": "mapgen",
"om_terrain": "2StoryModern05_basement",
"method": "json",
"object": {
"palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
"fill_ter": "t_floor_waxed",
"rows": [
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^^^^^^#####||||||||^^^^^",
"^^^^^^#qqq~|z |^^^^^",
"^^^^^^#~~~~|z |^^^^^",
"^^^^^^#]~~~|z zz|^^^^^",
"^^^^^^#~~~~| zz|^^^^^",
"^^^^^^|||+||||+||||^^^^^",
"^^^^^^|RR |^^^^^",
"^^^^^^| eee |^^^^^",
"^^^^^^|T s eee |^^^^^",
"^^^^^^|x l H |^^^^^",
"^^^^^^|x l H A A|^^^^^",
"^^^^^^|x l H ||||^^^^^",
"^^^^^^| +_S|^^^^^",
"^^^^^^|Ø |_t|^^^^^",
"^^^^^^| r||+||||^^^^^",
"^^^^^^|R hr|b T D|^^^^^",
"^^^^^^|R r|r |^^^^^",
"^^^^^^| |rh |^^^^^",
"^^^^^^| ||++| @|^^^^^",
"^^^^^^|<|vUU|dd ¤@|^^^^^",
"^^^^^^|||||||||||||^^^^^",
"^^^^^^^^^^^^^^^^^^^^^^^^"
],
"terrain": {
"t": "t_linoleum_gray",
"S": "t_linoleum_gray",
"#": "t_concrete_wall",
"_": "t_linoleum_gray",
"]": "t_concrete",
"q": "t_concrete",
"~": "t_concrete"
},
"furniture": {
"]": "f_home_furnace",
"ꕢ": "f_table",
"$": "f_clothing_rail",
"=": [ "f_indoor_plant", "f_indoor_plant_y" ],
"?": [ "f_indoor_plant", "f_indoor_plant_y" ]
},
"items": { },
"place_loot": [ { "item": "television", "x": 7, "y": 12 }, { "item": "laptop", "x": 11, "y": 17 } ]
}
},
{
"type": "mapgen",
"om_terrain": "2StoryModern05_1",
"weight": 250,
"method": "json",
"object": {
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
"fill_ter": "t_floor_waxed",
"rows": [
".----...................",
"..----.....%%.....[.....",
"...----p#::##:::##.....[",
"....----:`=#6 O#......",
".X...---/`L#6 J 5:......",
"......###``#2 J J:......",
"......:ꕢ #1 J F#%.....",
"......:ꕢ 3####%..",
"..[...#### ####q~#...",
"......%#V RRR#q~/...",
"......%#V h R#UU#%..",
"......%#V hff R####...",
".##:::### ffh :---.G.",
".#s,E,#a# hff /---.K.",
".:H,,,,,, ffh y:---G..",
".:H,l,,x, h V######..",
".:H,l,,x, V#Qw_Z#..",
".:H,,,,,, +___W#^.",
".#THHH?,, ######..",
".##:::#<# R#R #8888#..",
"......### R#R +___S#..",
"......#>+ y#yꕢy#BB_t#..",
".[....#####:##:#######..",
"........^..............."
],
"terrain": {
"#": "t_concrete_wall",
"_": "t_linoleum_gray",
"q": "t_concrete",
"U": "t_concrete",
"`": "t_carpet_red",
"/": "t_door_metal_pickable",
"~": "t_concrete",
"Q": "t_linoleum_gray",
"W": "t_linoleum_gray",
"Z": "t_linoleum_gray",
"G": "t_region_groundcover_urban",
"K": "t_region_groundcover_urban",
"=": "t_carpet_red",
"L": "t_carpet_red",
",": "t_carpet_purple",
"?": "t_carpet_purple",
"E": "t_carpet_purple",
"H": "t_carpet_purple",
"s": "t_carpet_purple",
"T": "t_carpet_purple",
"l": "t_carpet_purple",
"x": "t_carpet_purple"
},
"furniture": { "ꕢ": "f_table", "=": [ "f_indoor_plant", "f_indoor_plant_y" ], "?": [ "f_indoor_plant", "f_indoor_plant_y" ] },
"items": { "ꕢ": { "item": "table_foyer", "chance": 50 } },
"place_loot": [ { "item": "television", "x": 7, "y": 16 } ]
}
},
{
"type": "mapgen",
"om_terrain": "2StoryModern05_2",
"weight": 250,
"method": "json",
"object": {
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom" ],
"fill_ter": "t_floor_waxed",
"rows": [
"........................",
"........................",
"......ШШШШШШШШШШШШШ.....",
"......Ш✲ὨὨὨ▒▒▒▒▒▒▒Ш.....",
"......Ш✲▒▒▒▒▒▒▒▒▒?Ш.....",
"......Ш✲▒▒▒▒▒▒▒▒▒KШ.....",
"......Ш✲▒?▒?▒▒▒▒▒?Ш.....",
".....#####:::¶::#####...",
".....#z+ y:...",
".....### ꕢ:...",
".....#U+ {{{{{{{##+##...",
".....#q+ {¯¯¯¯¯¯#R ###..",
".##::### {¯¯¯¯¯¯#R r:..",
".#y D# {¯¯¯¯¯¯#R hr:..",
".:¤ d# {¯¯¯¯¯¯#P r:..",
".:@@ d# {############..",
".:@@ ## ꕢ#8S#wQ#¤@@¤#^.",
".:¤ + #8_#++# @@ #..",
".#yddy### #_____#d :..",
".##:::#> #t_8BB#D :..",
"......# ##+####y h#..",
"......#VV + rr#..",
"......#####:##:###::##..",
".........^.............."
],
"terrain": {
"¯": "t_open_air_rooved",
".": "t_open_air",
"#": "t_concrete_wall",
"_": "t_linoleum_gray",
"Q": "t_linoleum_gray",
"w": "t_linoleum_gray",
"✲": "t_floor_noroof",
"Ὠ": "t_floor_noroof",
"?": "t_floor_noroof",
"K": "t_floor_noroof",
"▒": "t_floor_noroof",
"{": "t_railing_v",
"Ш": "t_glass_railing"
},
"furniture": { "ꕢ": "f_table", "?": "f_deckchair" },
"items": { "ꕢ": { "item": "table_foyer", "chance": 50 } },
"place_loot": [ { "item": "laptop", "x": 20, "y": 13 } ],
"sealed_item": {
"✲": { "item": { "item": "seed_tomato" }, "furniture": "f_planter_seedling", "chance": 100 },
"Ὠ": { "item": { "item": "seed_cucumber" }, "furniture": "f_planter_seedling", "chance": 100 }
}
}
},
{
"type": "mapgen",
"om_terrain": "2StoryModern05_roof",
"weight": 250,
"method": "json",
"object": {
"palettes": [ "roof_palette" ],
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ---------------- ",
" -........=.....- ",
" -..............- ",
" -..............- ",
" -..............-- ",
" -----...............- ",
" -.....~.....A.......- ",
" -...................- ",
" -...................- ",
" -...................5 ",
" -.......X...........- ",
" -.............&.....- ",
" ------..............- ",
" -..............- ",
" -..............- ",
" ---5------------ ",
" "
],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
11 changes: 11 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,17 @@
{ "point": [ 1, 0, 2 ], "overmap": "2StoryModern04_roof_2_north" }
]
},
{
"type": "city_building",
"id": "2StoryModern05",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, -1 ], "overmap": "2StoryModern05_basement_north" },
{ "point": [ 0, 0, 0 ], "overmap": "2StoryModern05_1_north" },
{ "point": [ 0, 0, 1 ], "overmap": "2StoryModern05_2_north" },
{ "point": [ 0, 0, 2 ], "overmap": "2StoryModern05_roof_north" }
]
},
{
"type": "city_building",
"id": "bungalow01",
Expand Down
4 changes: 4 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain_residential.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
"2StoryModern04_1_2",
"2StoryModern04_2_1",
"2StoryModern04_2_2",
"2StoryModern05_1",
"2StoryModern05_2",
"bungalow01_1",
"bungalow02_1",
"bungalow03",
Expand Down Expand Up @@ -271,6 +273,7 @@
"2StoryModern03_roof",
"2StoryModern04_roof_1",
"2StoryModern04_roof_2",
"2StoryModern05_roof",
"bungalow01_roof",
"bungalow02_roof",
"bungalow03_roof",
Expand Down Expand Up @@ -400,6 +403,7 @@
"2StoryModern03_basement",
"2StoryModern04_basement_1",
"2StoryModern04_basement_2",
"2StoryModern05_basement",
"basement_bionic",
"basement_bionic_decoy",
"basement_chem",
Expand Down
3 changes: 2 additions & 1 deletion data/json/regional_map_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,11 @@
"houses": {
"2Story01": 50,
"2Story02": 50,
"2storyModern01": 5,
"2storyModern01": 50,
"2storyModern02": 50,
"2StoryModern03": 50,
"2StoryModern04": 50,
"2StoryModern05": 50,
"bungalow01": 50,
"bungalow02": 50,
"bungalow03": 50,
Expand Down

0 comments on commit 75dd83f

Please sign in to comment.