From 7ab2ce480dc57bcc8b383b094734e067ed896023 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 19 May 2020 12:19:51 -0400 Subject: [PATCH 1/4] mainline fuji structures 3 stores diner, car dealership, camping stores --- data/json/mapgen/store/s_camping.json | 152 ++++++++++++++ .../mapgen/store}/s_cardealer.json | 4 +- data/json/mapgen/store/s_diner.json | 198 ++++++++++++++++++ .../overmap/multitile_city_buildings.json | 25 +++ .../overmap_terrain_commercial.json | 38 +++- data/json/regional_map_settings.json | 3 + .../worldgen/overmap_multitile_city.json | 25 --- .../worldgen/overmap_terrain.json | 51 ----- .../worldgen/regional_overlay.json | 3 - .../Fuji_Structures/worldgen/s_camping.json | 141 ------------- .../Fuji_Structures/worldgen/s_diner.json | 191 ----------------- 11 files changed, 416 insertions(+), 415 deletions(-) create mode 100644 data/json/mapgen/store/s_camping.json rename data/{mods/Fuji_Structures/worldgen => json/mapgen/store}/s_cardealer.json (97%) create mode 100644 data/json/mapgen/store/s_diner.json delete mode 100644 data/mods/Fuji_Structures/worldgen/s_camping.json delete mode 100644 data/mods/Fuji_Structures/worldgen/s_diner.json diff --git a/data/json/mapgen/store/s_camping.json b/data/json/mapgen/store/s_camping.json new file mode 100644 index 0000000000000..ae12955f8ec7b --- /dev/null +++ b/data/json/mapgen/store/s_camping.json @@ -0,0 +1,152 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "s_camping" ], + "object": { + "fill_ter": "t_linoleum_gray", + "rows": [ + "..............`````.....", + ".##ccc##ccc##.`````.....", + ".# MMM MMMz#.`````.....", + ".# b``````.....", + ".# ss ss b``````.....", + ".c ss ss tƃ##ghhggg##..", + ".# ss ss u #________#..", + ".# ss ss M cj____G__g..", + ".# ss ss M cj___GiG_g..", + ".c ss ss u cGG___G__g..", + ".# ss ss tƃ#GG______g..", + ".# ## ## b________#..", + ".# ss ss y#____www_g..", + ".c c____xvw_g..", + ".# c__K_www_g..", + ".# ssssss y#________g..", + ".# ||||||b|#;_K__jjj#..", + ".# |ooo===q###hh#####..", + ".#|b|oop===q#mm__illlg..", + ".#z |=======b_____lllg..", + ".# |rr=====b________h..", + ";#AB|krr==kk#iii_____g..", + ".############ggggggggg..", + "........................" + ], + "terrain": { + "#": "t_adobe_brick_wall", + "|": "t_wall_w", + "b": "t_door_c", + "c": "t_wall_glass", + ".": "t_region_groundcover_urban", + "`": "t_sidewalk", + "_": "t_pavement", + "g": "t_chainfence_v", + "h": "t_chaingate_c", + "i": "t_pavement", + "j": "t_pavement", + "l": "t_pavement", + "m": "t_pavement", + "=": "t_thconc_floor", + "o": "t_thconc_floor", + "p": "t_thconc_floor", + "q": "t_thconc_floor", + "r": "t_thconc_floor", + "k": "t_thconc_floor", + "s": "t_linoleum_gray", + "t": "t_linoleum_gray", + "u": "t_console_broken", + "v": "t_pavement", + "w": "t_pavement", + "x": "t_pavement", + "K": "t_pavement", + "G": "t_pavement", + "y": "t_linoleum_gray", + "z": "t_linoleum_gray", + "A": "t_linoleum_gray", + "B": "t_linoleum_gray", + "M": "t_linoleum_gray", + ";": "t_gutter_downspout" + }, + "furniture": { + "i": "f_brazier", + "j": "f_bench", + "G": "f_camp_chair", + "K": "f_tourist_table", + "r": "f_camp_chair", + "k": "f_tourist_table", + "l": "f_dumpster", + "m": "f_crate_c", + "o": "f_crate_c", + "p": "f_crate_o", + "q": "f_bench", + "s": "f_rack", + "ƃ": "f_counter_gate_c", + "t": "f_counter", + "v": "f_groundsheet", + "w": "f_canvas_wall", + "x": "f_canvas_door", + "M": "f_displaycase", + "y": "f_vending_c", + "z": "f_trashcan", + "A": "f_sink" + }, + "toilets": { "B": { } }, + "place_loot": [ + { "group": "cannedfood", "chance": 50, "repeat": 10, "x": [ 3, 3 ], "y": [ 4, 10 ] }, + { "group": "swimmer_shoes", "chance": 50, "repeat": 3, "x": 4, "y": [ 4, 5 ] }, + { "group": "NC_COWBOY_shoes", "chance": 50, "repeat": 6, "x": 4, "y": [ 6, 10 ] }, + { "group": "camping", "chance": 60, "repeat": 10, "x": 6, "y": [ 4, 10 ] }, + { "group": "hand_tools", "chance": 60, "repeat": 5, "x": 7, "y": [ 4, 10 ] }, + { "group": "softdrugs", "chance": 60, "repeat": 2, "x": [ 3, 4 ], "y": 12 }, + { "group": "archery", "chance": 50, "repeat": 2, "x": [ 4, 7 ], "y": 15 }, + { "group": "archery_ammo", "chance": 50, "repeat": 2, "x": [ 8, 9 ], "y": 15 }, + { "group": "archery_ammo", "chance": 50, "repeat": 4, "x": [ 3, 5 ], "y": 2 }, + { "group": "archery_mods", "chance": 50, "repeat": 4, "x": [ 8, 10 ], "y": 2 }, + { "group": "kitchen_nonfood", "chance": 50, "repeat": 4, "x": [ 6, 7 ], "y": 12 }, + { "group": "book_survival", "chance": 50, "repeat": 2, "x": 10, "y": 7 }, + { "group": "tools_hunting", "chance": 50, "repeat": 2, "x": 10, "y": 7 }, + { "group": "vending_food_items", "chance": 80, "repeat": 2, "x": 11, "y": 15 }, + { "group": "vending_drink", "chance": 80, "repeat": 1, "x": 11, "y": 12 }, + { "group": "trash", "chance": 50, "repeat": 5, "x": 11, "y": 2 }, + { "group": "trash", "chance": 50, "repeat": 5, "x": [ 18, 20 ], "y": [ 18, 19 ] }, + { "group": "camping", "chance": 60, "repeat": 4, "x": [ 5, 6 ], "y": 17 }, + { "group": "hand_tools", "chance": 50, "repeat": 3, "x": 7, "y": 17 }, + { "group": "cannedfood", "chance": 60, "repeat": 6, "x": [ 5, 6 ], "y": 18 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "s_camping_roof" ], + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + " ", + " |22222222223 ", + " |..........3 ", + " |..oo..oo..3 ", + " |..........3 ", + " |..........3 ", + " |..........3 ", + " |..oo..oo..3 ", + " |..........3 ", + " |...A......3 ", + " |..........3 ", + " |..oo..oo..3 ", + " |..........3 ", + " |..........3 ", + " |..........3 ", + " |..........3 ", + " |.=........5 ", + " |.=........3 ", + " |..........3 ", + " |.......:..3 ", + " |....A.....3 ", + " 5..........3 ", + " |----------3 ", + " " + ], + "palettes": [ "roof_palette" ] + } + } +] diff --git a/data/mods/Fuji_Structures/worldgen/s_cardealer.json b/data/json/mapgen/store/s_cardealer.json similarity index 97% rename from data/mods/Fuji_Structures/worldgen/s_cardealer.json rename to data/json/mapgen/store/s_cardealer.json index d192252d35c3f..6ae62a20a8a7e 100644 --- a/data/mods/Fuji_Structures/worldgen/s_cardealer.json +++ b/data/json/mapgen/store/s_cardealer.json @@ -33,8 +33,8 @@ ], "terrain": { "a": "t_pavement_y", - "b": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "c": "t_wall", + "b": "t_region_groundcover_urban", + "c": "t_adobe_brick_wall", "d": "t_floor", "e": "t_sidewalk", "f": "t_window", diff --git a/data/json/mapgen/store/s_diner.json b/data/json/mapgen/store/s_diner.json new file mode 100644 index 0000000000000..640d3bac0d122 --- /dev/null +++ b/data/json/mapgen/store/s_diner.json @@ -0,0 +1,198 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "s_diner" ], + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "%%%%```%%%%!!%````!%....", + ".`````````%%%%````!%.[..", + ".`````````````````!%%%%%", + ".``v```v``%%%%````!!!!!!", + ".`vuv`vuv##bb##cc##bb##.", + ".``v```v`#<;;;;;;;;;;;#.", + ".````````#G ;gG ;gG ;G#.", + ".##bbbbb##F; Ff; Ff; F#.", + ".bHH;G;HH#G ;gG ;gG ;G#.", + ".bFF F FF#;; ; ; ; ; ;#.", + ".bH@;g;@H## ;## ;## ;##.", + ".#F; ; ; ; ; ; ; ; ; ;#.", + ".#||||; ; ; ; A A A A #.", + ".#HH@| ;@H|~~eeeeeeeee#.", + ".#FfF ; Ff|~~~~~~~~~~~#.", + ".#HH@| ;@H|tt~~~~~n~~m#.", + ".#||||; |||||||eee||~|#.", + ".#j~m| ;|s~EI|p~~~~~~~#.", + ".#k~~c; |~~~I|p~~~~~~~#.", + ".#|||| ;||c|||~~ee~|||#.", + ".#k~~c; c~~~~~~~~~~~~~#.", + ".#j~m| ;|mm~r~eeoo~|qq#.", + ".######c###############.", + "......```..............." + ], + "terrain": { + "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], + "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], + "!": "t_region_groundcover_urban", + "#": "t_brick_wall", + "|": "t_wall_w", + "b": "t_window", + "c": "t_door_c", + ";": "t_linoleum_gray", + "G": "t_linoleum_gray", + "F": "t_linoleum_gray", + "H": "t_linoleum_gray", + "A": "t_linoleum_gray", + "~": "t_thconc_floor", + "s": "t_thconc_floor", + "I": "t_thconc_floor", + "E": "t_thconc_floor", + "e": "t_thconc_floor", + ".": "t_region_groundcover_urban", + "`": "t_sidewalk", + "j": "t_thconc_floor", + "k": "t_thconc_floor", + "m": "t_thconc_floor", + "n": "t_console_broken", + "o": "t_thconc_floor", + "p": "t_thconc_floor", + "q": "t_thconc_floor", + "r": "t_thconc_floor", + "t": "t_thconc_floor", + "u": "t_sidewalk", + "v": "t_sidewalk", + "<": "t_stairs_up" + }, + "furniture": { + "e": "f_counter", + "f": "f_table", + "F": "f_table", + "@": "f_sofa", + "H": "f_sofa", + "A": "f_stool", + "g": "f_chair", + "G": "f_chair", + "!": "f_region_flower", + "k": "f_sink", + "l": "f_trashcan", + "m": "f_trashcan", + "o": "f_sink", + "p": "f_oven", + "q": "f_fridge", + "r": "f_locker", + "I": "f_desk", + "E": "f_armchair", + "s": "f_locker", + "t": "f_rack", + "u": "f_table", + "v": "f_chair" + }, + "toilets": { "j": { } }, + "items": { + "p": { "item": "oven", "chance": 80, "repeat": [ 2, 4 ] }, + "F": [ + { "item": "coffee_dishes", "chance": 20 }, + { "item": "coffee_condiments", "chance": 20 }, + { "item": "baked_goods", "chance": 10 }, + { "item": "prepared_teas", "chance": 20 }, + { "item": "coffee_counter", "chance": 20 } + ], + "f": [ + { "item": "coffee_dishes", "chance": 20 }, + { "item": "coffee_condiments", "chance": 20 }, + { "item": "baked_goods", "chance": 10 }, + { "item": "prepared_teas", "chance": 20 }, + { "item": "coffee_table", "chance": 20 } + ], + "m": { "item": "bar_trash", "chance": 50, "repeat": [ 1, 2 ] }, + "I": { "item": "office", "chance": 30, "repeat": [ 1, 2 ] } + }, + "place_loot": [ + { "group": "coffee_prep", "chance": 50, "repeat": [ 4 ], "x": [ 11, 12 ], "y": [ 15, 15 ] }, + { "group": "bar_food", "chance": 50, "repeat": [ 4 ], "x": [ 20, 20 ], "y": [ 21, 21 ] }, + { "group": "diner_food", "chance": 50, "repeat": [ 4 ], "x": [ 21, 21 ], "y": [ 21, 21 ] }, + { "group": "kitchen", "chance": 80, "repeat": [ 2 ], "x": [ 16, 16 ], "y": [ 21, 21 ] }, + { "group": "kitchen", "chance": 80, "repeat": [ 2 ], "x": [ 17, 17 ], "y": [ 21, 21 ] }, + { "group": "cleaning_bulk", "chance": 50, "repeat": [ 2 ], "x": [ 12, 12 ], "y": [ 21, 21 ] }, + { "group": "cleaning", "chance": 50, "repeat": [ 1 ], "x": [ 2, 2 ], "y": [ 18, 18 ] }, + { "group": "cleaning", "chance": 50, "repeat": [ 1 ], "x": [ 2, 2 ], "y": [ 20, 20 ] }, + { "group": "restaur_kitchen", "chance": 50, "repeat": [ 2 ], "x": [ 14, 15 ], "y": [ 21, 21 ] }, + { "group": "fast_kitchen", "chance": 50, "repeat": [ 2 ], "x": [ 16, 17 ], "y": [ 19, 19 ] } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "s_diner_2ndfloor" ], + "object": { + "fill_ter": "t_linoleum_white", + "rows": [ + "************************", + "************************", + "************************", + "************************", + "*********###WW#WW#WW###*", + "*********#>#hh...h..hh#*", + "*********#.#tt...t..ttW*", + "*##W###W##..hh...h..hh#*", + "*#....................#*", + "*W^..RRRRRRRRRRRRRR..^W*", + "*Wh..R;;;;;;;;;;;;R...W*", + "*Wt..R;;;;;;;;;;;;R..^W*", + "*Wh..RRRRRRRRRRRRRR...W*", + "*W^...................W*", + "*#........hth.hth.hth.#*", + "*####.####WWW#WWW#WWW##*", + "*4zz#.j#9zzzzzzzzzzzzz6*", + "*4zz#+##zzzzzzzzz&zzzz6*", + "*4zzzzzzzzzzzzzzzzzzzz6*", + "*4zzzzzzzzzzzz((zzzzzz6*", + "*4zzzzzzzzzzzzzzzzzzzz6*", + "*4zzzzzzzzzzzzzzzzzzzz6*", + "*4555555555555555555556*", + "************************" + ], + "palettes": [ "apartment_palette" ], + "terrain": { "*": "t_open_air", "9": "t_gutter_downspout", "R": "t_glass_railing", ";": "t_open_air_rooved", "#": "t_brick_wall" }, + "furniture": { "h": "f_chair" }, + "items": { "t": { "item": "coffee_table", "chance": 50 }, "j": { "item": "bar_trash", "chance": 65, "repeat": [ 1, 3 ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "s_diner_roof" ], + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " |2222222222223 ", + " |..........X.3 ", + " |............3 ", + " |2222222|............3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |...A.........A......3 ", + " |....................3 ", + " |.........&..........3 ", + " |...............==...3 ", + " |--|..35-------------3 ", + " |..3 ", + " |--3 ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ] + } + } +] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index aa1b861313e84..187b7170d575d 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -3535,5 +3535,30 @@ { "point": [ 0, 0, 0 ], "overmap": "s_laundromat_1_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_laundromat_roof_1_north" } ] + }, + { + "type": "city_building", + "id": "s_camping", + "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_camping_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_camping_roof_north" } ] + }, + { + "type": "city_building", + "id": "s_cardealer", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "s_cardealer_north" }, + { "point": [ 0, 0, 1 ], "overmap": "s_cardealer_roof_north" } + ] + }, + { + "type": "city_building", + "id": "s_diner", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "s_diner_north" }, + { "point": [ 0, 0, 1 ], "overmap": "s_diner_2ndfloor_north" }, + { "point": [ 0, 0, 2 ], "overmap": "s_diner_roof_north" } + ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index 8c98a5f368646..5a1c49811bf83 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -306,6 +306,23 @@ "name": "bookstore roof", "color": "i_brown" }, + { + "type": "overmap_terrain", + "id": "s_diner", + "name": "diner", + "copy-from": "generic_city_building", + "sym": "d", + "color": "green", + "extend": { "flags": [ "SOURCE_FOOD", "SOURCE_DRINK", "SOURCE_COOKING" ] } + }, + { + "type": "overmap_terrain", + "id": [ "s_diner_2ndfloor", "s_diner_roof" ], + "name": "diner", + "copy-from": "generic_city_building", + "sym": "d", + "color": "green" + }, { "type": "overmap_terrain", "id": [ "s_restaurant_foodplace", "s_restaurant", "s_restaurant_1", "s_restaurant_2", "s_restaurant_3" ], @@ -1314,7 +1331,7 @@ }, { "type": "overmap_terrain", - "id": "cs_car_dealership", + "id": [ "cs_car_dealership", "s_cardealer" ], "copy-from": "generic_city_building", "name": "car dealership", "sym": "c", @@ -1323,7 +1340,7 @@ }, { "type": "overmap_terrain", - "id": "cs_car_dealership_roof", + "id": [ "cs_car_dealership_roof", "s_cardealer_roof" ], "copy-from": "generic_city_building", "name": "car dealership", "sym": "c", @@ -1465,6 +1482,23 @@ "sym": "H", "color": "brown" }, + { + "type": "overmap_terrain", + "id": "s_camping", + "name": "outdoorsman's store", + "copy-from": "generic_city_building", + "sym": "o", + "color": "brown", + "extend": { "flags": [ "SOURCE_WEAPON", "SOURCE_CLOTHING" ] } + }, + { + "type": "overmap_terrain", + "id": "s_camping_roof", + "name": "outdoorsman's store", + "copy-from": "generic_city_building", + "sym": "o", + "color": "brown" + }, { "type": "overmap_terrain", "id": [ diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 7c9d2b42ca010..9389e95b36b84 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -749,6 +749,7 @@ "s_restaurant_1": 400, "s_restaurant_2": 400, "s_restaurant_3": 400, + "s_diner": 400, "sub_station": 1600, "bank": 300, "bank_1": 300, @@ -884,6 +885,8 @@ "2fmotel_city": 50, "cs_car_dealership": 100, "cs_car_showroom": 100, + "s_cardealer": 200, + "s_camping": 100, "cs_gardening_allotment": 100, "cs_internet_cafe": 100, "cs_market_small": 100, diff --git a/data/mods/Fuji_Structures/worldgen/overmap_multitile_city.json b/data/mods/Fuji_Structures/worldgen/overmap_multitile_city.json index bcc733a231448..3694b30440673 100644 --- a/data/mods/Fuji_Structures/worldgen/overmap_multitile_city.json +++ b/data/mods/Fuji_Structures/worldgen/overmap_multitile_city.json @@ -18,31 +18,6 @@ { "point": [ 0, 0, 2 ], "overmap": "s_gunstore_roof_north" } ] }, - { - "type": "city_building", - "id": "s_camping", - "locations": [ "land" ], - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_camping_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_camping_roof_north" } ] - }, - { - "type": "city_building", - "id": "s_cardealer", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_cardealer_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_cardealer_roof_north" } - ] - }, - { - "type": "city_building", - "id": "s_diner", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_diner_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_diner_2ndfloor_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_diner_roof_north" } - ] - }, { "type": "city_building", "id": "s_games", diff --git a/data/mods/Fuji_Structures/worldgen/overmap_terrain.json b/data/mods/Fuji_Structures/worldgen/overmap_terrain.json index 2505fe2c05c03..f09b26c8a7967 100644 --- a/data/mods/Fuji_Structures/worldgen/overmap_terrain.json +++ b/data/mods/Fuji_Structures/worldgen/overmap_terrain.json @@ -35,27 +35,6 @@ "name": "gun store", "copy-from": "s_gunstore" }, - { - "type": "overmap_terrain", - "id": "s_diner", - "name": "diner", - "copy-from": "generic_city_building", - "sym": "d", - "color": "green", - "land_use_code": "commercial" - }, - { - "type": "overmap_terrain", - "id": "s_diner_2ndfloor", - "name": "diner", - "copy-from": "s_diner" - }, - { - "type": "overmap_terrain", - "id": "s_diner_roof", - "name": "diner", - "copy-from": "s_diner" - }, { "type": "overmap_terrain", "id": "s_apt", @@ -98,36 +77,6 @@ "name": "apartment", "copy-from": "s_apt_2" }, - { - "type": "overmap_terrain", - "id": "s_cardealer", - "name": "dealership", - "copy-from": "generic_city_building", - "sym": "0", - "color": "blue", - "land_use_code": "commercial" - }, - { - "type": "overmap_terrain", - "id": "s_cardealer_roof", - "name": "dealership", - "copy-from": "s_cardealer" - }, - { - "type": "overmap_terrain", - "id": "s_camping", - "name": "outdoorsman's store", - "copy-from": "generic_city_building", - "sym": "o", - "color": "brown", - "land_use_code": "commercial" - }, - { - "type": "overmap_terrain", - "id": "s_camping_roof", - "name": "outdoorsman's store", - "copy-from": "s_camping" - }, { "type": "overmap_terrain", "id": "s_games", diff --git a/data/mods/Fuji_Structures/worldgen/regional_overlay.json b/data/mods/Fuji_Structures/worldgen/regional_overlay.json index 1ba25bdc3a19a..893e77b302e84 100644 --- a/data/mods/Fuji_Structures/worldgen/regional_overlay.json +++ b/data/mods/Fuji_Structures/worldgen/regional_overlay.json @@ -15,11 +15,8 @@ }, "shops": { "s_gunstore": 500, - "s_diner": 400, "s_apt": 400, "s_apt_2": 400, - "s_cardealer": 200, - "s_camping": 100, "s_games": 100, "s_electronicstore": 400 } diff --git a/data/mods/Fuji_Structures/worldgen/s_camping.json b/data/mods/Fuji_Structures/worldgen/s_camping.json deleted file mode 100644 index 815e3ac4c9ae5..0000000000000 --- a/data/mods/Fuji_Structures/worldgen/s_camping.json +++ /dev/null @@ -1,141 +0,0 @@ -[ - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_camping" ], - "object": { - "fill_ter": "t_linoleum_gray", - "rows": [ - "ddddddddddddddeeeeeddddd", - "daacccaacccaadeeeeeddddd", - "da zadeeeeeddddd", - "da beeeeeeddddd", - "da ss ss beeeeeeddddd", - "dc ss ss t aaghhgggaadd", - "da ss ss u affffffffadd", - "da ss ss s cjffffjffgdd", - "da ss ss s cjfffjijfgdd", - "dc ss ss u ckkfffjffgdd", - "da ss ss t akkffffffgdd", - "da aa aa bffffffffadd", - "da ss ss yaffffwwwfgdd", - "dc cffffxvwfgdd", - "da cffffwwwfgdd", - "da ssssss affffffffgdd", - "da aaaaaabaa;fffffffadd", - "da aooonnnqaaahhaaaaadd", - "daabaoopnnnqammffilllgdd", - "da annnnnnnbffffflllgdd", - "da arrnnnnnbffffffffhdd", - "daABarrrnnrraiiifffffgdd", - "daaaaaaaaaaaagggggggggdd", - "dddddddddddddddddddddddd" - ], - "terrain": { - "a": "t_wall", - "b": "t_door_c", - "c": "t_wall_glass", - "d": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "e": "t_sidewalk", - "f": "t_pavement", - "g": "t_chainfence_v", - "h": "t_chaingate_c", - "i": "t_pavement", - "j": "t_pavement", - "k": "t_pavement", - "l": "t_pavement", - "m": "t_pavement", - "n": "t_floor", - "o": "t_floor", - "p": "t_floor", - "q": "t_floor", - "r": "t_floor", - "s": "t_linoleum_gray", - "t": "t_linoleum_gray", - "u": "t_console_broken", - "v": "t_pavement", - "w": "t_pavement", - "x": "t_pavement", - "y": "t_linoleum_gray", - "z": "t_linoleum_gray", - "A": "t_linoleum_gray", - "B": "t_linoleum_gray", - ";": "t_gutter_downspout" - }, - "furniture": { - "i": "f_brazier", - "j": "f_bench", - "k": "f_chair", - "l": "f_dumpster", - "m": "f_crate_c", - "o": "f_crate_c", - "p": "f_crate_o", - "q": "f_bench", - "r": "f_chair", - "s": "f_rack", - "t": "f_counter", - "v": "f_groundsheet", - "w": "f_canvas_wall", - "x": "f_canvas_door", - "y": "f_vending_c", - "z": "f_trashcan", - "A": "f_sink" - }, - "toilets": { "B": { } }, - "place_loot": [ - { "group": "cannedfood", "chance": 50, "repeat": [ 10 ], "x": [ 3, 3 ], "y": [ 4, 10 ] }, - { "group": "swimmer_shoes", "chance": 50, "repeat": [ 2 ], "x": [ 4, 4 ], "y": [ 4, 5 ] }, - { "group": "NC_COWBOY_shoes", "chance": 50, "repeat": [ 5 ], "x": [ 4, 4 ], "y": [ 6, 10 ] }, - { "group": "camping", "chance": 50, "repeat": [ 10 ], "x": [ 6, 6 ], "y": [ 4, 10 ] }, - { "group": "hand_tools", "chance": 50, "repeat": [ 5 ], "x": [ 7, 7 ], "y": [ 4, 10 ] }, - { "group": "softdrugs", "chance": 50, "repeat": [ 2 ], "x": [ 3, 4 ], "y": [ 12, 12 ] }, - { "group": "archery", "chance": 50, "repeat": [ 2 ], "x": [ 4, 7 ], "y": [ 15, 15 ] }, - { "group": "archery_ammo", "chance": 50, "repeat": [ 2 ], "x": [ 8, 9 ], "y": [ 15, 15 ] }, - { "group": "kitchen_nonfood", "chance": 50, "repeat": [ 4 ], "x": [ 6, 7 ], "y": [ 12, 12 ] }, - { "group": "book_survival", "chance": 50, "repeat": [ 2 ], "x": [ 10, 10 ], "y": [ 7, 7 ] }, - { "group": "vending_food_items", "chance": 50, "repeat": [ 2 ], "x": [ 10, 10 ], "y": [ 8, 8 ] }, - { "group": "vending_drink", "chance": 80, "repeat": [ 1 ], "x": [ 11, 11 ], "y": [ 12, 12 ] }, - { "group": "trash", "chance": 50, "repeat": [ 5 ], "x": [ 11, 11 ], "y": [ 2, 2 ] }, - { "group": "trash", "chance": 50, "repeat": [ 5 ], "x": [ 18, 20 ], "y": [ 18, 19 ] }, - { "group": "camping", "chance": 50, "repeat": [ 4 ], "x": [ 5, 6 ], "y": [ 17, 17 ] }, - { "group": "hand_tools", "chance": 50, "repeat": [ 2 ], "x": [ 7, 7 ], "y": [ 17, 17 ] }, - { "group": "cannedfood", "chance": 50, "repeat": [ 5 ], "x": [ 5, 6 ], "y": [ 18, 18 ] } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_camping_roof" ], - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - " ", - " |22222222223 ", - " |..........3 ", - " |..oo..oo..3 ", - " |..........3 ", - " |..........3 ", - " |..........3 ", - " |..oo..oo..3 ", - " |..........3 ", - " |...A......3 ", - " |..........3 ", - " |..oo..oo..3 ", - " |..........3 ", - " |..........3 ", - " |..........3 ", - " |..........3 ", - " |.=........5 ", - " |.=........3 ", - " |..........3 ", - " |.......:..3 ", - " |....A.....3 ", - " |..........3 ", - " |----------3 ", - " " - ], - "palettes": [ "roof_palette" ] - } - } -] diff --git a/data/mods/Fuji_Structures/worldgen/s_diner.json b/data/mods/Fuji_Structures/worldgen/s_diner.json deleted file mode 100644 index fbf6613ebff6a..0000000000000 --- a/data/mods/Fuji_Structures/worldgen/s_diner.json +++ /dev/null @@ -1,191 +0,0 @@ -[ - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_diner" ], - "object": { - "fill_ter": "t_floor", - "rows": [ - "hhhhiiihhhhhhhiiiihhhhhh", - "hiiiiiiiiihhhhiiiihhhhhh", - "hiiiiiiiiiiiiiiiiihhhhhh", - "hiiviiiviihhhhiiiihhhhhh", - "hivuvivuvaabbaaccaabbaah", - "hiiviiivia< ah", - "hiiiiiiiiag gg gg gah", - "haabacabaaf ff ff fah", - "hagfg gfgag gg gg gah", - "ha a ah", - "ha laa aa aa aah", - "haaaaa ah", - "hagfga g g g g ah", - "ha ggaddeeeeeeeeeah", - "ha ffadddddddddddah", - "hagfga ggattdddddnddmah", - "haaaaa aaaaaaaeeeaadaah", - "hajdma as gfapdddddddah", - "hakddc a fapdddddddah", - "haaaaa aacaaaddeedaaaah", - "hakddc cdddddddddddddah", - "hajdma ammdrdeeoodaqqah", - "haaaaaacaaaaaaaaaaaaaaah", - "hhhhhhhhhhhhhhhhhhhhhhhh" - ], - "terrain": { - "a": "t_wall", - "b": "t_window", - "c": "t_door_c", - "d": "t_linoleum_gray", - "e": "t_linoleum_gray", - "f": "t_floor", - "g": "t_floor", - "h": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "i": "t_sidewalk", - "j": "t_linoleum_gray", - "k": "t_linoleum_gray", - "l": "t_floor", - "m": "t_linoleum_gray", - "n": "t_console_broken", - "o": "t_linoleum_gray", - "p": "t_linoleum_gray", - "q": "t_linoleum_gray", - "r": "t_linoleum_gray", - "s": "t_floor", - "t": "t_linoleum_gray", - "u": "t_sidewalk", - "v": "t_sidewalk", - "<": "t_stairs_up" - }, - "furniture": { - "e": "f_counter", - "f": "f_table", - "g": "f_chair", - "k": "f_sink", - "l": "f_trashcan", - "m": "f_trashcan", - "o": "f_sink", - "p": "f_oven", - "q": "f_fridge", - "r": "f_locker", - "s": "f_locker", - "t": "f_rack", - "u": "f_table", - "v": "f_chair" - }, - "toilets": { "j": { } }, - "place_loot": [ - { "group": "bar_trash", "chance": 50, "repeat": [ 4 ], "x": [ 4, 4 ], "y": [ 21, 21 ] }, - { "group": "bar_trash", "chance": 50, "repeat": [ 4 ], "x": [ 4, 4 ], "y": [ 17, 17 ] }, - { "group": "bar_trash", "chance": 50, "repeat": [ 4 ], "x": [ 9, 9 ], "y": [ 21, 21 ] }, - { "group": "bar_trash", "chance": 50, "repeat": [ 4 ], "x": [ 10, 10 ], "y": [ 21, 21 ] }, - { "group": "bar_trash", "chance": 50, "repeat": [ 4 ], "x": [ 21, 21 ], "y": [ 15, 15 ] }, - { "group": "bar_trash", "chance": 50, "repeat": [ 4 ], "x": [ 8, 8 ], "y": [ 10, 10 ] }, - { "group": "coffee_prep", "chance": 50, "repeat": [ 4 ], "x": [ 11, 12 ], "y": [ 15, 15 ] }, - { "group": "bar_food", "chance": 50, "repeat": [ 4 ], "x": [ 20, 20 ], "y": [ 21, 21 ] }, - { "group": "diner_food", "chance": 50, "repeat": [ 4 ], "x": [ 21, 21 ], "y": [ 21, 21 ] }, - { "group": "oven", "chance": 50, "repeat": [ 2 ], "x": [ 14, 14 ], "y": [ 17, 17 ] }, - { "group": "oven", "chance": 50, "repeat": [ 2 ], "x": [ 14, 14 ], "y": [ 18, 18 ] }, - { "group": "kitchen", "chance": 80, "repeat": [ 2 ], "x": [ 16, 16 ], "y": [ 21, 21 ] }, - { "group": "kitchen", "chance": 80, "repeat": [ 2 ], "x": [ 17, 17 ], "y": [ 21, 21 ] }, - { "group": "cleaning_bulk", "chance": 50, "repeat": [ 2 ], "x": [ 12, 12 ], "y": [ 21, 21 ] }, - { "group": "cleaning", "chance": 50, "repeat": [ 1 ], "x": [ 2, 2 ], "y": [ 18, 18 ] }, - { "group": "cleaning", "chance": 50, "repeat": [ 1 ], "x": [ 2, 2 ], "y": [ 20, 20 ] }, - { "group": "restaur_kitchen", "chance": 50, "repeat": [ 2 ], "x": [ 14, 15 ], "y": [ 21, 21 ] }, - { "group": "fast_kitchen", "chance": 50, "repeat": [ 2 ], "x": [ 16, 17 ], "y": [ 19, 19 ] }, - { "group": "office", "chance": 80, "repeat": [ 2 ], "x": [ 12, 12 ], "y": [ 17, 18 ] }, - { "group": "office", "chance": 80, "repeat": [ 2 ], "x": [ 9, 9 ], "y": [ 17, 17 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 3, 3 ], "y": [ 4, 4 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 7, 7 ], "y": [ 4, 4 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 3, 3 ], "y": [ 8, 8 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 7, 7 ], "y": [ 8, 8 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 3, 3 ], "y": [ 12, 12 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 3, 3 ], "y": [ 15, 15 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 8, 8 ], "y": [ 14, 14 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 9, 9 ], "y": [ 14, 14 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 10, 10 ], "y": [ 7, 7 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 13, 13 ], "y": [ 7, 7 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 14, 14 ], "y": [ 7, 7 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 17, 17 ], "y": [ 7, 7 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 18, 18 ], "y": [ 7, 7 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 21, 21 ], "y": [ 7, 7 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 13, 15 ], "y": [ 13, 13 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 17, 15 ], "y": [ 13, 13 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 19, 17 ], "y": [ 13, 13 ] }, - { "group": "coffee_table", "chance": 50, "repeat": [ 1 ], "x": [ 21, 19 ], "y": [ 13, 13 ] } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_diner_2ndfloor" ], - "object": { - "fill_ter": "t_floor", - "rows": [ - "************************", - "************************", - "************************", - "************************", - "*********---W--WW--W---*", - "*********->-hh...h..hh-*", - "*********-.-tt...t..ttW*", - "*--W---W--..hh...h..hh-*", - "*-....................-*", - "*W^..RRRRRRRRRRRRRR..^-*", - "*-h..R;;;;;;;;;;;;R...-*", - "*-t..R;;;;;;;;;;;;R..^-*", - "*-h..RRRRRRRRRRRRRR...-*", - "*W^...................W*", - "*-........hth.hth.hth.-*", - "*----.-----------------*", - "*4zz-.j-9zzzzzzzzzzzzz6*", - "*4zz-+--zzzzzzzzz&zzzz6*", - "*4zzzzzzzzzzzzzzzzzzzz6*", - "*4zzzzzzzzzzzz((zzzzzz6*", - "*4zzzzzzzzzzzzzzzzzzzz6*", - "*4zzzzzzzzzzzzzzzzzzzz6*", - "*4555555555555555555556*", - "************************" - ], - "palettes": [ "apartment_palette" ], - "terrain": { "*": "t_open_air", "9": "t_gutter_downspout", "R": "t_glass_railing", ";": "t_open_air_rooved" }, - "furniture": { "h": "f_chair" }, - "items": { "t": { "item": "coffee_table", "chance": 50 }, "j": { "item": "bar_trash", "chance": 65, "repeat": [ 1, 3 ] } } - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_diner_roof" ], - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - " ", - " ", - " ", - " ", - " |2222222222223 ", - " |..........X.3 ", - " |............3 ", - " |2222222|............3 ", - " |....................3 ", - " |....................3 ", - " |....................3 ", - " |...A.........A......3 ", - " |....................3 ", - " |.........&..........3 ", - " |...............==...3 ", - " |--|..35-------------3 ", - " |..3 ", - " |--3 ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "roof_palette" ] - } - } -] From 0bfee16ecc95ee00a564064758dad0e9e67256f3 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 19 May 2020 12:54:10 -0400 Subject: [PATCH 2/4] lint --- data/mods/Fuji_Structures/worldgen/regional_overlay.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/data/mods/Fuji_Structures/worldgen/regional_overlay.json b/data/mods/Fuji_Structures/worldgen/regional_overlay.json index 893e77b302e84..1e29a8439c315 100644 --- a/data/mods/Fuji_Structures/worldgen/regional_overlay.json +++ b/data/mods/Fuji_Structures/worldgen/regional_overlay.json @@ -13,13 +13,7 @@ "house_41": 50, "house_42": 50 }, - "shops": { - "s_gunstore": 500, - "s_apt": 400, - "s_apt_2": 400, - "s_games": 100, - "s_electronicstore": 400 - } + "shops": { "s_gunstore": 500, "s_apt": 400, "s_apt_2": 400, "s_games": 100, "s_electronicstore": 400 } } } ] From e2db1980e33678e4c60309ccc84fbd142a7790d6 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 19 May 2020 12:58:42 -0400 Subject: [PATCH 3/4] fix regional spawns --- data/json/regional_map_settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 9389e95b36b84..d7e55e659db62 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -883,10 +883,10 @@ "movie_theater": 75, "garage_gas_city": 250, "2fmotel_city": 50, - "cs_car_dealership": 100, + "cs_car_dealership": 200, "cs_car_showroom": 100, "s_cardealer": 200, - "s_camping": 100, + "s_camping": 300, "cs_gardening_allotment": 100, "cs_internet_cafe": 100, "cs_market_small": 100, From d1ab6c7961d5ecc71077674ace678ae130e2986c Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Tue, 19 May 2020 13:33:24 -0400 Subject: [PATCH 4/4] migrate vehicle group --- data/json/vehicle_groups.json | 23 +++++++++++++++++ .../Fuji_Structures/items/vehicle_groups.json | 25 ------------------- 2 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 data/mods/Fuji_Structures/items/vehicle_groups.json diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json index efd1459fe5a36..0e9e5bf4c3b39 100644 --- a/data/json/vehicle_groups.json +++ b/data/json/vehicle_groups.json @@ -705,6 +705,29 @@ [ "fire_truck", 150 ] ] }, + { + "type": "vehicle_group", + "id": "dealership", + "vehicles": [ + [ "car", 500 ], + [ "electric_car", 100 ], + [ "car_sports", 300 ], + [ "car_sports_atomic", 100 ], + [ "car_sports_electric", 300 ], + [ "suv", 500 ], + [ "suv_electric", 500 ], + [ "car_mini", 500 ], + [ "beetle", 500 ], + [ "motorcycle", 200 ], + [ "superbike", 200 ], + [ "motorcycle_sidecart", 100 ], + [ "scooter", 100 ], + [ "scooter_electric", 150 ], + [ "pickup", 800 ], + [ "hippie_van", 200 ], + [ "rv", 50 ] + ] + }, { "id": "park_playground_vehicles", "type": "vehicle_group", diff --git a/data/mods/Fuji_Structures/items/vehicle_groups.json b/data/mods/Fuji_Structures/items/vehicle_groups.json deleted file mode 100644 index 2962e36e0b99b..0000000000000 --- a/data/mods/Fuji_Structures/items/vehicle_groups.json +++ /dev/null @@ -1,25 +0,0 @@ -[ - { - "type": "vehicle_group", - "id": "dealership", - "vehicles": [ - [ "car", 500 ], - [ "electric_car", 100 ], - [ "car_sports", 300 ], - [ "car_sports_atomic", 100 ], - [ "car_sports_electric", 300 ], - [ "suv", 500 ], - [ "suv_electric", 500 ], - [ "car_mini", 500 ], - [ "beetle", 500 ], - [ "motorcycle", 200 ], - [ "superbike", 200 ], - [ "motorcycle_sidecart", 100 ], - [ "scooter", 100 ], - [ "scooter_electric", 150 ], - [ "pickup", 800 ], - [ "hippie_van", 200 ], - [ "rv", 50 ] - ] - } -]