refactor!: Mainline Urban_Development mod (cataclysmbnteam#3817)

* mainline `Urban_dev` * Add files via upload * Add files via upload * Update regional_map_settings.json * Update specials.json * Update acidia_commercial_palette.json * Update specials.json * Delete data/mods/Urban_Development directory * ci: remove `mods/Urban_Development` Co-authored-by: acadia <stm.vol@gmail.com> --------- Co-authored-by: scarf <greenscarf005@gmail.com> Co-authored-by: acadia <stm.vol@gmail.com>
chaosvolt · Dec 3, 2023 · 503687f · 503687f
1 parent 14aa7d8
commit 503687f
Show file tree

Hide file tree

Showing 45 changed files with 866 additions and 907 deletions.
diff --git a/.github/semantic.yml b/.github/semantic.yml
@@ -47,7 +47,6 @@ scopes:
   - mods/RL_Classes
   - mods/StatsThroughSkills
   - mods/UDP_BN_FAKE_SNOW
-  - mods/Urban_Development
   - mods/Zombie_Nightvision
   - mods/aftershock
   - mods/alt_map_key

diff --git a/...ding_jsons/urban_10_house_brick_pool.json → ...ity_blocks/urban_10_house_brick_pool.json b/...ding_jsons/urban_10_house_brick_pool.json → ...ity_blocks/urban_10_house_brick_pool.json
diff --git a/.../building_jsons/urban_11_house_brick.json → ...gen/city_blocks/urban_11_house_brick.json b/.../building_jsons/urban_11_house_brick.json → ...gen/city_blocks/urban_11_house_brick.json
diff --git a/...opment/building_jsons/urban_12_house.json → ...on/mapgen/city_blocks/urban_12_house.json b/...opment/building_jsons/urban_12_house.json → ...on/mapgen/city_blocks/urban_12_house.json
diff --git a/...opment/building_jsons/urban_15_house.json → ...on/mapgen/city_blocks/urban_15_house.json b/...opment/building_jsons/urban_15_house.json → ...on/mapgen/city_blocks/urban_15_house.json
diff --git a/.../building_jsons/urban_16_house_ranch.json → ...gen/city_blocks/urban_16_house_ranch.json b/.../building_jsons/urban_16_house_ranch.json → ...gen/city_blocks/urban_16_house_ranch.json
diff --git a/.../building_jsons/urban_17_house_ranch.json → ...gen/city_blocks/urban_17_house_ranch.json b/.../building_jsons/urban_17_house_ranch.json → ...gen/city_blocks/urban_17_house_ranch.json
diff --git a/...nt/building_jsons/urban_18_victorian.json → ...apgen/city_blocks/urban_18_victorian.json b/...nt/building_jsons/urban_18_victorian.json → ...apgen/city_blocks/urban_18_victorian.json
diff --git a/...nt/building_jsons/urban_19_victorian.json → ...apgen/city_blocks/urban_19_victorian.json b/...nt/building_jsons/urban_19_victorian.json → ...apgen/city_blocks/urban_19_victorian.json
diff --git a/...pment/building_jsons/urban_20_duplex.json → ...n/mapgen/city_blocks/urban_20_duplex.json b/...pment/building_jsons/urban_20_duplex.json → ...n/mapgen/city_blocks/urban_20_duplex.json
diff --git a/...opment/building_jsons/urban_21_house.json → ...on/mapgen/city_blocks/urban_21_house.json b/...opment/building_jsons/urban_21_house.json → ...on/mapgen/city_blocks/urban_21_house.json
diff --git a/...t/building_jsons/urban_22_house_pool.json → ...pgen/city_blocks/urban_22_house_pool.json b/...t/building_jsons/urban_22_house_pool.json → ...pgen/city_blocks/urban_22_house_pool.json
diff --git a/..._jsons/urban_23_dense_office_theater.json → ...blocks/urban_23_dense_office_theater.json b/..._jsons/urban_23_dense_office_theater.json → ...blocks/urban_23_dense_office_theater.json
diff --git a/...ding_jsons/urban_24_dense_bank_house.json → ...ity_blocks/urban_24_dense_bank_house.json b/...ding_jsons/urban_24_dense_bank_house.json → ...ity_blocks/urban_24_dense_bank_house.json
diff --git a/...lding_jsons/urban_25_dense_diner_apt.json → ...city_blocks/urban_25_dense_diner_apt.json b/...lding_jsons/urban_25_dense_diner_apt.json → ...city_blocks/urban_25_dense_diner_apt.json
diff --git a/...t/building_jsons/urban_26_dense_club.json → ...pgen/city_blocks/urban_26_dense_club.json b/...t/building_jsons/urban_26_dense_club.json → ...pgen/city_blocks/urban_26_dense_club.json
diff --git a/...ding_jsons/urban_27_dense_barber_apt.json → ...ity_blocks/urban_27_dense_barber_apt.json b/...ding_jsons/urban_27_dense_barber_apt.json → ...ity_blocks/urban_27_dense_barber_apt.json
diff --git a/...ng_jsons/urban_28_dense_cafe_laundry.json → ...y_blocks/urban_28_dense_cafe_laundry.json b/...ng_jsons/urban_28_dense_cafe_laundry.json → ...y_blocks/urban_28_dense_cafe_laundry.json
diff --git a/...nt/building_jsons/urban_29_dense_row.json → ...apgen/city_blocks/urban_29_dense_row.json b/...nt/building_jsons/urban_29_dense_row.json → ...apgen/city_blocks/urban_29_dense_row.json
diff --git a/...building_jsons/urban_30_dense_subway.json → ...en/city_blocks/urban_30_dense_subway.json b/...building_jsons/urban_30_dense_subway.json → ...en/city_blocks/urban_30_dense_subway.json
diff --git a/...ilding_jsons/urban_31_police_station.json → .../city_blocks/urban_31_police_station.json b/...ilding_jsons/urban_31_police_station.json → .../city_blocks/urban_31_police_station.json
diff --git a/...building_jsons/urban_32_fire_station.json → ...en/city_blocks/urban_32_fire_station.json b/...building_jsons/urban_32_fire_station.json → ...en/city_blocks/urban_32_fire_station.json
diff --git a/...opment/building_jsons/urban_33_hotel.json → ...on/mapgen/city_blocks/urban_33_hotel.json b/...opment/building_jsons/urban_33_hotel.json → ...on/mapgen/city_blocks/urban_33_hotel.json
diff --git a/...pment/building_jsons/urban_34_school.json → ...n/mapgen/city_blocks/urban_34_school.json b/...pment/building_jsons/urban_34_school.json → ...n/mapgen/city_blocks/urban_34_school.json
diff --git a/...ent/building_jsons/urban_35_hospital.json → ...mapgen/city_blocks/urban_35_hospital.json b/...ent/building_jsons/urban_35_hospital.json → ...mapgen/city_blocks/urban_35_hospital.json
diff --git a/...ent/building_jsons/urban_36_projects.json → ...mapgen/city_blocks/urban_36_projects.json b/...ent/building_jsons/urban_36_projects.json → ...mapgen/city_blocks/urban_36_projects.json
diff --git a/..._jsons/urban_37_office_tower_beehive.json → ...blocks/urban_37_office_tower_beehive.json b/..._jsons/urban_37_office_tower_beehive.json → ...blocks/urban_37_office_tower_beehive.json
diff --git a/...ng_jsons/urban_38_bar_hardware_house.json → ...y_blocks/urban_38_bar_hardware_house.json b/...ng_jsons/urban_38_bar_hardware_house.json → ...y_blocks/urban_38_bar_hardware_house.json
diff --git a/...ons/urban_39_market_subway_newspaper.json → ...cks/urban_39_market_subway_newspaper.json b/...ons/urban_39_market_subway_newspaper.json → ...cks/urban_39_market_subway_newspaper.json
diff --git a/...opment/building_jsons/urban_40_house.json → ...on/mapgen/city_blocks/urban_40_house.json b/...opment/building_jsons/urban_40_house.json → ...on/mapgen/city_blocks/urban_40_house.json
diff --git a/...ment/building_jsons/urban_41_library.json → .../mapgen/city_blocks/urban_41_library.json b/...ment/building_jsons/urban_41_library.json → .../mapgen/city_blocks/urban_41_library.json
diff --git a/.../building_jsons/urban_7_house_garden.json → ...gen/city_blocks/urban_7_house_garden.json b/.../building_jsons/urban_7_house_garden.json → ...gen/city_blocks/urban_7_house_garden.json
diff --git a/...ing_jsons/urban_8_house_brick_garden.json → ...ty_blocks/urban_8_house_brick_garden.json b/...ing_jsons/urban_8_house_brick_garden.json → ...ty_blocks/urban_8_house_brick_garden.json
diff --git a/...ding_jsons/urban_9_house_garage_loft.json → ...ity_blocks/urban_9_house_garage_loft.json b/...ding_jsons/urban_9_house_garage_loft.json → ...ity_blocks/urban_9_house_garage_loft.json
diff --git a/...elopment/building_jsons/urban_subway.json → ...json/mapgen/city_blocks/urban_subway.json b/...elopment/building_jsons/urban_subway.json → ...json/mapgen/city_blocks/urban_subway.json
diff --git a/.../acidia_commercial_destroyed_palette.json → .../acidia_commercial_destroyed_palette.json b/.../acidia_commercial_destroyed_palette.json → .../acidia_commercial_destroyed_palette.json
diff --git a/...n_palettes/acidia_commercial_palette.json → ...n_palettes/acidia_commercial_palette.json b/...n_palettes/acidia_commercial_palette.json → ...n_palettes/acidia_commercial_palette.json
@@ -23,7 +23,7 @@
       "T": "f_toilet",
       "W": "f_washer",
       "X": [ "f_crate_c", "f_crate_o" ],
-      "]": "f_file_cabinet",
+      "]": "f_filing_cabinet",
       "b": "f_bed",
       "c": "f_counter",
       "d": "f_desk",

diff --git a/...cidia_residential_commercial_palette.json → ...cidia_residential_commercial_palette.json b/...cidia_residential_commercial_palette.json → ...cidia_residential_commercial_palette.json
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
diff --git a/...ds/Urban_Development/overmap_terrain.json → ...vermap_terrain/overmap_terrain_urban.json b/...ds/Urban_Development/overmap_terrain.json → ...vermap_terrain/overmap_terrain_urban.json
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -720,6 +720,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,
@@ -769,6 +784,24 @@
         "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,

diff --git a/data/mods/Urban_Development/modinfo.json b/data/mods/Urban_Development/modinfo.json