From 1bcbe3b469458878982ed78ed53271bd41c8a24c Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Mon, 3 Aug 2020 19:31:41 -0400 Subject: [PATCH 1/3] mainline urbdev house 18 --- .../json/mapgen/house/urban_18_victorian.json | 208 +++++++++ .../house_general_palette.json | 2 +- .../overmap/multitile_city_buildings.json | 18 + .../overmap_terrain_residential.json | 16 +- data/json/regional_map_settings.json | 1 + .../building_jsons/urban_18_victorian.json | 439 ------------------ .../Urban_Development/overmap_specials.json | 18 - .../Urban_Development/overmap_terrain.json | 100 ---- .../Urban_Development/regional_overlay.json | 1 - 9 files changed, 241 insertions(+), 562 deletions(-) create mode 100644 data/json/mapgen/house/urban_18_victorian.json delete mode 100644 data/mods/Urban_Development/building_jsons/urban_18_victorian.json diff --git a/data/json/mapgen/house/urban_18_victorian.json b/data/json/mapgen/house/urban_18_victorian.json new file mode 100644 index 0000000000000..c5e87c3b4ac4b --- /dev/null +++ b/data/json/mapgen/house/urban_18_victorian.json @@ -0,0 +1,208 @@ +[ + { + "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~~~~~~~~~~", + "~~~)))))~~~~~~~~#< >#&&&&^&&� #~~~~~~~~~~", + "~~~)))))~~~~~~~~##o##_:______##o###o##~~~~~~~~~~", + "~~~)))))~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ], + "palettes": [ "standard_domestic_palette", "standard_domestic_lino_kitchen", "standard_domestic_lino_bathroom" ], + "terrain": { + "~": "t_open_air", + ",": "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_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" } + } + } +] diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json index b95f09910b173..6b9c170336600 100644 --- a/data/json/mapgen_palettes/house_general_palette.json +++ b/data/json/mapgen_palettes/house_general_palette.json @@ -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 ] }, diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 15f579ef60dbc..fb18ffba2b3f7 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -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", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index 446a0052bc0e3..aecc84ad6b018 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -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 @@ -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 @@ -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" }, diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index d55182078d1af..d54a1a01ddf05 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -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, diff --git a/data/mods/Urban_Development/building_jsons/urban_18_victorian.json b/data/mods/Urban_Development/building_jsons/urban_18_victorian.json deleted file mode 100644 index 3c885e07111d0..0000000000000 --- a/data/mods/Urban_Development/building_jsons/urban_18_victorian.json +++ /dev/null @@ -1,439 +0,0 @@ -[ - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_1" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%iiiii%%%", - "%%%%%%%%%%%%%%%%i:::i%%%", - "%%%%%%%%%%%%iiiii:::iiii", - "%%%%%%%%%%%%i:::::::::i:", - "%%%%%%%%%%%%i:::::::::i:", - "%%%%%%%%%%%%i:::::Z:::::", - "%%%%%%%%%%%%i::::ZZiiii:", - "%%%%%%%%%%%%ii:iiiiiiii:", - "%%%%%%%%%%%%i::::::iiii:", - "%%%%%%%%%%iii:::::::::::", - "%%%%%%%%%%i:::::::::::::", - "%%%%%%%%%%i:::::::iiiiii", - "%%%%%%%%%%i:::::::i%%%%%", - "%%%%%%%%%%iii:::iii%%%%%", - "%%%%%%%%%%%%i:::i%%%%%%%", - "%%%%%%%%%%%%iiiii%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%" - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "items": { ":": { "item": "home_hw", "chance": 2 } }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 13, 19 ], "y": [ 7, 14 ], "density": 0.03 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_2" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%iiiiiiiii%%%%%%%%%%", - "%%%%%i:::::::i%%%%%%%%%%", - "iiiiii:::::::i%%%%%%%%%%", - "::::::::Z::::i%%%%%%%%%%", - ":ii+ii::ZZ:::i%%%%%%%%%%", - ":iL ri:::::::i%%%%%%%%%%", - ":iL ri:ii:ii:i%%%%%%%%%%", - ":iiiii'''''''iii%%%%%%%%", - ":::i>'''''''''Wi%%%%%%%%", - "::iiii''''''''Di%%%%%%%%", - "::::::''''''ciii%%%%%%%%", - "iiiiiirr'''cci%%%%%%%%%%", - "%%%%%iii'''iii%%%%%%%%%%", - "%%%%%%%i'''i%%%%%%%%%%%%", - "%%%%%%%iiiii%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%", - "%%%%%%%%%%%%%%%%%%%%%%%%" - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "items": { - ":": { "item": "home_hw", "chance": 2 }, - "D": { "item": "allclothes", "chance": 60 }, - "L": { "item": "homeguns", "chance": 25 }, - "W": { "item": "allclothes", "chance": 60 }, - "c": { "item": "cleaning", "chance": 60 }, - "r": { "item": "electronics", "chance": 60 } - }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 12 ], "y": [ 7, 14 ], "density": 0.02 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_3" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",iinnninnnninnnninnnninn", - ",i,,,,,,,,,,,,,,,,,,,,,,", - ",N,,,,,,,,^,,,,;;;;;;;,,", - ",N,,^,,,,,,,,,,;|---|'''", - ",N,,,,,,,,,,,,,;!22>|'''", - ",i,,,,,,,,,,|---|2|-|-|-", - ",N,,,,,,,,,,|CCof2|u u| ", - ",N,,,,,,,,,,wS2222|-+-| ", - ",N,,,,,,,,,,wS22222222+ ", - ",i,,,,,^,,,,|C2222|IiI| ", - ",N,,,,,,,,,,|-+-|-|IFI| ", - ",N,,,,,,,,,,| |r|''' ", - ",i,,,,,,,,|-| h |+| ", - ",N,,,,,,,,| t ", - ",N,,,,,,,,w httth |-w--1", - ",N,,,,,,,,| t |'''''", - ",i,,,,,,,,|-| h |-|'''''", - ",N,,,,,,,,,,w w,,,,,,;", - ",N,,,,,,,,,,|-w-|,,,,,,;", - ",N,,,,^,,,,,,,,,,,,,,,,;", - ",i,,,,,,,,,,,,,,,,,,,,i;", - ",iinnninnnninnnninnnnii;", - ",,,,,,,,,,,,,,,,,,,,,,,;" - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "items": { - " ": { "item": "livingroom", "chance": 2 }, - "C": { "item": "kitchen", "chance": 25 }, - "f": { "item": "fridge", "chance": 70 }, - "o": { "item": "oven", "chance": 30 }, - "r": { "item": "jackets", "chance": 60 }, - "t": { "item": "dining", "chance": 25 }, - "u": { "item": "cannedfood", "chance": 50 } - }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.15 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_4" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - "nninnnninnnninnnninnnii,", - ",,,,,,,,,,,,,,,,,,,,,,i,", - ",,,,,,,,,,,,,,,,,,,,,,N,", - "''''q|-w---w-|,,,,,,,,N,", - "''''q| |,,,,,^,,N,", - "w-1--| bbb w,,,,,,,,i,", - " + bbb w,,,,,,,,N,", - " |-+-| ebbbe |,,,,,,,,N,", - " |B2S|-------|,,^,,,,,N,", - " |B2T|O ccc |,,,,,,,,i,", - " |-|-| |w|,,,,,,N,", - " >|<+ t cw,,,,,,N,", - " -|-| @ cw,,,,,,i,", - " + @@@@ |w|,,,,,,N,", - "1--w-| |,,,,,,,,N,", - "'''''|-| |-|,,,,,,,,N,", - "''''',,wcccw,,,,,,,,,,i,", - ";,,,,,,|w-w|,,,,,^,,,,N,", - ";,,,,,,,,,,,,,,,,,,,,,N,", - ";,,,,,,,,,,,,,,,,,,,,,N,", - ";i,,,,,,,,,,,,,,,,,,,,i,", - ";iinnnninnnninnnninnnii,", - ";,,,,,,,,,,,,,,,,,,,,,,," - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "toilets": { "T": { } }, - "items": { - " ": { "item": "livingroom", "chance": 2 }, - "2": { "item": "softdrugs", "chance": 10 }, - "@": { "item": "magazines", "chance": 10 }, - "O": { "item": "homebooks", "chance": 60 }, - "b": { "item": "bed", "chance": 60 }, - "c": { "item": "livingroom", "chance": 25 }, - "e": { "item": "dresser", "chance": 60 }, - "t": { "item": "coffee_table", "chance": 25 } - }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.15 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_5" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........................", - "........................", - "........................", - "........................", - "................|-w-|RRR", - "................|> <|RRR", - "............|---|-+-|-w-", - "............|OOOO u", - "............w AtA ", - "............w ", - "............|OOOO OI'I-+", - "............|---|+|IFI ", - "............wS2T|r|IiI ", - "..........|-|-+-|-| ", - "..........|OO ", - "..........w |-w---", - "..........| |RRRRR", - "..........|-|dhd|-|RRRRR", - "............wd6dw.......", - "............|-w-|.......", - "........................", - "........................", - "........................", - "........................" - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "toilets": { "T": { } }, - "items": { - " ": { "item": "livingroom", "chance": 2 }, - "2": { "item": "softdrugs", "chance": 10 }, - "@": { "item": "magazines", "chance": 10 }, - "A": { "item": "livingroom", "chance": 15 }, - "O": { "item": "homebooks", "chance": 60 }, - "d": { "item": "office", "chance": 40 }, - "r": { "item": "alcohol", "chance": 80 }, - "t": { "item": "coffee_table", "chance": 25 } - }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 13, 22 ], "y": [ 7, 14 ], "density": 0.09 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_6" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........................", - "........................", - "........................", - "........................", - "RRRRR|-w---w-|..........", - "RRRRR|O |..........", - "-----|O ppp w..........", - "OOOOO|O ppp w..........", - " ppp |..........", - " | |..........", - "+|OOO|-------|..........", - " |---| ebbbe |w|........", - " |< >| bbb cw........", - " + bbb cw........", - " | |w|........", - "---w-| ee|..........", - "RRRRR|-| |-|..........", - "RRRRR..wcccw............", - ".......|w-w|............", - "........................", - "........................", - "........................", - "........................", - "........................" - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "items": { - " ": { "item": "livingroom", "chance": 2 }, - "O": { "item": "homebooks", "chance": 60 }, - "b": { "item": "bed", "chance": 60 }, - "c": { "item": "livingroom", "chance": 25 }, - "e": { "item": "dresser", "chance": 60 }, - "p": { "item": "pool_table", "chance": 35 } - }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 12 ], "y": [ 7, 14 ], "density": 0.09 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_7" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........................", - "........................", - "........................", - "........................", - "................|-w-|...", - "................|< |...", - "............|---|-|+|-w-", - "............|OuO | O", - "............w + ", - "............|e | ", - "............|bbb iiiI--", - "............|bbb ''FIBB", - "............|bbb iiiI22", - "..........|-|e + +22", - "..........|@ O|rr|CS", - "..........w@ t O|--|-w", - "..........|@ O|.....", - "..........|-| |-|.....", - "............w@@@w.......", - "............|-w-|.......", - "........................", - "........................", - "........................", - "........................" - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "items": { - " ": { "item": "livingroom", "chance": 2 }, - "2": { "item": "softdrugs", "chance": 10 }, - "@": { "item": "magazines", "chance": 10 }, - "C": { "item": "cleaning", "chance": 40 }, - "O": { "item": "homebooks", "chance": 60 }, - "b": { "item": "bed", "chance": 60 }, - "e": { "item": "dresser", "chance": 60 }, - "r": { "item": "bedroom", "chance": 60 }, - "t": { "item": "coffee_table", "chance": 25 }, - "u": { "item": "alcohol", "chance": 70 } - }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 13, 22 ], "y": [ 7, 14 ], "density": 0.09 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_8" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........................", - "........................", - "........................", - "........................", - ".....|-w---w-|..........", - ".....| e|..........", - "-|-w-| ew..........", - "O|S2T| bbb w..........", - " |-+-| bbb |..........", - " + ebbbe |..........", - "-| |-------|..........", - "B| |-| ebbbe |w|........", - "T| |<| bbb cw........", - "2| + bbb cw........", - "C| | |w|........", - "-|-w-| ee|..........", - ".....|-| |-|..........", - ".......wcccw............", - ".......|w-w|............", - "........................", - "........................", - "........................", - "........................", - "........................" - ], - "palettes": [ "acidia_residential_commercial_palette" ], - "toilets": { "T": { } }, - "items": { - " ": { "item": "livingroom", "chance": 2 }, - "2": { "item": "softdrugs", "chance": 10 }, - "O": { "item": "homebooks", "chance": 60 }, - "b": { "item": "bed", "chance": 60 }, - "c": { "item": "livingroom", "chance": 40 }, - "e": { "item": "dresser", "chance": 60 } - }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 12 ], "y": [ 7, 14 ], "density": 0.09 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_9" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........................", - "........................", - "........................", - "........................", - "................RRRRR...", - "................RRRRR...", - "............RRRRRRRRRRRR", - "............RRRRRRRRRRRR", - "............RRRRRRRRRRRR", - "............RRRRRRRRRRRR", - "............RRRRRRRRRRRR", - "............RRRRRRRRRRRR", - "............RRRRRRRRRRRR", - "..........RRRRRRRRRRRRRR", - "..........RRRRRRRRRRRRRR", - "..........RRRRRRRRRRRRRR", - "..........RRRRRRRRR.....", - "..........RRRRRRRRR.....", - "............RRRRR.......", - "............RRRRR.......", - "........................", - "........................", - "........................", - "........................" - ], - "palettes": [ "acidia_residential_commercial_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "urban_18_10" ], - "weight": 250, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........................", - "........................", - "........................", - "........................", - ".....RRRRRRRRR..........", - ".....RRRRRRRRR..........", - "RRRRRRRRRRRRRR..........", - "RRRRRRRRRRRRRR..........", - "RRRRRRRRRRRRRR..........", - "RRRRRRRRRRRRRR..........", - "RRRRRRRRRRRRRR..........", - "RRRRRRRRRRRRRRRR........", - "RRRRRRRRRRRRRRRR........", - "RRRRRRRRRRRRRRRR........", - "RRRRRRRRRRRRRRRR........", - "RRRRRRRRRRRRRR..........", - ".....RRRRRRRRR..........", - ".......RRRRR............", - ".......RRRRR............", - "........................", - "........................", - "........................", - "........................", - "........................" - ], - "palettes": [ "acidia_residential_commercial_palette" ] - } - } -] diff --git a/data/mods/Urban_Development/overmap_specials.json b/data/mods/Urban_Development/overmap_specials.json index b77f87d659244..3c2ed16714fde 100644 --- a/data/mods/Urban_Development/overmap_specials.json +++ b/data/mods/Urban_Development/overmap_specials.json @@ -1,22 +1,4 @@ [ - { - "type": "city_building", - "id": "urban_18_victorian", - "overmaps": [ - { "point": [ 1, 0, -1 ], "overmap": "urban_18_1_south" }, - { "point": [ 0, 0, -1 ], "overmap": "urban_18_2_south" }, - { "point": [ 1, 0, 0 ], "overmap": "urban_18_3_south" }, - { "point": [ 0, 0, 0 ], "overmap": "urban_18_4_south" }, - { "point": [ 1, 0, 1 ], "overmap": "urban_18_5_south" }, - { "point": [ 0, 0, 1 ], "overmap": "urban_18_6_south" }, - { "point": [ 1, 0, 2 ], "overmap": "urban_18_7_south" }, - { "point": [ 0, 0, 2 ], "overmap": "urban_18_8_south" }, - { "point": [ 1, 0, 3 ], "overmap": "urban_18_9_south" }, - { "point": [ 0, 0, 3 ], "overmap": "urban_18_10_south" } - ], - "locations": [ "land" ], - "flags": [ "CLASSIC" ] - }, { "type": "city_building", "id": "urban_19_victorian", diff --git a/data/mods/Urban_Development/overmap_terrain.json b/data/mods/Urban_Development/overmap_terrain.json index 97e48f42db390..d43e440bbf1dd 100644 --- a/data/mods/Urban_Development/overmap_terrain.json +++ b/data/mods/Urban_Development/overmap_terrain.json @@ -1,104 +1,4 @@ [ - { - "id": "urban_18_1", - "type": "overmap_terrain", - "name": "basement", - "sym": "O", - "color": "dark_gray", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_2", - "type": "overmap_terrain", - "name": "basement", - "sym": "O", - "color": "dark_gray", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_3", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_4", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_5", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_6", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_7", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_8", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_9", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, - { - "id": "urban_18_10", - "type": "overmap_terrain", - "name": "house", - "sym": "v", - "color": "light_green", - "see_cost": 10, - "mondensity": 2, - "flags": [ "SIDEWALK" ] - }, { "id": "urban_19_1", "type": "overmap_terrain", diff --git a/data/mods/Urban_Development/regional_overlay.json b/data/mods/Urban_Development/regional_overlay.json index c82c3d696668b..d637af469c345 100644 --- a/data/mods/Urban_Development/regional_overlay.json +++ b/data/mods/Urban_Development/regional_overlay.json @@ -4,7 +4,6 @@ "regions": [ "all" ], "city": { "houses": { - "urban_18_victorian": 30, "urban_19_victorian": 30, "urban_20_duplex": 30, "urban_21_house": 30, From d81029f018a9b8eb5744006980ae60094e4f44b6 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Mon, 3 Aug 2020 19:35:06 -0400 Subject: [PATCH 2/3] Update urban_18_victorian.json --- data/json/mapgen/house/urban_18_victorian.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/house/urban_18_victorian.json b/data/json/mapgen/house/urban_18_victorian.json index c5e87c3b4ac4b..a374d330be965 100644 --- a/data/json/mapgen/house/urban_18_victorian.json +++ b/data/json/mapgen/house/urban_18_victorian.json @@ -54,7 +54,7 @@ ".$........# hhh #''''''''''### ###........$.", ".$........o hfffh ##o##**##o## #........$.", ".$........# hhh + THHHH #o#......$.", - ".$........### |+| L||||E llH ro%.....#.", + ".$........### |+| L||||E llH ro%.....$.", ".$..........# |U|''' <|>+ hro%.....$.", ".$..........#|+||||#a#| ||||| #o#%.....$.", ".$.....[....#3,J74|###| |B,t|RRxxxRR#........$.", From dbb3a0ab7c2648c5734949cd827c7026b437a372 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Mon, 3 Aug 2020 20:49:42 -0400 Subject: [PATCH 3/3] Update urban_18_victorian.json --- data/json/mapgen/house/urban_18_victorian.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/house/urban_18_victorian.json b/data/json/mapgen/house/urban_18_victorian.json index a374d330be965..482de29e1753d 100644 --- a/data/json/mapgen/house/urban_18_victorian.json +++ b/data/json/mapgen/house/urban_18_victorian.json @@ -121,6 +121,7 @@ "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", @@ -165,7 +166,7 @@ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" ], "palettes": [ "standard_domestic_palette", "standard_domestic_lino_kitchen", "standard_domestic_lino_bathroom" ], - "terrain": { "~": "t_open_air", ",": "t_linoleum_gray", "#": "t_rock_wall" }, + "terrain": { "~": "t_open_air", ",": "t_linoleum_gray", "'": "t_thconc_floor", "#": "t_rock_wall" }, "place_loot": [ { "item": "television", "x": 17, "y": 8, "chance": 100 } ] } },