From 5a45bcf441cfc7ba5d2adec823d7ce00075845d4 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 29 Nov 2024 13:24:56 +0000 Subject: [PATCH 1/6] Rename file before changing to an overlay to make the blame easier to follow hopefully --- .../No_Hope/{regional_map_settings.json => region_overlay.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/mods/No_Hope/{regional_map_settings.json => region_overlay.json} (100%) diff --git a/data/mods/No_Hope/regional_map_settings.json b/data/mods/No_Hope/region_overlay.json similarity index 100% rename from data/mods/No_Hope/regional_map_settings.json rename to data/mods/No_Hope/region_overlay.json From d259d657cb25c0b69cc6b7a0f6af9629e621b351 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 29 Nov 2024 13:25:22 +0000 Subject: [PATCH 2/6] Change No Hope's region settings to an overlay --- data/mods/No_Hope/region_overlay.json | 868 +------------------------- 1 file changed, 3 insertions(+), 865 deletions(-) diff --git a/data/mods/No_Hope/region_overlay.json b/data/mods/No_Hope/region_overlay.json index 7f900a5ff8ac9..e83c20a93e1de 100644 --- a/data/mods/No_Hope/region_overlay.json +++ b/data/mods/No_Hope/region_overlay.json @@ -1,457 +1,7 @@ [ { - "type": "region_settings", - "id": "default", - "//": "TODO: Change to an overlay", - "default_oter": [ - "open_air", - "open_air", - "open_air", - "open_air", - "open_air", - "open_air", - "open_air", - "open_air", - "open_air", - "open_air", - "field", - "solid_earth", - "empty_rock", - "empty_rock", - "deep_rock", - "deep_rock", - "deep_rock", - "deep_rock", - "deep_rock", - "deep_rock", - "deep_rock" - ], - "default_groundcover": [ [ "t_region_groundcover", 1 ] ], - "region_terrain_and_furniture": { - "terrain": { - "t_region_groundcover": { "t_grass": 12000, "t_grass_dead": 2000, "t_dirt": 1000 }, - "t_region_groundcover_urban": { "t_grass": 20, "t_grass_dead": 3 }, - "t_region_groundcover_forest": { "t_grass_long": 5, "t_grass_tall": 1, "t_moss": 1, "t_grass_dead": 3 }, - "t_region_groundcover_swamp": { "t_grass_long": 300, "t_grass_tall": 100, "t_moss": 200, "t_dirt": 200 }, - "t_region_groundcover_barren": { "t_dirt": 30, "t_grass_dead": 2, "t_railroad_rubble": 1 }, - "t_region_grass": { "t_grass": 1 }, - "t_region_soil": { "t_dirt": 1 }, - "t_region_shrub": { - "t_underbrush": 30, - "t_shrub": 15, - "t_fern": 5, - "t_shrub_blueberry": 2, - "t_shrub_strawberry": 2, - "t_shrub_blackberry": 2, - "t_shrub_raspberry": 2, - "t_shrub_huckleberry": 2, - "t_shrub_rose": 2, - "t_shrub_hydrangea": 2, - "t_shrub_lilac": 2, - "t_shrub_grape": 1 - }, - "t_region_shrub_plains": { "t_region_shrub": 1 }, - "t_region_shrub_fruit": { - "t_shrub_blueberry": 6, - "t_shrub_strawberry": 6, - "t_shrub_raspberry": 4, - "t_shrub_grape": 4, - "t_shrub_blackberry": 2, - "t_shrub_huckleberry": 2, - "t_shrub_peanut": 1 - }, - "t_region_shrub_decorative": { "t_shrub": 3, "t_fern": 1, "t_shrub_rose": 2, "t_shrub_hydrangea": 2, "t_shrub_lilac": 2, "t_bamboo_long": 1 }, - "t_region_tree_forest_dense": { - "t_tree": 18, - "t_tree_blackjack": 10, - "t_tree_hickory": 18, - "t_tree_pine": 9, - "t_tree_maple": 7, - "t_tree_birch": 7, - "t_tree_beech": 7, - "t_tree_cottonwood": 4, - "t_tree_elm": 4, - "t_tree_cherry": 4, - "t_tree_plum": 2, - "t_region_tree_dead": 5, - "t_region_tree_forest_other": 5 - }, - "t_region_tree_forest_other": { - "t_tree_willow": 15, - "t_tree_alder": 15, - "t_tree_chestnut": 10, - "t_tree_basswood": 10, - "t_tree_hazelnut": 10, - "t_tree_apple": 10, - "t_tree_coffee": 1, - "t_tree_apricot": 2, - "t_tree_peach": 1, - "t_tree_pear": 1, - "t_tree_elderberry": 10, - "t_tree_mulberry": 10, - "t_tree_juniper": 5 - }, - "t_region_tree_forest": { "t_region_tree_forest_dense": 2, "t_region_tree_forest_other": 1 }, - "t_region_tree": { - "t_tree": 128, - "t_tree_young": 128, - "t_tree_birch": 16, - "t_tree_elm": 16, - "t_tree_cottonwood": 16, - "t_tree_basswood": 16, - "t_tree_alder": 16, - "t_tree_pine": 32, - "t_tree_maple": 32, - "t_tree_willow": 32, - "t_tree_hickory": 16, - "t_tree_walnut": 8, - "t_tree_chestnut": 8, - "t_tree_hazelnut": 2, - "t_tree_beech": 2, - "t_tree_blackjack": 8, - "t_tree_coffee": 2, - "t_tree_apple": 2, - "t_tree_apricot": 2, - "t_tree_cherry": 2, - "t_tree_juniper": 2, - "t_tree_peach": 2, - "t_tree_pear": 2, - "t_tree_plum": 2, - "t_tree_elderberry": 2, - "t_tree_mulberry": 2, - "t_region_tree_dead": 48 - }, - "t_region_tree_shade": { - "t_tree": 64, - "t_tree_young": 32, - "t_tree_birch": 16, - "t_tree_elm": 16, - "t_tree_cottonwood": 16, - "t_tree_basswood": 16, - "t_tree_alder": 16, - "t_tree_maple": 32, - "t_tree_willow": 32, - "t_tree_hickory": 16, - "t_tree_chestnut": 8, - "t_tree_blackjack": 8, - "t_tree_coffee": 2, - "t_tree_elderberry": 2, - "t_tree_mulberry": 2, - "t_tree_dead": 2 - }, - "t_region_tree_fruit": { - "t_tree_young": 4, - "t_tree_apple": 2, - "t_tree_apricot": 2, - "t_tree_cherry": 2, - "t_tree_peach": 2, - "t_tree_pear": 2, - "t_tree_plum": 2, - "t_tree_elderberry": 2, - "t_tree_mulberry": 2, - "t_tree_dead": 4 - }, - "t_region_tree_dead": { - "t_tree_hickory_dead": 8, - "t_tree_dead": 7, - "t_tree_dead_warped": 1, - "t_tree_deadpine": 3, - "t_tree_deadpine_warped": 1 - }, - "t_region_tree_nut": { - "t_tree_hickory": 16, - "t_tree_hickory_dead": 16, - "t_tree_walnut": 8, - "t_tree_chestnut": 8, - "t_tree_young": 4, - "t_tree_beech": 2, - "t_tree_hazelnut": 2, - "t_tree_coffee": 2, - "t_tree_dead": 4 - }, - "t_region_tree_evergreen": { "t_tree_pine": 32, "t_tree_juniper": 16, "t_tree_deadpine": 2 } - }, - "furniture": { - "f_region_flower": { - "f_black_eyed_susan": 100, - "f_lily": 100, - "f_flower_tulip": 100, - "f_flower_spurge": 100, - "f_chamomile": 100, - "f_dandelion": 100, - "f_dahlia": 100, - "f_bluebell": 100, - "f_sunflower": 100 - }, - "f_region_flower_decorative": { - "f_lily": 4, - "f_flower_tulip": 4, - "f_black_eyed_susan": 3, - "f_bluebell": 2, - "f_maianthemum_stellatum": 2, - "f_flower_spurge": 1, - "f_dahlia": 1, - "f_salsify": 1, - "f_chicory": 1, - "f_sunflower": 1 - }, - "f_region_weed": { - "f_chamomile": 400, - "f_carrot_wild": 300, - "f_salsify": 300, - "f_datura": 300, - "f_japanese_knotweed": 300, - "f_bluebell": 200, - "f_burdock": 100, - "f_dahlia": 100, - "f_lily": 100, - "f_sunflower": 100, - "f_mustard": 100 - }, - "f_region_plain": { - "f_dandelion": 600, - "f_flower_spurge": 400, - "f_chamomile": 400, - "f_carrot_wild": 300, - "f_salsify": 300, - "f_datura": 300, - "f_japanese_knotweed": 200, - "f_dahlia": 200, - "f_maianthemum_stellatum": 200, - "f_mutpoppy": 200, - "f_black_eyed_susan": 100, - "f_flower_tulip": 100, - "f_mustard": 100, - "f_sunflower": 100, - "f_jerusalem_artichoke": 100, - "f_lily": 100, - "f_chicory": 100 - }, - "f_region_forest": { - "f_burdock": 2000, - "f_bluebell": 600, - "f_wild_sarsaparilla": 600, - "f_lily": 500, - "f_chamomile": 500, - "f_japanese_knotweed": 300, - "f_carrot_wild": 300, - "f_salsify": 300, - "f_dahlia": 200, - "f_mutpoppy": 100, - "f_maianthemum_stellatum": 100, - "f_wintergreen": 100 - }, - "f_region_forest_dense": { - "f_burdock": 2000, - "f_bluebell": 800, - "f_lily": 500, - "f_wild_sarsaparilla": 400, - "f_salsify": 300, - "f_wintergreen": 200 - }, - "f_region_forest_water": { "f_burdock": 4, "f_japanese_knotweed": 2, "f_lily": 1 }, - "f_region_water_plant": { "f_cattails": 15, "f_lilypad": 1, "f_lotus": 5 } - } - }, - "river_scale": 1.0, - "overmap_lake_settings": { - "noise_threshold_lake": 0.25, - "lake_size_min": 20, - "lake_depth": -5, - "shore_extendable_overmap_terrain": [ "forest", "forest_thick", "forest_water", "field" ], - "shore_extendable_overmap_terrain_aliases": [ - { "om_terrain": "island_forest", "om_terrain_match_type": "TYPE", "alias": "forest" }, - { "om_terrain": "island_forest_thick", "om_terrain_match_type": "TYPE", "alias": "forest_thick" }, - { "om_terrain": "island_forest_water", "om_terrain_match_type": "TYPE", "alias": "forest_water" }, - { "om_terrain": "island_field", "om_terrain_match_type": "TYPE", "alias": "field" } - ] - }, - "overmap_ocean_settings": { - "noise_threshold_ocean": 0.25, - "ocean_size_min": 100, - "ocean_depth": -9, - "ocean_start_north": 500, - "ocean_start_east": 10, - "ocean_start_west": 1000, - "ocean_start_south": 0, - "sandy_beach_width": 6 - }, - "overmap_ravine_settings": { "num_ravines": 0, "ravine_width": 3, "ravine_range": 45, "ravine_depth": -3 }, - "overmap_forest_settings": { - "noise_threshold_forest": 0.2, - "noise_threshold_forest_thick": 0.25, - "noise_threshold_swamp_adjacent_water": 0.3, - "noise_threshold_swamp_isolated": 0.6, - "river_floodplain_buffer_distance_min": 3, - "river_floodplain_buffer_distance_max": 15 - }, - "overmap_connection_settings": { - "intra_city_road_connection": "local_road", - "inter_city_road_connection": "local_road", - "trail_connection": "forest_trail", - "sewer_connection": "sewer_tunnel", - "subway_connection": "subway_tunnel", - "rail_connection": "local_railroad" - }, - "forest_mapgen_settings": { - "forest": { - "terrains": [ "forest", "special_forest" ], - "sparseness_adjacency_factor": 3, - "item_group": "forest", - "item_group_chance": 60, - "item_spawn_iterations": 1, - "clear_groundcover": false, - "groundcover": { "t_region_groundcover_forest": 1 }, - "clear_components": false, - "components": { - "trees": { "sequence": 0, "chance": 12, "clear_types": false, "types": { "t_region_tree_forest": 128, "t_tree_young": 32 } }, - "shrubs_and_flowers": { "sequence": 1, "chance": 10, "clear_types": false, "types": { "t_region_shrub": 120, "f_region_forest": 10 } }, - "clutter": { - "sequence": 2, - "chance": 80, - "clear_types": false, - "types": { - "t_trunk": 128, - "t_dirtmound": 128, - "f_boulder_small": 128, - "f_rubble_rock": 32, - "f_boulder_medium": 8, - "f_boulder_large": 1, - "t_pit": 1, - "t_pit_shallow": 1 - } - }, - "water": { "sequence": 3, "chance": 512, "clear_types": false, "types": { "t_puddle": 1 } } - }, - "clear_terrain_furniture": false, - "terrain_furniture": { } - }, - "forest_thick": { - "terrains": [ - "bandit_cabin", - "bandit_garage_1", - "bandit_garage_2", - "campsite", - "campsite_a", - "campsite_cabin_incomplete", - "campsite_field_biker", - "campsite_field_biker_destroyed", - "cave", - "central_lab_entrance", - "derelict_property", - "desolatebarn", - "forest_thick", - "forest_trail", - "forest_trail_intersection", - "homelesscamp", - "moonshine_still", - "moonshine_still_1", - "moonshine_still_2", - "natural_spring", - "special_forest_thick", - "spider_pit", - "standing_stones", - "ws_survivor_bunker_f0" - ], - "sparseness_adjacency_factor": 4, - "item_group": "forest", - "item_group_chance": 60, - "item_spawn_iterations": 1, - "clear_groundcover": false, - "groundcover": { "t_region_groundcover_forest": 1 }, - "clear_components": false, - "components": { - "trees": { "sequence": 0, "chance": 5, "clear_types": false, "types": { "t_region_tree_forest_dense": 100, "t_tree_young": 5 } }, - "shrubs_and_flowers": { "sequence": 1, "chance": 5, "clear_types": false, "types": { "t_region_shrub": 130, "f_region_forest_dense": 10 } }, - "clutter": { - "sequence": 2, - "chance": 64, - "clear_types": false, - "types": { - "t_trunk": 64, - "t_dirtmound": 64, - "f_boulder_small": 32, - "f_rubble_rock": 32, - "f_boulder_medium": 16, - "f_boulder_large": 4, - "t_pit": 1, - "t_pit_shallow": 1 - } - }, - "water": { "sequence": 3, "chance": 512, "clear_types": false, "types": { "t_puddle": 1 } } - }, - "clear_terrain_furniture": false, - "terrain_furniture": { } - }, - "forest_water": { - "terrains": [ "forest_water", "hunter_shack", "hunter_shack_1", "shipwreck_river_1", "shipwreck_river_2" ], - "sparseness_adjacency_factor": 2, - "item_group": "forest", - "item_group_chance": 60, - "item_spawn_iterations": 1, - "clear_groundcover": false, - "groundcover": { "t_region_groundcover_swamp": 1 }, - "clear_components": false, - "components": { - "trees": { - "sequence": 0, - "chance": 45, - "clear_types": false, - "types": { - "t_tree": 40, - "t_tree_young": 80, - "t_tree_pine": 40, - "t_tree_birch": 20, - "t_tree_elm": 20, - "t_tree_cottonwood": 20, - "t_tree_alder": 80, - "t_tree_maple": 40, - "t_tree_willow": 40, - "t_tree_walnut": 8, - "t_tree_chestnut": 8, - "t_tree_hazelnut": 2, - "t_tree_beech": 2, - "t_tree_hickory": 8, - "t_tree_apple": 2, - "t_tree_cherry": 2, - "t_tree_juniper": 2, - "t_tree_peach": 2, - "t_tree_pear": 2, - "t_tree_plum": 2, - "t_tree_elderberry": 2, - "t_tree_mulberry": 2, - "t_region_tree_dead": 90 - } - }, - "shrubs_and_flowers": { "sequence": 1, "chance": 15, "clear_types": false, "types": { "t_region_shrub": 80, "f_region_forest_water": 30 } }, - "clutter": { - "sequence": 2, - "chance": 75, - "clear_types": false, - "types": { "t_trunk": 1, "f_boulder_small": 2, "f_boulder_medium": 1 } - }, - "water": { - "sequence": 3, - "chance": 2, - "clear_types": false, - "types": { "t_swater_sh": 6, "t_swater_dp": 1, "t_water_murky": 12 } - } - }, - "clear_terrain_furniture": false, - "terrain_furniture": { "t_water_murky": { "chance": 2, "clear_furniture": false, "furniture": { "f_region_water_plant": 1 } } } - } - }, - "forest_trail_settings": { - "chance": 2, - "border_point_chance": 2, - "minimum_forest_size": 100, - "random_point_min": 4, - "random_point_max": 50, - "random_point_size_scalar": 100, - "trailhead_chance": 1, - "trailhead_road_distance": 6, - "trailheads": { "trailhead_basic": 1, "trailhead_outhouse": 1, "trailhead_shack": 1 } - }, + "type": "region_overlay", + "regions": [ "all" ], "map_extras": { "forest": { "chance": 40, @@ -685,417 +235,6 @@ "ocean_shore": { "chance": 1, "extras": { "mx_reed": 100 } }, "sewer": { "chance": 80, "extras": { "mx_null": 100 } } }, - "city": { - "shop_radius": 30, - "shop_sigma": 50, - "park_radius": 20, - "park_sigma": 80, - "houses": { - "2storyModern01": 5, - "2storyModern02": 50, - "2StoryModern03": 50, - "house_w_1": 50, - "house_two_story_basement": 50, - "multi_unit_two_story_basement": 40, - "multi_unit_three_story_basement": 30, - "house_crack1": 5, - "house_crack2": 5, - "house_crack3": 5, - "house_wooded": 50, - "house_prepper": 20, - "house_prepper2": 10, - "house_fortified": 20, - "duplex": 50, - "house_duplex2": 50, - "house_duplex3": 50, - "house_duplex4": 50, - "house_duplex5": 50, - "house_duplex6": 50, - "house_duplex7": 50, - "house_duplex8": 50, - "house_duplex9": 50, - "house_duplex10": 50, - "house_duplex11": 50, - "house_w_2": 50, - "house_w_3": 50, - "house_w_4": 50, - "house_w_5": 50, - "house_w_6": 50, - "house_01": 50, - "house_02": 50, - "house_03": 50, - "house_04": 50, - "house_05": 50, - "house_06": 50, - "house_07": 50, - "house_08": 50, - "house_09": 20, - "house_10": 50, - "house_11": 50, - "house_12": 50, - "house_13": 50, - "house_14": 50, - "house_15": 50, - "house_16": 50, - "house_17": 50, - "house_18": 50, - "house_19": 50, - "house_20": 50, - "house_21": 50, - "house_22": 50, - "house_23": 50, - "house_24": 50, - "house_25": 50, - "house_26": 50, - "house_27": 50, - "house_28": 50, - "house_29": 50, - "house_30": 50, - "house_31": 50, - "house_32": 50, - "house_33": 50, - "house_34": 50, - "house_35": 50, - "house_36": 50, - "house_37": 50, - "house_38": 50, - "house_39": 50, - "house_40": 50, - "house_41": 50, - "house_42": 50, - "house_garage": 50, - "house_garage2": 50, - "house_garage3": 50, - "house_garage4": 50, - "house_garage5": 50, - "house_garage6": 50, - "house_garage7": 50, - "house_garage8": 50, - "rural_house1": 50, - "rural_house2": 50, - "garden_house_1": 50, - "house_toolshed": 50, - "house_suicide": 20, - "house_quiverfull": 30, - "house_rv": 50, - "house_porch": 50, - "house_patio": 50, - "house_modern_1": 50, - "house_library": 50, - "house_detatched1": 50, - "house_detatched2": 50, - "house_detatched3": 50, - "house_detatched4": 50, - "house_detatched5": 50, - "house_detatched6": 50, - "house_detatched7": 50, - "house_detatched8": 50, - "house_detatched9": 50, - "house_detatched10": 50, - "house_dogs": 50, - "house_gardener": 50, - "house_inner_garden": 50, - "urban_1_house": 50, - "urban_2_house": 50, - "urban_dd_house": 1, - "urban_3_house": 50, - "urban_4_house_basement": 50, - "urban_5_house": 50, - "urban_6_house": 50, - "urban_7_house_garden": 50, - "urban_8_house_brick_garden": 50, - "urban_9_house_garage_loft": 50, - "urban_10_house_brick_pool": 50, - "urban_11_house_brick": 50, - "urban_12_house": 50, - "urban_15_house": 50, - "urban_16_house_ranch": 50, - "urban_17_house_ranch": 50, - "urban_18_victorian": 50, - "emptyresidentiallot": 20, - "house_vacant": 7, - "house_vacant1": 7, - "house_vacant2": 7, - "house_vacant3": 7, - "apartments_con_new": 10, - "apartments_mod_new": 10, - "s_apt": 30, - "s_apt_2": 30, - "school": 15, - "motel_city": 10, - "fishing_pond_city": 10 - }, - "parks": { - "park": 50, - "park_2": 50, - "park_3": 50, - "park_4": 50, - "park_5": 50, - "park_6": 50, - "park_7": 50, - "pool": 20, - "pool_1": 20, - "pool_2": 20, - "pool_3": 20, - "pool_4": 20, - "pool_5": 20, - "pool_6": 20, - "playground": 40, - "playground_1": 40, - "dog_park": 20, - "volleyball_court": 30, - "tennis_court": 30, - "baskeball_court": 30, - "skate_park_ramp": 20, - "skate_park": 20, - "park_maze": 10, - "park_maze_2": 10, - "small_wooded_trail": 30, - "small_wooded_trail_2": 30, - "pavilion": 100, - "pavilion_1": 100, - "cemetery_small": 200, - "Pond": 200, - "communitygarden": 75, - "communitygarden_2": 75, - "communitygarden_3": 75, - "publicgarden": 100, - "publicgarden_2": 100, - "cathedral": 50, - "football_field": 25, - "baseball_field": 50, - "botanical_garden": 100, - "zoo": 25, - "stadium": 25, - "stadium_football": 25, - "cemetery_city": 50, - "public_pond_city": 50, - "cemetery_religious_city": 25, - "cs_private_park": 100, - "cs_public_art_piece": 100, - "cs_public_space": 100, - "cs_city_dump_small": 100, - "cs_open_sewer": 100 - }, - "shops": { - "bus_station": 200, - "city_block_2": 300, - "textile_mill_museum": 50, - "abandoned_textile_mill": 20, - "s_apt": 50, - "s_apt_2": 50, - "urban_13_dense_house_apt_house": 300, - "urban_14_dense_house_mart_food": 200, - "urban_25_dense_diner_apt": 200, - "urban_29_dense_row": 200, - "town_hall": 150, - "craft_shop": 200, - "craft_shop_1": 200, - "craft_shop_2": 200, - "craft_shop_3": 200, - "s_gas": 500, - "s_gas_1": 500, - "s_pharm": 300, - "s_pharm_1": 300, - "s_cosmetic": 300, - "s_grocery": 1500, - "s_grocery_1": 1500, - "s_hardware": 400, - "s_hardware_1": 400, - "s_hardware_2": 400, - "s_hardware_3": 400, - "s_hunting": 300, - "s_sports": 500, - "dojo": 200, - "dojo_1": 200, - "gym": 100, - "gym_fitness": 200, - "gym_fitness_1": 200, - "s_liquor": 500, - "s_gun": 200, - "s_gun_looted": 200, - "s_gun_1": 200, - "s_gun_2": 200, - "s_gun_3": 200, - "s_gun_3_looted": 200, - "s_gun_4": 200, - "s_gun_4_looted": 200, - "s_gunstore": 200, - "s_gunstore_looted": 200, - "s_clothes": 450, - "s_clothes_1": 200, - "s_clothes_2": 200, - "s_clothes_3": 100, - "s_clothes_4": 300, - "s_clothes_5": 100, - "s_clothes_6": 450, - "s_library": 200, - "s_library_1": 200, - "s_library_2": 200, - "s_bookstore": 200, - "s_bookstore_1": 200, - "s_bookstore_2": 200, - "s_restaurant": 400, - "s_restaurant_foodplace": 400, - "s_restaurant_1": 400, - "s_restaurant_2": 400, - "s_restaurant_3": 400, - "s_diner": 400, - "sub_station": 1600, - "bank": 300, - "bank_1": 300, - "s_pizza_parlor": 400, - "s_pizza_parlor_1": 400, - "bar": 400, - "bar_1": 400, - "s_electronics": 400, - "s_electronics_1": 400, - "s_electronicstore": 400, - "pawn": 300, - "pawn_1": 300, - "pawn_pf": 50, - "mil_surplus": 200, - "mil_surplus_1": 200, - "mil_surplus_2": 200, - "s_garage": 300, - "s_garage_1": 300, - "s_garage_2": 300, - "station_radio": 300, - "station_radio_1": 300, - "office_doctor": 200, - "office_doctor_1": 200, - "office_doctor_2": 200, - "office_tower_collapsed": 250, - "s_restaurant_fast": 400, - "s_restaurant_fast_1": 400, - "s_restaurant_coffee": 200, - "s_restaurant_coffee_1": 200, - "s_restaurant_coffee_2": 100, - "s_teashop": 100, - "s_teashop_1": 100, - "bowling_alley": 200, - "church": 200, - "church_1": 200, - "office_cubical": 200, - "office_cubical_1": 200, - "furniture": 200, - "abstorefront": 200, - "abstorefront_1": 200, - "abstorefront_2": 200, - "police": 100, - "police_1": 100, - "police_2": 100, - "police_dept": 1250, - "fire_station": 200, - "fire_station_1": 200, - "home_improvement": 200, - "s_lot": 400, - "s_arcade": 200, - "s_games": 200, - "s_jewelry_shop": 200, - "s_antique": 200, - "s_gardening": 200, - "s_dive_shop": 300, - "museum": 100, - "s_music": 200, - "s_laundromat": 100, - "s_laundromat_1": 100, - "veterinarian": 200, - "animalpound": 200, - "animalshelter": 100, - "mortuary": 100, - "smallscrapyard": 100, - "stripclub": 100, - "stripclub_1": 100, - "stripclub_2": 100, - "orchard": 200, - "dispensary": 100, - "dispensary_1": 100, - "dispensary_2": 100, - "headshop": 100, - "small_office": 200, - "art_gallery": 200, - "small_storage_units": 150, - "small_storage_units_1": 150, - "construction_site": 600, - "post_office": 200, - "post_office_1": 200, - "candy_shop": 200, - "candy_shop_1": 200, - "bakery": 200, - "icecream_shop": 200, - "s_butcher": 200, - "s_butcher_1": 200, - "s_butcher_2": 200, - "s_bike_shop": 100, - "s_bike_shop_1": 100, - "paintball_field": 100, - "paintball_field_1": 100, - "smoke_lounge": 100, - "smoke_lounge_1": 100, - "gambling_hall": 100, - "gambling_hall_1": 100, - "music_venue": 100, - "music_venue_1": 100, - "dump": 100, - "recyclecenter": 100, - "recyclecenter_1": 100, - "recyclecenter_2": 100, - "landfill": 100, - "warehouse": 100, - "abandonedwarehouse": 100, - "abandonedwarehouse_1": 100, - "abandonedwarehouse_2": 100, - "abandonedwarehouse_3": 100, - "abandonedwarehouse_4": 100, - "emptycommerciallot": 100, - "lancenter": 100, - "lancenter_1": 100, - "dollarstore": 200, - "dollarstore_1": 200, - "s_vfw": 100, - "s_daycare": 100, - "s_thrift": 100, - "s_petstore": 100, - "s_petstore_1": 100, - "s_petstore_2": 100, - "megastore": 150, - "hotel_1": 75, - "hotel_2": 75, - "hotel_3": 75, - "hospital": 175, - "urban_35_hospital": 175, - "public_works": 200, - "office_tower": 150, - "office_tower_2": 150, - "office_skyscraper": 300, - "office_tower_large": 300, - "office_tower_hiddenlab": 50, - "mall": 100, - "home_improvement_superstore_new": 150, - "lumberyard": 75, - "landscaping_supply_co": 150, - "storage_units_large": 125, - "storage_units_medium": 125, - "shopping_plaza": 125, - "movie_theater": 75, - "garage_gas_city": 250, - "2fmotel_city": 50, - "cs_car_dealership": 200, - "cs_car_showroom": 100, - "s_cardealer": 200, - "s_camping": 300, - "cs_gardening_allotment": 100, - "cs_internet_cafe": 100, - "cs_market_small": 100, - "cs_sex_shop": 100, - "cs_tire_shop": 100, - "homeless_shelter": 100, - "parking_garage": 200, - "salon": 500, - "strip_mall": 750 - } - }, "weather": { "base_temperature": 6.5, "base_humidity": 90.0, @@ -1103,7 +242,6 @@ "base_wind": 3.4, "base_wind_distrib_peaks": 80, "base_wind_season_variation": 50 - }, - "overmap_feature_flag_settings": { "clear_blacklist": false, "blacklist": [ ], "clear_whitelist": false, "whitelist": [ ] } + } } ] From 44564f101d93902ceaf0b121b62e1ce749f8f1ae Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:17:18 +0000 Subject: [PATCH 3/6] Remove null sewer extras --- .../overmap/overmap_terrain/overmap_terrain_waste_junk.json | 3 +-- data/json/regional_map_settings.json | 1 - data/mods/No_Hope/region_overlay.json | 3 +-- data/mods/TropiCataclysm/tropical_regional_map_settings.json | 3 +-- data/mods/desert_region/desert_regional_map_settings.json | 3 +-- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json index 692ba1e708938..cc1c0a243ebb0 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json @@ -5,8 +5,7 @@ "vision_levels": "underground_dirt", "name": "sewer", "color": "green", - "see_cost": "full_high", - "extras": "sewer" + "see_cost": "full_high" }, { "type": "overmap_terrain", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 1a1452a6ed7b8..a17d60e66b0ee 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -751,7 +751,6 @@ }, "river": { "chance": 1, "extras": { "mx_null": 66, "mx_riverside_boat": 1, "mx_reed": 33 } }, "lake_shore": { "chance": 2, "extras": { "mx_reed": 100 } }, - "sewer": { "chance": 80, "extras": { "mx_null": 100 } }, "agricultural": { "chance": 38, "extras": { diff --git a/data/mods/No_Hope/region_overlay.json b/data/mods/No_Hope/region_overlay.json index e83c20a93e1de..51ba0961099a9 100644 --- a/data/mods/No_Hope/region_overlay.json +++ b/data/mods/No_Hope/region_overlay.json @@ -232,8 +232,7 @@ }, "river": { "chance": 3, "extras": { "mx_reed": 100 } }, "lake_shore": { "chance": 2, "extras": { "mx_reed": 100 } }, - "ocean_shore": { "chance": 1, "extras": { "mx_reed": 100 } }, - "sewer": { "chance": 80, "extras": { "mx_null": 100 } } + "ocean_shore": { "chance": 1, "extras": { "mx_reed": 100 } } }, "weather": { "base_temperature": 6.5, diff --git a/data/mods/TropiCataclysm/tropical_regional_map_settings.json b/data/mods/TropiCataclysm/tropical_regional_map_settings.json index 5e3581d7d61b2..1b66ca9cfd226 100644 --- a/data/mods/TropiCataclysm/tropical_regional_map_settings.json +++ b/data/mods/TropiCataclysm/tropical_regional_map_settings.json @@ -730,8 +730,7 @@ } }, "river": { "chance": 3, "extras": { "mx_reed": 100 } }, - "lake_shore": { "chance": 2, "extras": { "mx_reed": 100 } }, - "sewer": { "chance": 80, "extras": { "mx_null": 100 } } + "lake_shore": { "chance": 2, "extras": { "mx_reed": 100 } } }, "city": { "shop_radius": 30, diff --git a/data/mods/desert_region/desert_regional_map_settings.json b/data/mods/desert_region/desert_regional_map_settings.json index 47b13c5bfa430..7596777116a2e 100644 --- a/data/mods/desert_region/desert_regional_map_settings.json +++ b/data/mods/desert_region/desert_regional_map_settings.json @@ -366,8 +366,7 @@ } }, "river": { "chance": 3, "extras": { "mx_reed": 100 } }, - "lake_shore": { "chance": 2, "extras": { "mx_reed": 100 } }, - "sewer": { "chance": 80, "extras": { "mx_null": 100 } } + "lake_shore": { "chance": 2, "extras": { "mx_reed": 100 } } }, "city": { "shop_radius": 30, From b67d0903e0cae6977e562d17387b425857aae804 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:29:01 +0000 Subject: [PATCH 4/6] Remove now redundant same weight extras --- data/mods/No_Hope/region_overlay.json | 169 +------------------------- 1 file changed, 2 insertions(+), 167 deletions(-) diff --git a/data/mods/No_Hope/region_overlay.json b/data/mods/No_Hope/region_overlay.json index 51ba0961099a9..93b4ba0b5db85 100644 --- a/data/mods/No_Hope/region_overlay.json +++ b/data/mods/No_Hope/region_overlay.json @@ -6,37 +6,10 @@ "forest": { "chance": 40, "extras": { - "mx_blackberry_patch": 1000, - "mx_point_dead_vegetation": 500, - "mx_point_burned_ground": 500, - "mx_grove": 500, - "mx_shrubbery": 500, - "mx_spider": 200, - "mx_clearcut": 125, - "mx_pond": 125, - "mx_pond_forest": 125, - "mx_pond_forest_2": 125, - "mx_clay_deposit": 125, - "mx_knotweed_patch": 120, - "mx_nest_wasp": 50, - "mx_grass2": 40, - "mx_casings": 30, - "mx_fallen_shed": 30, - "mx_corpses": 30, - "mx_collegekids": 25, - "mx_grass": 20, "mx_science": 20, - "mx_toxic_waste": 10, "mx_crater": 10, "mx_supplydrop": 8, "mx_military": 8, - "mx_drugdeal": 8, - "mx_mass_grave": 5, - "mx_portal": 3, - "mx_portal_in": 3, - "mx_helicopter": 1, - "mx_exocrash_1": 1, - "mx_exocrash_2": 1, "mx_bandits_ambush": 5, "mx_bandits_grave": 2, "mx_bandits_outpost": 2 @@ -45,38 +18,10 @@ "forest_thick": { "chance": 30, "extras": { - "mx_blackberry_patch": 1300, - "mx_grove": 500, - "mx_shrubbery": 500, - "mx_point_dead_vegetation": 500, - "mx_point_burned_ground": 500, - "mx_spider": 200, - "mx_clearcut": 125, - "mx_pond": 125, - "mx_pond_forest": 125, - "mx_pond_forest_2": 125, - "mx_clay_deposit": 125, - "mx_knotweed_patch": 100, - "mx_casings": 30, - "mx_corpses": 30, "mx_science": 20, - "mx_nest_wasp": 25, "mx_collegekids": 25, - "mx_drugdeal": 20, - "mx_grass2": 20, - "mx_fallen_shed": 20, - "mx_toxic_waste": 15, "mx_crater": 10, - "mx_grass": 10, - "mx_military": 8, - "mx_mass_grave": 5, "mx_supplydrop": 5, - "mx_portal": 3, - "mx_portal_in": 3, - "mx_jabberwock": 1, - "mx_exocrash_1": 1, - "mx_helicopter": 1, - "mx_exocrash_2": 1, "mx_bandits_ambush": 5, "mx_bandits_grave": 2, "mx_bandits_outpost": 2 @@ -85,30 +30,10 @@ "forest_water": { "chance": 20, "extras": { - "mx_pond": 240, - "mx_pond_swamp": 240, - "mx_pond_swamp_2": 240, - "mx_spider": 200, - "mx_clay_deposit": 140, - "mx_knotweed_patch": 140, - "mx_nest_dermatik": 75, - "mx_point_dead_vegetation": 60, "mx_science": 50, "mx_military": 25, "mx_supplydrop": 25, "mx_crater": 20, - "mx_drugdeal": 20, - "mx_fallen_shed": 10, - "mx_casings": 60, - "mx_corpses": 80, - "mx_grass2": 20, - "mx_grass": 10, - "mx_toxic_waste": 10, - "mx_portal": 8, - "mx_portal_in": 7, - "mx_helicopter": 5, - "mx_exocrash_1": 1, - "mx_exocrash_2": 1, "mx_bandits_ambush": 5, "mx_bandits_grave": 2, "mx_bandits_outpost": 2 @@ -117,32 +42,8 @@ "field": { "chance": 6, "extras": { - "mx_grass": 3500, - "mx_grass2": 3500, - "mx_trees2": 800, - "mx_point_burned_ground": 500, - "mx_point_dead_vegetation": 500, - "mx_trees": 500, - "mx_knotweed_patch": 250, - "mx_fallen_shed": 200, - "mx_pond": 200, - "mx_casings": 200, "mx_crater": 150, - "mx_nest_wasp": 50, - "mx_mass_grave": 50, - "mx_grave": 50, "mx_supplydrop": 40, - "mx_Trapdoor_spider_den": 40, - "mx_collegekids": 30, - "mx_drugdeal": 30, - "mx_corpses": 30, - "mx_toxic_waste": 10, - "mx_portal": 10, - "mx_portal_in": 10, - "mx_science": 10, - "mx_military": 4, - "mx_exocrash_1": 5, - "mx_exocrash_2": 5, "mx_bandits_ambush": 10, "mx_bandits_campsite": 10, "mx_bandits_grave": 10, @@ -155,84 +56,18 @@ "mx_helicopter": 10, "mx_military": 50, "mx_science": 400, - "mx_collegekids": 500, - "mx_roadblock": 830, - "mx_roadblock_mil": 170, "mx_bandits_block": 800, "mx_drugdeal": 300, "mx_supplydrop": 100, - "mx_portal": 50, "mx_crater": 100, - "mx_portal_in": 40, - "mx_roadworks": 1000, - "mx_mayhem": 500, - "mx_casings": 1000, - "mx_corpses": 300, - "mx_prison_bus": 150, - "mx_prison_van": 10, - "mx_exocrash_1": 5, - "mx_exocrash_2": 5, "mx_bandits_ambush": 100 } }, - "bridgehead_ground": { "chance": 5, "extras": { "mx_minefield": 100 } }, - "road_nesw_manhole": { "chance": 20, "extras": { "mx_city_trap": 100 } }, "build": { "chance": 90, - "extras": { - "mx_bugout": 20, - "mx_house_spider": 40, - "mx_house_wasp": 30, - "mx_military": 5, - "mx_science": 12, - "mx_collegekids": 15, - "mx_portal": 5, - "mx_crater": 60, - "mx_portal_in": 3, - "mx_point_burned_ground": 5, - "mx_casings": 30, - "mx_looters": 10, - "mx_corpses": 30, - "mx_bandits_ambush": 10, - "mx_bandits_hideout": 10 - } - }, - "marloss": { "chance": 20, "extras": { "mx_marloss_pilgrimage": 100 } }, - "subway": { - "chance": 75, - "extras": { "mx_military": 5, "mx_science": 12, "mx_drugdeal": 5, "mx_casings": 10, "mx_bandits_ambush": 5 } - }, - "lab_subway": { "chance": 25, "extras": { "mx_military": 5, "mx_science": 15, "mx_portal": 3, "mx_portal_in": 3 } }, - "research_facility_lot": { - "chance": 3, - "extras": { - "mx_helicopter": 15, - "mx_military": 65, - "mx_collegekids": 1, - "mx_portal": 200, - "mx_crater": 180, - "mx_portal_in": 30, - "mx_point_burned_ground": 100, - "mx_casings": 30, - "mx_exocrash_1": 1, - "mx_exocrash_2": 1 - } - }, - "research_facility_interior": { - "chance": 2, - "extras": { - "mx_jabberwock": 1, - "mx_military": 5, - "mx_portal": 100, - "mx_crater": 300, - "mx_portal_in": 40, - "mx_point_burned_ground": 125, - "mx_casings": 30 - } + "extras": { "mx_bugout": 20, "mx_science": 12, "mx_crater": 60, "mx_bandits_ambush": 10, "mx_bandits_hideout": 10 } }, - "river": { "chance": 3, "extras": { "mx_reed": 100 } }, - "lake_shore": { "chance": 2, "extras": { "mx_reed": 100 } }, - "ocean_shore": { "chance": 1, "extras": { "mx_reed": 100 } } + "subway": { "chance": 100, "extras": { "mx_casings": 10, "mx_bandits_ambush": 5 } } }, "weather": { "base_temperature": 6.5, From 906884d8fc31e143e57cf294aa4e3a4509a306d1 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:31:50 +0000 Subject: [PATCH 5/6] Remove now redundant extra chance fields --- data/mods/No_Hope/region_overlay.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/data/mods/No_Hope/region_overlay.json b/data/mods/No_Hope/region_overlay.json index 93b4ba0b5db85..927204b62dc09 100644 --- a/data/mods/No_Hope/region_overlay.json +++ b/data/mods/No_Hope/region_overlay.json @@ -4,7 +4,6 @@ "regions": [ "all" ], "map_extras": { "forest": { - "chance": 40, "extras": { "mx_science": 20, "mx_crater": 10, @@ -16,7 +15,6 @@ } }, "forest_thick": { - "chance": 30, "extras": { "mx_science": 20, "mx_collegekids": 25, @@ -28,7 +26,6 @@ } }, "forest_water": { - "chance": 20, "extras": { "mx_science": 50, "mx_military": 25, @@ -40,7 +37,6 @@ } }, "field": { - "chance": 6, "extras": { "mx_crater": 150, "mx_supplydrop": 40, @@ -51,7 +47,6 @@ } }, "road": { - "chance": 75, "extras": { "mx_helicopter": 10, "mx_military": 50, @@ -63,11 +58,8 @@ "mx_bandits_ambush": 100 } }, - "build": { - "chance": 90, - "extras": { "mx_bugout": 20, "mx_science": 12, "mx_crater": 60, "mx_bandits_ambush": 10, "mx_bandits_hideout": 10 } - }, - "subway": { "chance": 100, "extras": { "mx_casings": 10, "mx_bandits_ambush": 5 } } + "build": { "extras": { "mx_bugout": 20, "mx_science": 12, "mx_crater": 60, "mx_bandits_ambush": 10, "mx_bandits_hideout": 10 } }, + "subway": { "extras": { "mx_casings": 10, "mx_bandits_ambush": 5 } } }, "weather": { "base_temperature": 6.5, From 199750b906b8b34f29cd0fa8c5b25b68b75ed034 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:32:04 +0000 Subject: [PATCH 6/6] Remove now redundant weather fields --- data/mods/No_Hope/region_overlay.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/mods/No_Hope/region_overlay.json b/data/mods/No_Hope/region_overlay.json index 927204b62dc09..5f89cda0c30a1 100644 --- a/data/mods/No_Hope/region_overlay.json +++ b/data/mods/No_Hope/region_overlay.json @@ -61,13 +61,6 @@ "build": { "extras": { "mx_bugout": 20, "mx_science": 12, "mx_crater": 60, "mx_bandits_ambush": 10, "mx_bandits_hideout": 10 } }, "subway": { "extras": { "mx_casings": 10, "mx_bandits_ambush": 5 } } }, - "weather": { - "base_temperature": 6.5, - "base_humidity": 90.0, - "base_pressure": 1015.0, - "base_wind": 3.4, - "base_wind_distrib_peaks": 80, - "base_wind_season_variation": 50 - } + "weather": { "base_humidity": 90.0 } } ]