Overhaul initial selection mode effects.

algernon-A · Jul 5, 2022 · 0b271a8 · 0b271a8
1 parent 2e7d5d0
commit 0b271a8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,6 @@
 Version 2.0.4.2 -
 
+- Fix initial calculation mode vanilla choice sometimes not ensuring vanilla maximum populations
 - Ensure manual population changes always force eviction of households if required
 - Fix overlapping dropdown menus on population pack panel
 

diff --git a/Code/Notifications/LegacyChoiceMessageBox.cs b/Code/Notifications/LegacyChoiceMessageBox.cs
@@ -48,9 +48,13 @@ private void ChooseNew()
             ModSettings.ThisSaveDefaultCom = DefaultMode.New;
             ModSettings.ThisSaveDefaultInd = DefaultMode.New;
             ModSettings.ThisSaveDefaultOff = DefaultMode.New;
-            RealisticVisitplaceCount.SetVisitModes = (int)RealisticVisitplaceCount.ComVisitModes.legacy;
-            RealisticIndustrialProduction.SetProdModes = (int)RealisticIndustrialProduction.ProdModes.legacy;
-            RealisticExtractorProduction.SetProdModes = (int)RealisticExtractorProduction.ProdModes.legacy;
+            RealisticVisitplaceCount.SetVisitModes = (int)RealisticVisitplaceCount.ComVisitModes.popCalcs;
+            RealisticIndustrialProduction.SetProdModes = (int)RealisticIndustrialProduction.ProdModes.popCalcs;
+            RealisticExtractorProduction.SetProdModes = (int)RealisticExtractorProduction.ProdModes.popCalcs;
+
+            // Update exiting buildings.
+            UpdateBuildings();
+
             Close();
         }
 
@@ -67,6 +71,10 @@ private void ChooseVanilla()
             RealisticVisitplaceCount.SetVisitModes = (int)RealisticVisitplaceCount.ComVisitModes.legacy;
             RealisticIndustrialProduction.SetProdModes = (int)RealisticIndustrialProduction.ProdModes.legacy;
             RealisticExtractorProduction.SetProdModes = (int)RealisticExtractorProduction.ProdModes.legacy;
+
+            // Update exiting buildings.
+            UpdateBuildings();
+
             Close();
         }
 
@@ -83,7 +91,23 @@ private void ChooseLegacy()
             RealisticVisitplaceCount.SetVisitModes = (int)RealisticVisitplaceCount.ComVisitModes.legacy;
             RealisticIndustrialProduction.SetProdModes = (int)RealisticIndustrialProduction.ProdModes.legacy;
             RealisticExtractorProduction.SetProdModes = (int)RealisticExtractorProduction.ProdModes.legacy;
+
+            // Update exiting buildings.
+            UpdateBuildings();
+
             Close();
         }
+
+
+        /// <summary>
+        /// Updates all buildings to ensure that they match the selected option, without any force-eviction.
+        /// </summary>
+        private void UpdateBuildings()
+        {
+            CitizenUnitUtils.UpdateCitizenUnits(null, ItemClass.Service.Residential, ItemClass.SubService.None, true);
+            CitizenUnitUtils.UpdateCitizenUnits(null, ItemClass.Service.Commercial, ItemClass.SubService.None, true);
+            CitizenUnitUtils.UpdateCitizenUnits(null, ItemClass.Service.Industrial, ItemClass.SubService.None, true);
+            CitizenUnitUtils.UpdateCitizenUnits(null, ItemClass.Service.Office, ItemClass.SubService.None, true);
+        }
     }
 }