Version 2.2.2; game version 1.16 (Financial Districts).

algernon-A · Dec 13, 2022 · dc22aaa · dc22aaa
1 parent 63c8758
commit dc22aaa
Show file tree

Hide file tree

Showing 28 changed files with 125 additions and 18 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,8 @@
+Version 2.2.2 -
+
+- Add separate calculations for Financial Office buildings
+
+
 Version 2.2.1.1 -
 
 - Fix infinite loop in notification panel in some Chinese systems

diff --git a/Code/DataStore.cs b/Code/DataStore.cs
@@ -119,6 +119,10 @@ public class DataStore
                                          new int[] { 36, 5, 0, 0, -1,   1,  5, 14, 80,   13, 5, 5, 3, 1125,   0, 1,   10, 37 },
                                          new int[] { 38, 5, 0, 0, -1,   1,  3,  6, 90,   14, 5, 5, 2, 1250,   0, 1,   10, 50 }, };
 
+        public static int[][] officeFinancial = { new int[] { 34, 5, 0, 0, -1,   2,  8, 20, 70,   12, 4, 4, 3, 1000,   0, 1,   10, 25 },
+                                         new int[] { 36, 5, 0, 0, -1,   1,  5, 14, 80,   13, 5, 5, 3, 1125,   0, 1,   10, 37 },
+                                         new int[] { 38, 5, 0, 0, -1,   1,  3,  6, 90,   14, 5, 5, 2, 1250,   0, 1,   10, 50 }, };
+
         public static int[][] officeHighTech = { new int[] { 74, 5, 0, 0, -1,   1,  2,  3, 94,   22, 5, 5, 3, 4000,   0, 1,   10, 10 } };
 
         // Very high floor level because chimney stacks count to height level

diff --git a/Code/GUI/BuildingPanelFilter.cs b/Code/GUI/BuildingPanelFilter.cs
@@ -41,6 +41,7 @@ internal class BuildingPanelFilter : UIPanel
             ItemClass.Service.Office,
             ItemClass.Service.Office,
             ItemClass.Service.Office,
+            ItemClass.Service.Office,
             ItemClass.Service.Industrial,
             ItemClass.Service.Commercial,
             ItemClass.Service.Commercial,
@@ -60,6 +61,7 @@ internal class BuildingPanelFilter : UIPanel
             ItemClass.SubService.CommercialWallToWall,
             ItemClass.SubService.OfficeGeneric,
             ItemClass.SubService.OfficeWallToWall,
+            ItemClass.SubService.OfficeFinancial,
             ItemClass.SubService.OfficeHightech,
             ItemClass.SubService.None,
             ItemClass.SubService.CommercialTourist,
@@ -86,6 +88,7 @@ internal class BuildingPanelFilter : UIPanel
             "Thumbnails",
             "Thumbnails",
             "Thumbnails",
+            "Thumbnails",
             "Ingame",
         };
 
@@ -100,6 +103,7 @@ internal class BuildingPanelFilter : UIPanel
             "DistrictSpecializationCommercialWallToWall",
             "ZoningOffice",
             "DistrictSpecializationOfficeWallToWall",
+            "DistrictSpecializationOfficeFinancial",
             "DistrictSpecializationHightech",
             "ZoningIndustrial",
             "DistrictSpecializationTourist",
@@ -120,6 +124,7 @@ internal class BuildingPanelFilter : UIPanel
             "RPR_CAT_CW2",
             "RPR_CAT_OFF",
             "RPR_CAT_OW2",
+            "RPR_CAT_FIN",
             "RPR_CAT_ITC",
             "RPR_CAT_IND",
             "RPR_CAT_TOU",
@@ -318,6 +323,11 @@ internal enum BuildingCategories
             /// </summary>
             OfficeWallToWall,
 
+            /// <summary>
+            /// Financial office buildings.
+            /// </summary>
+            OfficeFinancial,
+
             /// <summary>
             /// IT cluster (hightech office)  buildings.
             /// </summary>

diff --git a/Code/Patches/Production/OfficeProduction.cs b/Code/Patches/Production/OfficeProduction.cs
@@ -31,6 +31,7 @@ public static class OfficeProduction
         // Settings per subservice.
         private static int genericOfficeProdMult = DefaultProdMult;
         private static int w2wOfficeProdMult = DefaultProdMult;
+        private static int financialOfficeProdMult = DefaultProdMult;
         private static int highTechOfficeProdMult = DefaultProdMult;
 
         /// <summary>
@@ -64,7 +65,7 @@ public static bool Prefix(ref int __result, OfficeBuildingAI __instance, ItemCla
             }
             else
             {
-                // Hew settings - multiply total workers by overall multiplier (from settings) to get result; divisor is 1,000 to match original mod 1/10th when at 100% production.
+                // New settings - multiply total workers by overall multiplier (from settings) to get result; divisor is 1,000 to match original mod 1/10th when at 100% production.
                 __result = totalWorkers * (subService == ItemClass.SubService.OfficeHightech ? highTechOfficeProdMult : genericOfficeProdMult) / 1000;
             }
 
@@ -93,6 +94,9 @@ internal static int GetProdMult(ItemClass.SubService subService)
                 case ItemClass.SubService.OfficeWallToWall:
                     return w2wOfficeProdMult;
 
+                case ItemClass.SubService.OfficeFinancial:
+                    return financialOfficeProdMult;
+
                 // Default is generic office.
                 default:
                 case ItemClass.SubService.OfficeGeneric:
@@ -119,6 +123,10 @@ internal static void SetProdMult(ItemClass.SubService subService, int value)
                     w2wOfficeProdMult = cleanValue;
                     break;
 
+                case ItemClass.SubService.OfficeFinancial:
+                    financialOfficeProdMult = cleanValue;
+                    break;
+
                 case ItemClass.SubService.OfficeHightech:
                     highTechOfficeProdMult = cleanValue;
                     break;
@@ -148,6 +156,11 @@ internal static void SetProdMult(ItemClass.SubService subService, int value)
                     Value = w2wOfficeProdMult,
                 },
                 new Configuration.SubServiceValue
+                {
+                    SubService = ItemClass.SubService.OfficeFinancial,
+                    Value = financialOfficeProdMult,
+                },
+                new Configuration.SubServiceValue
                 {
                     SubService = ItemClass.SubService.OfficeHightech,
                     Value = highTechOfficeProdMult,

diff --git a/Code/Settings/CalculationTabs/ConsumptionTabs/OffConsumptionPanel.cs b/Code/Settings/CalculationTabs/ConsumptionTabs/OffConsumptionPanel.cs
@@ -17,15 +17,17 @@ internal class OffConsumptionPanel : ConsumptionPanelBase
         // Array reference constants.
         private const int Office = 0;
         private const int Wall2Wall = 1;
-        private const int HighTech = 2;
-        private const int NumSubServices = 3;
+        private const int Financial = 2;
+        private const int HighTech = 3;
+        private const int NumSubServices = 4;
         private const int NumLevels = 3;
 
         // Label constants.
         private readonly string[] _subServiceLables =
         {
             "RPR_CAT_OFF",
             "RPR_CAT_OW2",
+            "RPR_CAT_FIN",
             "RPR_CAT_ITC",
         };
 
@@ -71,6 +73,8 @@ internal override void Setup()
                 AddSubService(m_panel, Office);
                 PanelUtils.RowHeaderIcon(m_panel, ref m_currentY, Translations.Translate(_subServiceLables[Wall2Wall]), "DistrictSpecializationOfficeWallToWall", "Thumbnails");
                 AddSubService(m_panel, Wall2Wall);
+                PanelUtils.RowHeaderIcon(m_panel, ref m_currentY, Translations.Translate(_subServiceLables[Financial]), "DistrictSpecializationOfficeFinancial", "Thumbnails");
+                AddSubService(m_panel, Financial);
                 PanelUtils.RowHeaderIcon(m_panel, ref m_currentY, Translations.Translate(_subServiceLables[HighTech]), "IconPolicyHightech", "Ingame");
                 AddSubService(m_panel, HighTech, label: Translations.Translate(_subServiceLables[HighTech]));
 
@@ -90,6 +94,7 @@ protected override void PopulateFields()
             // Populate each subservice.
             PopulateSubService(DataStore.office, Office);
             PopulateSubService(DataStore.officeW2W, Wall2Wall);
+            PopulateSubService(DataStore.officeFinancial, Financial);
             PopulateSubService(DataStore.officeHighTech, HighTech);
         }
 
@@ -101,6 +106,7 @@ protected override void ApplyFields()
             // Apply each subservice.
             ApplySubService(DataStore.office, Office);
             ApplySubService(DataStore.officeW2W, Wall2Wall);
+            ApplySubService(DataStore.officeFinancial, Financial);
             ApplySubService(DataStore.officeHighTech, HighTech);
 
             // Clear cached values.
@@ -133,6 +139,13 @@ protected override void ResetToDefaults()
                 new int[] { 38, 5, 0, 0, -1,   1,  3,  6, 90,   14, 5, 5, 2, 1250,   0, 1,   10, 50 },
             };
 
+            int[][] officeFinancial =
+            {
+                new int[] { 34, 5, 0, 0, -1,   2,  8, 20, 70,   12, 4, 4, 3, 1000,   0, 1,   10, 25 },
+                new int[] { 36, 5, 0, 0, -1,   1,  5, 14, 80,   13, 5, 5, 3, 1125,   0, 1,   10, 37 },
+                new int[] { 38, 5, 0, 0, -1,   1,  3,  6, 90,   14, 5, 5, 2, 1250,   0, 1,   10, 50 },
+            };
+
             int[][] officeHighTech =
             {
                 new int[] { 74, 5, 0, 0, -1, 1, 2, 3, 94, 22, 5, 5, 3, 4000, 0, 1, 10, 10 },
@@ -141,6 +154,7 @@ protected override void ResetToDefaults()
             // Populate text fields with these.
             PopulateSubService(office, Office);
             PopulateSubService(officeW2W, Wall2Wall);
+            PopulateSubService(officeFinancial, Financial);
             PopulateSubService(officeHighTech, HighTech);
         }
     }

diff --git a/Code/Settings/CalculationTabs/DefaultsTabs/OffDefaultsPanel.cs b/Code/Settings/CalculationTabs/DefaultsTabs/OffDefaultsPanel.cs
@@ -18,6 +18,7 @@ internal class OffDefaultsPanel : EmpDefaultsPanel
         {
             Translations.Translate("RPR_CAT_OFF"),
             Translations.Translate("RPR_CAT_OW2"),
+            Translations.Translate("RPR_CAT_FIN"),
             Translations.Translate("RPR_CAT_ITC"),
         };
 
@@ -26,24 +27,28 @@ internal class OffDefaultsPanel : EmpDefaultsPanel
             ItemClass.Service.Office,
             ItemClass.Service.Office,
             ItemClass.Service.Office,
+            ItemClass.Service.Office,
         };
 
         private readonly ItemClass.SubService[] _subServices =
         {
             ItemClass.SubService.OfficeGeneric,
             ItemClass.SubService.OfficeWallToWall,
+            ItemClass.SubService.OfficeFinancial,
             ItemClass.SubService.OfficeHightech,
         };
 
         private readonly string[] _iconNames =
         {
             "ZoningOffice",
             "DistrictSpecializationOfficeWallToWall",
+            "DistrictSpecializationOfficeFinancial",
             "IconPolicyHightech",
         };
 
         private readonly string[] _atlasNames =
         {
+            "Thumbnails",
             "Thumbnails",
             "Thumbnails",
             "Ingame",

diff --git a/Code/Settings/CalculationTabs/GoodsTabs/OffGoodsPanel.cs b/Code/Settings/CalculationTabs/GoodsTabs/OffGoodsPanel.cs
@@ -19,6 +19,7 @@ internal class OffGoodsPanel : GoodsPanelBase
         {
             Translations.Translate("RPR_CAT_OFF"),
             Translations.Translate("RPR_CAT_OW2"),
+            Translations.Translate("RPR_CAT_FIN"),
             Translations.Translate("RPR_CAT_ITC"),
         };
 
@@ -27,24 +28,28 @@ internal class OffGoodsPanel : GoodsPanelBase
             ItemClass.Service.Office,
             ItemClass.Service.Office,
             ItemClass.Service.Office,
+            ItemClass.Service.Office,
         };
 
         private readonly ItemClass.SubService[] _subServices =
         {
             ItemClass.SubService.OfficeGeneric,
             ItemClass.SubService.OfficeWallToWall,
+            ItemClass.SubService.OfficeFinancial,
             ItemClass.SubService.OfficeHightech,
         };
 
         private readonly string[] _iconNames =
         {
             "ZoningOffice",
             "DistrictSpecializationOfficeWallToWall",
+            "DistrictSpecializationOfficeFinancial",
             "IconPolicyHightech",
         };
 
         private readonly string[] _atlasNames =
         {
+            "Thumbnails",
             "Thumbnails",
             "Thumbnails",
             "Ingame",

diff --git a/Code/Settings/XMLSettingsFile.cs b/Code/Settings/XMLSettingsFile.cs
@@ -190,10 +190,10 @@ public bool DefaultLegacy
         public bool UnlockZoning { get => UnlockedZonePatch.UnlockZoning; set => UnlockedZonePatch.UnlockZoning = value; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether detailed logging is in effect.
+        /// Sets a value indicating whether detailed logging is in effect (legacy option).
         /// </summary>
-        [XmlElement("DetailedLogging")]
-        public bool DetailLogging { get => Logging.DetailLogging; set => Logging.DetailLogging = value; }
+        [XmlElement("DetailLogging")]
+        public bool DetailLogging { set => Logging.DetailLogging = value; }
 
         /// <summary>
         /// Load settings from XML file.

diff --git a/Code/Utils/LegacyAIUtils.cs b/Code/Utils/LegacyAIUtils.cs
@@ -378,6 +378,10 @@ internal static int[] GetOfficeArray(BuildingInfo item, int level)
                         array = DataStore.officeW2W;
                         break;
 
+                    case ItemClass.SubService.OfficeFinancial:
+                        array = DataStore.officeFinancial;
+                        break;
+
                     case ItemClass.SubService.OfficeGeneric:
                     default:
                         break;

diff --git a/Code/VolumetricData/DataMapping.cs b/Code/VolumetricData/DataMapping.cs
@@ -14,7 +14,7 @@ internal class DataMapping
         /// <summary>
         /// Number of data structures (service/subservice combinations) to map.
         /// </summary>
-        internal const int NumData = 19;
+        internal const int NumData = 20;
 
         /// <summary>
         /// Service reference array.
@@ -53,6 +53,7 @@ internal DataMapping()
                 ItemClass.Service.Office,
                 ItemClass.Service.Office,
                 ItemClass.Service.Office,
+                ItemClass.Service.Office,
                 ItemClass.Service.Industrial,
                 ItemClass.Service.Industrial,
                 ItemClass.Service.Industrial,
@@ -75,6 +76,7 @@ internal DataMapping()
                 ItemClass.SubService.CommercialLeisure,
                 ItemClass.SubService.CommercialTourist,
                 ItemClass.SubService.OfficeGeneric,
+                ItemClass.SubService.OfficeFinancial,
                 ItemClass.SubService.OfficeWallToWall,
                 ItemClass.SubService.OfficeHightech,
                 ItemClass.SubService.IndustrialGeneric,
@@ -100,6 +102,7 @@ internal DataMapping()
                 DataStore.commercialTourist,
                 DataStore.office,
                 DataStore.officeW2W,
+                DataStore.officeFinancial,
                 DataStore.officeHighTech,
                 DataStore.industry,
                 DataStore.industry_farm,

diff --git a/Code/VolumetricData/PopData.cs b/Code/VolumetricData/PopData.cs
@@ -868,7 +868,14 @@ internal override DataPack BaseDefaultPack(ItemClass.Service service, ItemClass.
                             break;
                         default:
                             // Default is volumetric.
-                            defaultName = "offcorp";
+                            if (subService == ItemClass.SubService.OfficeFinancial)
+                            {
+                                defaultName = "offfin";
+                            }
+                            else
+                            {
+                                defaultName = "offcorp";
+                            }
                             break;
                     }
 

diff --git a/Code/WhatsNewMessageListing.cs b/Code/WhatsNewMessageListing.cs
@@ -18,6 +18,15 @@ internal class WhatsNewMessageListing
         /// </summary>
         internal WhatsNewMessage[] Messages => new WhatsNewMessage[]
         {
+            new WhatsNewMessage
+            {
+                Version = new Version("2.2.2.0"),
+                MessagesAreKeys = true,
+                Messages = new string[]
+                {
+                    "RPR_222_0",
+                },
+            },
             new WhatsNewMessage
             {
                 Version = new Version("2.2.1.0"),

diff --git a/Code/XML/XML_VersionFive.cs b/Code/XML/XML_VersionFive.cs
@@ -129,6 +129,7 @@ private void ReadPollutionNode(XmlNode pollutionNode)
                         case "Office":
                             SetPollutionRates(DataStore.office[level], ground, noise);
                             SetPollutionRates(DataStore.officeW2W[level], ground, noise);
+                            SetPollutionRates(DataStore.officeFinancial[level], ground, noise);
                             break;
 
                         case "Industry":

diff --git a/Code/XML/XML_VersionSix.cs b/Code/XML/XML_VersionSix.cs
@@ -534,6 +534,7 @@ private void ReadPollutionNode(XmlNode pollutionNode)
                         case "Office":
                             SetPollutionRates(DataStore.office[level], ground, noise);
                             SetPollutionRates(DataStore.officeW2W[level], ground, noise);
+                            SetPollutionRates(DataStore.officeFinancial[level], ground, noise);
                             break;
 
                         case "Industry":

diff --git a/Realistic Population Revisited.csproj b/Realistic Population Revisited.csproj
@@ -8,7 +8,7 @@
 		<Authors>algernon,Whitefang Greytail</Authors>
 		<Copyright>Copyright © 2015-2022 algernon, Whitefang Greytail</Copyright>
 		<Product>$(Title)</Product>
-		<Version>2.2.1.1</Version>
+		<Version>2.2.2</Version>
 		<ManagedDLLPath>$(MSBuildProgramFiles32)/Steam/steamapps/common/Cities_Skylines/Cities_Data/Managed</ManagedDLLPath>
 		<AssemblySearchPaths>
 			$(AssemblySearchPaths);