diff --git a/data/json/mapgen/sugar_house.json b/data/json/mapgen/sugar_house.json index 2ac2730d5e59b..447af78dff3d8 100644 --- a/data/json/mapgen/sugar_house.json +++ b/data/json/mapgen/sugar_house.json @@ -2,58 +2,87 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "sugar_house" ], - "weight": 300, + "om_terrain": [ [ "sugar_house_parking" ], [ "sugar_house" ] ], "object": { "fill_ter": "t_linoleum_white", "rows": [ - "........................", - ".||vvvv|||;;|||||vv|||..", - ".|hnnh p|D n|p hnnh |..", - ".vhnnh | || hnnh v..", - ".vhnnh + hnnh v..", - ".|hnnh | hh hnnh |..", - ".|hnnh |F nn hnnh |||", - ".| p|F nn hnnh |t|", - ".|||||||| hh hnnh +'v", - ".|Cff|'t| hnnh |S|", - ".vS''|+|| hhhh hnnh |||", - ".vO''''d| nnnn hnnh |t|", - ".|C'cc''+ nnnn hnnh +'v", - ".|C'cc'S| hhhh hnnh |S|", - ".|C'cc'O| |||", - ".||||||||||||||||++|||4.", - ".|__________________r|..", - ".|____________ww____r|.M", - ".v____________rr____r|..", - ".v____________rr____r|.M", - ".|____________rr____r|..", - ".|rrrrr___sss_rr____r|..", - ".|||||||++||||||||||||.M", - "........................" + " ~,,,,,,,,,,,,,,,,,,,,~ ", + " ~,,,,,,,,,,,,,,,,,,,,~ ", + " ~,,,,,,,,,,,,,,,,,,,,~ ", + " ~,,,,;,,,,;,,,,;,,,,;~ ", + " ~,,,,;,,,,;,,,,;,,,,;~ ", + " ~,,,,;,,,,;,,,,;,,,,;~ ", + " ~,,,,;,,,,;,,,,;,,,,;~ ", + " ~,,,,;,,,,;,,,,;,,,,;~ ", + " ~,,,,;,,,,;,,,,;,,,,;~ ", + " ~~~~~~~~~~~~~~~~~~~~~~ ", + " !!~~!! ", + " M M !~~! M M ", + " ~~ ", + " ~~ ", + " ~~ ", + " ~~ ", + " ~~ ", + " M M ~~ M M ", + " ~~ ", + " ~~ ", + " ~~ ", + " ~~ ", + " ~~ ", + " M M ~~ M M ", + " !!!! ~~ !!!! ", + " ||vvvv||||++|||vvvv|| ", + " |.hnnhp|D...n|p.....| ", + " |.hnnh.|....||.hnnh.v ", + " v.hnnh.+.......hnnh.v ", + " v.hnnh.|...hh..hnnh.|4 ", + " |.hnnh.|F..nn..hnnh.|||", + " |.....p|F..nn..hnnh.|t|", + " ||||||||...hh..hnnh.+'v", + " |CCCfff|.......hnnh.|S|", + " vO'''''|.hhhh..hnnh.|||", + " vO'cc''|.nnnn..hnnh.|t|", + " |1'cS''+.nnnn..hnnh.+'v", + " |2'cc''|.hhhh..hnnh.|S|", + " |3''''d|p..........p|||", + " ||||||||||||||||++||| ", + " |__________________R| M", + " |____________ww____R| ", + " v____________rr____R| ", + " v____________rr____R| M", + " |____________rr____R| ", + " |RRRRR___sss_rr____R| ", + " |||||||++|||||||||||| M", + " 4 ~~ " ], "terrain": { + " ": "t_region_groundcover", + "!": "t_region_groundcover", + ",": "t_pavement", + ";": "t_pavement_y", + "~": "t_concrete", + "|": "t_wall_g", + "v": "t_window_no_curtains", "+": "t_door_c", - ".": "t_region_groundcover", - ";": "t_door_c", - "M": "t_tree_maple_tapped", - "v": "t_window", - " ": "t_floor", - "'": "t_linoleum_white", + ".": "t_floor", "n": "t_floor", "h": "t_floor", "p": "t_floor", "D": "t_floor", + "'": "t_linoleum_white", "_": "t_thconc_floor", "F": "t_thconc_floor", "r": "t_thconc_floor", "s": "t_thconc_floor", "w": "t_thconc_floor", - "|": "t_wall_g", + "M": "t_tree_maple_tapped", "4": "t_gutter_downspout" }, "furniture": { "C": "f_cupboard", + "1": "f_cupboard", + "2": "f_cupboard", + "3": "f_cupboard", "D": "f_trashcan", "d": "f_trashcan", "F": "f_fireplace", @@ -63,52 +92,48 @@ "f": "f_fridge", "h": "f_chair", "n": "f_table", - "p": "f_indoor_plant", - "r": "f_rack", + "p": [ "f_indoor_plant", "f_indoor_plant_y" ], + "r": "f_utility_shelf", + "R": "f_utility_shelf", "s": "f_standing_tank", - "w": "f_woodstove" + "w": "f_woodstove", + "!": "f_region_flower_decorative" }, "toilets": { "t": { } }, + "items": { + "n": { "item": "sugar_house_items", "chance": 20, "repeat": [ 1, 2 ] }, + "D": { "item": "trash", "chance": 66, "repeat": [ 1, 3 ] }, + "d": { "item": "trash", "chance": 66, "repeat": [ 1, 3 ] }, + "r": { "item": "sugar_house_furnace", "chance": 100 }, + "R": { "item": "sugar_house_tools", "chance": 50, "repeat": [ 1, 2 ] }, + "F": { "item": "fireplace_fill", "chance": 66, "repeat": [ 1, 3 ] }, + "f": { "item": "SUS_fridge", "chance": 80 }, + "O": { "item": "SUS_oven", "chance": 100 }, + "1": { "item": "SUS_dishes", "chance": 100 }, + "2": { "item": "SUS_silverware", "chance": 100 }, + "3": { "item": "SUS_utensils", "chance": 100 }, + "C": { "item": "SUS_cookware", "chance": 100 }, + "c": { "item": "sugar_house_kitchen_items", "chance": 75, "repeat": [ 1, 2 ] } + }, + "item": { "M": { "item": "bucket", "chance": 100 } }, "place_loot": [ - { "item": "stepladder", "x": 3, "y": 20, "chance": 100 }, - { "item": "bucket", "x": 23, "y": 17, "chance": 100 }, - { "item": "bucket", "x": 23, "y": 19, "chance": 100 }, - { "item": "bucket", "x": 23, "y": 22, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 14, "y": 18, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 14, "y": 19, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 14, "y": 20, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 14, "y": 21, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 15, "y": 18, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 15, "y": 19, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 15, "y": 20, "chance": 100 }, - { "group": "sugar_house_furnace", "x": 15, "y": 21, "chance": 100 }, - { "item": "log", "x": 9, "y": 6, "chance": 60, "repeat": [ 1, 3 ] }, - { "item": "log", "x": 9, "y": 7, "chance": 60, "repeat": [ 1, 3 ] }, - { "group": "trash", "x": 9, "y": 2, "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "trash", "x": 7, "y": 11, "chance": 75, "repeat": [ 1, 3 ] }, - { "group": "sugar_house_kitchen_items", "x": [ 4, 5 ], "y": [ 12, 14 ], "chance": 100, "repeat": [ 4, 8 ] }, - { "group": "sugar_house_items", "x": [ 3, 4 ], "y": [ 2, 6 ], "chance": 75, "repeat": [ 6, 10 ] }, - { "group": "sugar_house_items", "x": [ 17, 18 ], "y": [ 2, 13 ], "chance": 75, "repeat": [ 8, 14 ] }, - { "group": "sugar_house_items", "x": [ 12, 13 ], "y": [ 6, 7 ], "chance": 75, "repeat": [ 2, 4 ] }, - { "group": "sugar_house_items", "x": [ 10, 13 ], "y": [ 11, 12 ], "chance": 50, "repeat": [ 6, 10 ] }, - { "group": "sugar_house_tools", "x": 20, "y": [ 16, 21 ], "chance": 90, "repeat": [ 2, 6 ] }, - { "group": "sugar_house_tools", "x": [ 2, 6 ], "y": 21, "chance": 90, "repeat": [ 2, 6 ] }, - { "group": "sugar_house_drum", "x": 2, "y": 16, "chance": 60 }, - { "group": "sugar_house_drum", "x": 3, "y": 16, "chance": 60 }, - { "group": "sugar_house_drum", "x": 4, "y": 16, "chance": 60 }, - { "group": "sugar_house_drum", "x": 2, "y": 17, "chance": 60 }, - { "group": "sugar_house_drum", "x": 3, "y": 17, "chance": 60 }, - { "group": "sugar_house_drum", "x": 4, "y": 17, "chance": 60 }, - { "item": "log", "x": [ 7, 10 ], "y": [ 16, 17 ], "chance": 100, "repeat": [ 16, 40 ] }, - { "group": "fridge", "x": 3, "y": 9, "chance": 60, "repeat": [ 1, 4 ] }, - { "group": "fridge", "x": 4, "y": 9, "chance": 60, "repeat": [ 1, 4 ] }, - { "group": "kitchen", "x": 2, "y": 9, "chance": 60, "repeat": [ 1, 2 ] }, - { "group": "kitchen", "x": 2, "y": 12, "chance": 60, "repeat": [ 1, 2 ] }, - { "group": "kitchen", "x": 2, "y": 13, "chance": 60, "repeat": [ 1, 2 ] }, - { "group": "kitchen", "x": 2, "y": 14, "chance": 60, "repeat": [ 1, 2 ] }, - { "group": "cash_register_random", "x": 12, "y": 2 } + { "item": "stepladder", "x": 3, "y": 44, "chance": 100 }, + { "group": "sugar_house_drum", "x": 2, "y": 40, "chance": 60 }, + { "group": "sugar_house_drum", "x": 3, "y": 40, "chance": 60 }, + { "group": "sugar_house_drum", "x": 4, "y": 40, "chance": 60 }, + { "group": "sugar_house_drum", "x": 2, "y": 41, "chance": 60 }, + { "group": "sugar_house_drum", "x": 3, "y": 41, "chance": 60 }, + { "group": "sugar_house_drum", "x": 4, "y": 41, "chance": 60 }, + { "item": "log", "x": [ 7, 10 ], "y": [ 40, 41 ], "chance": 100, "repeat": [ 16, 40 ] }, + { "group": "cash_register_random", "x": 13, "y": 26 } + ], + "place_vehicles": [ + { "vehicle": "parking_garage", "x": 4, "y": 6, "rotation": 90, "chance": 33 }, + { "vehicle": "parking_garage", "x": 9, "y": 6, "rotation": 90, "chance": 33 }, + { "vehicle": "parking_garage", "x": 14, "y": 6, "rotation": 90, "chance": 33 }, + { "vehicle": "parking_garage", "x": 19, "y": 6, "rotation": 90, "chance": 33 } ], - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ] } ] + "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 24, 47 ], "chance": 80, "repeat": [ 1, 8 ] } ] } }, { @@ -119,28 +144,28 @@ "fill_ter": "t_shingle_flat_roof", "rows": [ " ", - " |22222222222222222223 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |.......%...........3-3", - " |.......%.............3", - " |.....................3", - " |.....................3", - " |.....................3", - " |.....................3", - " |.............N......=3", - " |.....................3", - " |...................533", - " |...&...............3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |-------------------3 ", + " --------------------- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -.......%...........5--", + " -.......%.............-", + " -.....................-", + " -.....................-", + " -.....................-", + " -.....................-", + " -.............N......=-", + " -.....................-", + " -...................---", + " -...&...............- ", + " -.............&.....- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -...................- ", + " 5-------------------- ", " " ], "palettes": [ "roof_palette" ], diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index b4c1ca62da625..105fa184f699a 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -608,13 +608,14 @@ "type": "overmap_special", "id": "Sugar House", "overmaps": [ + { "point": [ 0, -1, 0 ], "overmap": "sugar_house_parking_north" }, { "point": [ 0, 0, 0 ], "overmap": "sugar_house_north" }, { "point": [ 0, 0, 1 ], "overmap": "sugar_house_roof_north" } ], - "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ], + "connections": [ { "point": [ 0, -2, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, -1, 0 ] } ], "locations": [ "forest" ], "city_distance": [ 5, 60 ], - "occurrences": [ 0, 10 ], + "occurrences": [ 0, 3 ], "flags": [ "CLASSIC", "MAN_MADE" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json index 23eeb594826be..a26e4ca81a89d 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json @@ -110,6 +110,12 @@ "copy-from": "sugar_house", "name": "sugar house roof" }, + { + "type": "overmap_terrain", + "id": "sugar_house_parking", + "copy-from": "s_lot", + "delete": { "flags": [ "SIDEWALK" ] } + }, { "type": "overmap_terrain", "id": [ "pottery_cottage", "pottery_cottage_2nd", "pottery_cottage_roof" ],