Updates to regional_map_settings for 0.5.1

Also remove obsolete bandits_rv reference.

2 files changed, 103 insertions, 25 deletions

diff --git a/Mapgen/map_extras/mapgen_updates.json b/Mapgen/map_extras/mapgen_updates.json
index fcf1c51..3915abb 100644
--- a/Mapgen/map_extras/mapgen_updates.json
+++ b/Mapgen/map_extras/mapgen_updates.json
@@ -470,11 +470,5 @@
       },
       "npcs": { "@": { "class": "raider" } }
     }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "update_mapgen_id": "bandits_rv",
-    "object": { "place_nested": [ { "chunks": [ "bandits_rv" ], "x": 0, "y": 0 } ] }
   }
 ]
diff --git a/regional_map_settings.json b/regional_map_settings.json
index 00023ba..ec5bcae 100644
--- a/regional_map_settings.json
+++ b/regional_map_settings.json
@@ -9,7 +9,7 @@
         "t_region_groundcover": { "t_grass": 12, "t_grass_dead": 2, "t_dirt": 1 },
         "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": 3, "t_grass_tall": 1, "t_moss": 2, "t_dirt": 2 },
+        "t_region_groundcover_swamp": { "t_grass_long": 30, "t_grass_tall": 10, "t_moss": 20, "t_dirt": 20, "t_bog_iron": 1 },
         "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 },
@@ -65,7 +65,9 @@
           "t_tree_mulberry": 2,
           "t_tree_deadpine": 16,
           "t_tree_hickory_dead": 16,
-          "t_tree_dead": 16
+          "t_tree_dead": 16,
+          "t_tree_cacao": 2,
+          "t_tree_coca": 2
         },
         "t_region_tree_shade": {
           "t_tree": 64,
@@ -81,7 +83,9 @@
           "t_tree_coffee": 2,
           "t_tree_elderberry": 2,
           "t_tree_mulberry": 2,
-          "t_tree_dead": 2
+          "t_tree_dead": 2,
+          "t_tree_cacao": 2,
+          "t_tree_coca": 2
         },
         "t_region_tree_fruit": {
           "t_tree_young": 4,
@@ -93,7 +97,8 @@
           "t_tree_plum": 2,
           "t_tree_elderberry": 2,
           "t_tree_mulberry": 2,
-          "t_tree_dead": 4
+          "t_tree_dead": 4,
+          "t_tree_cacao": 2
         },
         "t_region_tree_nut": {
           "t_tree_young": 4,
@@ -149,7 +154,7 @@
         "f_region_water_plant": { "f_cattails": 15, "f_lilypad": 1, "f_lotus": 5 }
       }
     },
-    "river_scale": 1.0,
+    "river_scale": 1,
     "field_coverage": {
       "percent_coverage": 0.2,
       "default_ter": "t_shrub",
@@ -192,12 +197,12 @@
         "t_tree_deadpine": 0.05,
         "t_tree_hickory_dead": 0.05,
         "t_tree_dead": 0.05,
-        "t_shrub_blueberry": 8.0,
-        "t_shrub_strawberry": 5.0,
-        "t_shrub_blackberry": 5.0,
-        "t_shrub_raspberry": 8.0,
-        "t_shrub_huckleberry": 5.0,
-        "t_shrub_grape": 5.0,
+        "t_shrub_blueberry": 8,
+        "t_shrub_strawberry": 5,
+        "t_shrub_blackberry": 5,
+        "t_shrub_raspberry": 8,
+        "t_shrub_huckleberry": 5,
+        "t_shrub_grape": 5,
         "t_shrub_rose": 3,
         "t_shrub_hydrangea": 3,
         "t_shrub_lilac": 3,
@@ -210,11 +215,11 @@
         "f_bluebell": 3.5,
         "f_dahlia": 3.5,
         "f_datura": 0.2,
-        "f_dandelion": 5.0,
+        "f_dandelion": 5,
         "f_sunflower": 3.5,
         "f_mustard": 0.2
       },
-      "boosted_other_percent": 50.0
+      "boosted_other_percent": 50
     },
     "overmap_lake_settings": {
       "noise_threshold_lake": 0.25,
@@ -519,6 +524,7 @@
           "mx_military": 5,
           "mx_science": 12,
           "mx_collegekids": 15,
+          "mx_jabberwock": 1,
           "mx_portal": 5,
           "mx_crater": 60,
           "mx_portal_in": 3,
@@ -601,15 +607,54 @@
       "park_radius": 20,
       "park_sigma": 80,
       "houses": {
+        "2Story01": 50,
+        "2Story02": 50,
         "2storyModern01": 5,
+        "2storyModern02": 50,
+        "2StoryModern03": 50,
+        "2StoryModern04": 50,
+        "bungalow01": 50,
+        "bungalow02": 50,
+        "bungalow03": 50,
+        "bungalow04": 50,
+        "bungalow05": 50,
+        "bungalow06": 50,
+        "bungalow07": 50,
+        "bungalow08": 50,
+        "bungalow09": 50,
+        "bungalow10": 50,
+        "bungalow11": 50,
+        "bungalow12": 50,
+        "bungalow13": 50,
+        "bungalow14": 50,
+        "bungalow15": 50,
+        "bungalow16": 50,
+        "bungalow17": 50,
+        "bungalow18": 50,
+        "bungalow19": 50,
+        "bungalow20": 50,
+        "bungalow21": 50,
+        "bungalow22": 50,
+        "bungalow23": 50,
+        "bungalow24": 50,
+        "bungalow25": 50,
+        "bungalow26": 50,
         "house_w_1": 50,
         "house_two_story_basement": 50,
         "house_crack1": 5,
         "house_crack2": 5,
         "house_crack3": 5,
+        "house_coop01": 50,
         "house_wooded": 50,
         "house_prepper": 20,
         "house_prepper2": 10,
+        "house_fence01": 20,
+        "house_fence02": 20,
+        "house_fence03": 20,
+        "house_fence04": 20,
+        "house_fence05": 20,
+        "house_fence06": 20,
+        "house_fence07": 20,
         "house_fortified": 20,
         "duplex": 50,
         "house_duplex2": 50,
@@ -661,6 +706,7 @@
         "house_30": 50,
         "house_31": 50,
         "house_32": 50,
+        "house_33": 50,
         "house_garage": 50,
         "house_garage2": 50,
         "house_garage3": 50,
@@ -698,6 +744,21 @@
         "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,
+        "urban_19_victorian": 50,
+        "urban_20_duplex": 50,
+        "urban_21_house": 50,
+        "urban_22_house_pool": 50,
+        "urban_40_house": 50,
         "emptyresidentiallot": 20,
         "house_vacant": 20,
         "house_vacant2": 20,
@@ -724,7 +785,9 @@
         "pavilion_1": 100,
         "cemetery_small": 200,
         "Pond": 200,
-        "communitygarden": 200,
+        "community_garden": 65,
+        "communitygarden_1": 65,
+        "community_garden_2": 65,
         "publicgarden": 200,
         "cathedral": 50,
         "football_field": 25,
@@ -744,8 +807,27 @@
       "shops": {
         "bus_station": 200,
         "city_block_2": 300,
+        "abandoned_textile_mill": 20,
         "urban_13_dense_house_apt_house": 300,
         "urban_14_dense_house_mart_food": 200,
+        "urban_23_dense_office_theater": 100,
+        "urban_24_dense_bank_house": 100,
+        "urban_25_dense_diner_apt": 100,
+        "urban_26_dense_club": 100,
+        "urban_27_dense_barber_apt": 100,
+        "urban_28_dense_cafe_laundry": 100,
+        "urban_29_dense_row": 100,
+        "urban_30_dense_subway": 100,
+        "urban_31_police_station": 150,
+        "urban_32_fire_station": 150,
+        "urban_33_hotel": 150,
+        "urban_34_school": 150,
+        "urban_35_hospital": 130,
+        "urban_36_projects": 100,
+        "urban_37_office_tower_beehive": 100,
+        "urban_38_bar_hardware_house": 50,
+        "urban_39_market_subway_newspaper": 50,
+        "urban_41_library": 100,
         "town_hall": 150,
         "craft_shop": 200,
         "craft_shop_1": 200,
@@ -840,7 +922,7 @@
         "home_improvement": 200,
         "s_lot": 400,
         "s_arcade": 200,
-        "s_jewelry": 200,
+        "s_jewelry_shop": 200,
         "s_antique": 200,
         "s_gardening": 200,
         "museum": 100,
@@ -924,6 +1006,7 @@
         "shopping_plaza": 125,
         "movie_theater": 75,
         "garage_gas_city": 250,
+        "s_games": 80,
         "2fmotel_city": 50,
         "cs_car_dealership": 100,
         "cs_car_showroom": 100,
@@ -933,7 +1016,8 @@
         "cs_sex_shop": 100,
         "cs_tire_shop": 100,
         "homeless_shelter": 100,
-        "parking_garage": 200
+        "parking_garage": 200,
+        "afs_augmentation_clinic_1": 200
       }
     },
     "weather": {
@@ -941,9 +1025,9 @@
       "summer_temp": 16,
       "autumn_temp": 7,
       "winter_temp": -14,
-      "base_humidity": 70.0,
-      "base_pressure": 1015.0,
-      "base_acid": 0.0,
+      "base_humidity": 70,
+      "base_pressure": 1015,
+      "base_acid": 0,
       "base_wind": 3.4,
       "base_wind_distrib_peaks": 80,
       "base_wind_season_variation": 50,