Skip to content

Commit

Permalink
Merge pull request #42688 from curstwist/mainline-urb-house-18
Browse files Browse the repository at this point in the history
mainline urbdev house 18
  • Loading branch information
Rivet-the-Zombie authored Aug 4, 2020
2 parents 90e0c8b + dbb3a0a commit e36109d
Show file tree
Hide file tree
Showing 9 changed files with 242 additions and 562 deletions.
209 changes: 209 additions & 0 deletions data/json/mapgen/house/urban_18_victorian.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
[
{
"method": "json",
"om_terrain": [ [ "urban_18_1", "urban_18_2" ] ],
"type": "mapgen",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ||||| ",
" |:::| ||||| ",
" |||:::||| |...| ",
" |:::::::| |||...||| ",
" |:::::::||||||||||||UU...JJ| ",
" |:::::::::::::::::::....A.J||| ",
" |||:::::::::::::||||........Z| ",
" |::::::||||::::|<.........W| ",
" ||:||||||||::|||||.......||| ",
" |::::zz||||::|F.g|:||:||:| ",
" |:::::z::::::|...|:::::::| ",
" |:::::::::|::||+||::zz:::| ",
" |:::::::::|:::::::::z::::| ",
" |||||:::||||||||||:::::::| ",
" |:::| |:::::::| ",
" ||||| ||||||||| ",
" ",
" ",
" ",
" "
],
"palettes": [ "basement_empty" ],
"terrain": { ":": "t_dirtfloor", "z": "t_dirtfloor", "|": "t_rock_wall" },
"place_loot": [ { "item": "basket_laundry", "x": 36, "y": 9, "chance": 75 } ]
}
},
{
"method": "json",
"om_terrain": [ [ "urban_18_3", "urban_18_4" ] ],
"type": "mapgen",
"weight": 250,
"object": {
"fill_ter": "t_floor",
"rows": [
"......................p``.......................",
".$$$$$$$$$$$$$$$$$$$$$$``$$$$$$$$$$$$$$$$$$$$$$.",
".$....................$``$....................$.",
".$....[....!!!!!!!.....``.....................$.",
".$.........!##o##!.....``.....!!!!!!!.........$.",
".$.........!oyxyo!!....``.....!#o#o#!....[....$.",
".$........### ###''''''''''!!oiiio!.........$.",
".$........# hhh #''''''''''### ###........$.",
".$........o hfffh ##o##**##o## #........$.",
".$........# hhh + THHHH #o#......$.",
".$........### |+| L||||E llH ro%.....$.",
".$..........# |U|''' <|>+ hro%.....$.",
".$..........#|+||||#a#| ||||| #o#%.....$.",
".$.....[....#3,J74|###| |B,t|RRxxxRR#........$.",
".$.....%%%..o5,,,,,,,,+ |B,S||||||||#..[.....$.",
".$....`````!on,,,,||+|| ||+||y s@@sT#........$.",
".$......%%`!#12OF,|6,6| + @@ o........$.",
".$.......!`!#####,||####o#*###E o........$.",
".$.......!`!!!!`*,,<#''''''''#R Dbd y#.....[..$.",
".$..[....!``````#####''''''''##o###o##........$.",
".$........[....`````^```......................$.",
".$............................................$.",
".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
"................................................"
],
"palettes": [
"standard_domestic_palette",
"standard_domestic_lino_kitchen",
"standard_domestic_lino_bathroom",
"standard_domestic_landscaping_palette"
],
"terrain": { "#": "t_rock_wall", "$": "t_drystone_wall_half", "'": "t_thconc_floor", ",": "t_linoleum_gray" },
"furniture": { "0": "f_counter" },
"place_nested": [ { "chunks": [ [ "greenhouse_6x6_herbal", 100 ] ], "x": 3, "y": 15 } ],
"place_loot": [
{ "item": "television", "x": 33, "y": 13, "chance": 100 },
{ "item": "stereo", "x": 34, "y": 13, "chance": 50 },
{ "item": "hose", "x": 12, "y": 18, "chance": 100 },
{ "item": "lawnmower", "x": 38, "y": 18, "chance": 75 }
]
}
},
{
"method": "json",
"om_terrain": [ [ "urban_18_5", "urban_18_6" ] ],
"type": "mapgen",
"object": {
"fill_ter": "t_floor",
"rows": [
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~##o##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~oIrIo~~~~~~~~~~~~~~#o#o#~~~~~~~~~~~~",
"~~~~~~~~~~###IhI###&&&&&&&&&&~~oHHHo~~~~~~~~~~~~",
"~~~~~~~~~~#PP H#&&&&&&&&&&### l ###~~~~~~~~~~",
"~~~~~~~~~~o H##o######o##Dy dT#~~~~~~~~~~",
"~~~~~~~~~~#TE c ii c | #o#~~~~~~~~",
"~~~~~~~~~~###|+||+| + hIo~~~~~~~~",
"~~~~~~~~~~~~oS,t|U|### |> <| @@ Io~~~~~~~~",
"~~~~~~~~~~~~#||||||#a# ||||| s@@s #o#~~~~~~~~",
"~~~~~~~~~~~~#RRyTRR#'#|++|MMM||||||||#~~~~~~~~~~",
"~~~~~~~~~~~~o H |ÆsØ #~~~~~~~~~~",
"~~~~~~~~~~~~o h H ee #~~~~~~~~~~",
"~~~)))))~~~~# rr EsE TRRRR|0A ee o~~~~~~~~~~",
"~~~)))))~~~~#####|+|##o#######0AA ee o~~~~~~~~~~",
"~~~)))))~~~~~~~~#< >#&&&&^&&&#000 #~~~~~~~~~~",
"~~~)))))~~~~~~~~##o##_:______##o###o##~~~~~~~~~~",
"~~~)))))~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_kitchen", "standard_domestic_lino_bathroom" ],
"terrain": {
"~": "t_open_air",
"'": "t_thconc_floor",
",": "t_linoleum_gray",
"&": "t_shingle_flat_roof",
":": "t_gutter_drop",
"_": "t_gutter_south",
"#": "t_rock_wall",
")": "t_glass_roof"
},
"furniture": { "0": "f_counter" },
"place_loot": [ { "item": "stereo", "x": 30, "y": 18, "chance": 50 } ]
}
},
{
"method": "json",
"om_terrain": [ [ "urban_18_7", "urban_18_8" ] ],
"type": "mapgen",
"object": {
"fill_ter": "t_floor",
"rows": [
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~##o##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~oHHHo~~~~~~~~~~~~~~#o#o#~~~~~~~~~~~~",
"~~~~~~~~~~### ###~~~~~~~~~~~~oHHHo~~~~~~~~~~~~",
"~~~~~~~~~~#H x#~~~~~~~~~~### ###~~~~~~~~~~",
"~~~~~~~~~~oH x#####o###o##Db yd#~~~~~~~~~~",
"~~~~~~~~~~#H |D|8S8| | #o#~~~~~~~~",
"~~~~~~~~~~### + +,,,| + Io~~~~~~~~",
"~~~~~~~~~~~~#s y###,,t| |>| @@ hIo~~~~~~~~",
"~~~~~~~~~~~~#@@ 'a#BBB| |||Ts@@s #o#~~~~~~~~",
"~~~~~~~~~~~~#@@ y###|||| ||||||||#~~~~~~~~~~",
"~~~~~~~~~~~~#s c|T + s@@s #~~~~~~~~~~",
"~~~~~~~~~~~~o || ||+|| @@ #~~~~~~~~~~",
"~~~~~~~~~~~~#dbd + yY|S,t|E o~~~~~~~~~~",
"~~~~~~~~~~~~#####||+##o####o## o~~~~~~~~~~",
"~~~~~~~~~~~~~~~~#> #~~~^~~~~#D ≠c≠ d#~~~~~~~~~~",
"~~~~~~~~~~~~~~~~##o##~~~~~~~~##o###o##~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_kitchen", "standard_domestic_lino_bathroom" ],
"terrain": { "~": "t_open_air", ",": "t_linoleum_gray", "'": "t_thconc_floor", "#": "t_rock_wall" },
"place_loot": [ { "item": "television", "x": 17, "y": 8, "chance": 100 } ]
}
},
{
"method": "json",
"om_terrain": [ [ "urban_18_9", "urban_18_10" ] ],
"type": "mapgen",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" |2223 ",
" |...3 |2223 ",
" |2|...323 |...3 ",
" |.......3 |2|...323 ",
" |.......32222222222|.......3 ",
" |..........................323 ",
" |--....=.....................3 ",
" |..........................3 ",
" |................&.......3-3 ",
" |...........~............3 ",
" |........................3 ",
" |....N...................3 ",
" |........................3 ",
" |---|...----5----|.......3 ",
" |...3 |.......3 ",
" |---3 |-------3 ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen_palettes/house_general_palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
{ "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] },
{ "item": "bed", "chance": 30, "repeat": [ 1, 2 ] }
],
"R": [ { "item": "homebooks", "chance": 30, "repeat": [ 1, 4 ] }, { "item": "games", "chance": 30, "repeat": [ 1, 2 ] } ],
"R": [ { "item": "homebooks", "chance": 40, "repeat": [ 1, 4 ] }, { "item": "games", "chance": 20, "repeat": [ 1, 2 ] } ],
"S": [ { "item": "SUS_bathroom_sink", "chance": 80 }, { "item": "SUS_bathroom_medicine", "chance": 60 } ],
"U": [
{ "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] },
Expand Down
18 changes: 18 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,24 @@
"locations": [ "land" ],
"flags": [ "CLASSIC" ]
},
{
"type": "city_building",
"id": "urban_18_victorian",
"overmaps": [
{ "point": [ 0, 0, -1 ], "overmap": "urban_18_1_north" },
{ "point": [ 1, 0, -1 ], "overmap": "urban_18_2_north" },
{ "point": [ 0, 0, 0 ], "overmap": "urban_18_3_north" },
{ "point": [ 1, 0, 0 ], "overmap": "urban_18_4_north" },
{ "point": [ 0, 0, 1 ], "overmap": "urban_18_5_north" },
{ "point": [ 1, 0, 1 ], "overmap": "urban_18_6_north" },
{ "point": [ 0, 0, 2 ], "overmap": "urban_18_7_north" },
{ "point": [ 1, 0, 2 ], "overmap": "urban_18_8_north" },
{ "point": [ 0, 0, 3 ], "overmap": "urban_18_9_north" },
{ "point": [ 1, 0, 3 ], "overmap": "urban_18_10_north" }
],
"locations": [ "land" ],
"flags": [ "CLASSIC" ]
},
{
"type": "city_building",
"id": "urban_29_dense_row",
Expand Down
16 changes: 13 additions & 3 deletions data/json/overmap/overmap_terrain/overmap_terrain_residential.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@
"urban_16_1",
"urban_16_2",
"urban_17_1",
"urban_17_2"
"urban_17_2",
"urban_18_3",
"urban_18_4"
],
"copy-from": "generic_city_house",
"see_cost": 10
Expand Down Expand Up @@ -251,7 +253,13 @@
"urban_16_3",
"urban_16_4",
"urban_17_3",
"urban_17_4"
"urban_17_4",
"urban_18_5",
"urban_18_6",
"urban_18_7",
"urban_18_8",
"urban_18_9",
"urban_18_10"
],
"copy-from": "generic_city_house_no_sidewalk",
"see_cost": 10
Expand Down Expand Up @@ -461,7 +469,9 @@
"urban_29_1",
"urban_29_2",
"urban_10_7",
"urban_10_8"
"urban_10_8",
"urban_18_1",
"urban_18_2"
],
"copy-from": "generic_city_house_basement"
},
Expand Down
1 change: 1 addition & 0 deletions data/json/regional_map_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@
"urban_15_house": 50,
"urban_16_house_ranch": 50,
"urban_17_house_ranch": 50,
"urban_18_victorian": 50,
"emptyresidentiallot": 20,
"house_vacant": 20,
"house_vacant2": 20,
Expand Down
Loading

0 comments on commit e36109d

Please sign in to comment.