Road sign themes reloadable + Canadian signs

TLM/TLM/Lifecycle/TMPELifecycle.cs

@@ -1,6 +1,5 @@
 namespace TrafficManager.Lifecycle {
     using CitiesHarmony.API;
-    using ColossalFramework;
     using ColossalFramework.Globalization;
     using ColossalFramework.UI;
     using CSUtil.Commons;

TLM/TLM/Manager/Impl/SpeedLimitManager.cs

@@ -146,12 +146,7 @@ private bool MayHaveCustomSpeedLimits([NotNull] NetInfo.Lane laneInfo) {
                 laneIndex++;
             }
 
-            switch (validLanes) {
-                case 0:
-                    return null;
-                case > 0:
-                    return meanSpeedLimit.Scale(1.0f / validLanes);
-            }
+            return validLanes == 0 ? null : meanSpeedLimit.Scale(1.0f / validLanes);
         }
 
         /// <summary>

TLM/TLM/State/ConfigData/Main.cs

@@ -92,10 +92,16 @@ public SpeedUnit GetDisplaySpeedUnit() => DisplaySpeedLimitsMph
                                                       ? SpeedUnit.Mph
                                                       : SpeedUnit.Kmph;
 
+        // /// <summary>Selected theme for road signs when MPH is active.</summary>
+        // [Obsolete("This now becomes RoadSignTheme")]
+        // public MphSignStyle MphRoadSignStyle = MphSignStyle.SquareUS;
+
         /// <summary>
-        /// Selected theme for road signs when MPH is active.
+        /// String key in SpeedLimitsTextures.Themes. Some themes support only MPH, and
+        /// some support both Km/h and MPH, changing this might affect
+        /// <see cref="DisplaySpeedLimitsMph"/>.
         /// </summary>
-        public MphSignStyle MphRoadSignStyle = MphSignStyle.SquareUS;
+        public string RoadSignTheme = string.Empty;
 
         public void AddDisplayedTutorialMessage(string messageKey) {
             HashSet<string> newMessages = DisplayedTutorialMessages != null

TLM/TLM/State/OptionsTabs/OptionsGeneralTab.cs

@@ -1,4 +1,6 @@
 namespace TrafficManager.State {
+    using System;
+    using System.Linq;
     using TrafficManager.API.Traffic.Enums;
     using ColossalFramework.UI;
     using CSUtil.Commons;
@@ -10,6 +12,8 @@ namespace TrafficManager.State {
     using TrafficManager.UI;
     using UnityEngine;
     using TrafficManager.Lifecycle;
+    using TrafficManager.State.ConfigData;
+    using TrafficManager.UI.Textures;
 
     public static class OptionsGeneralTab {
         private static UICheckBox _instantEffectsToggle;
@@ -38,8 +42,8 @@ public static class OptionsGeneralTab {
         private static UICheckBox _ignoreDisabledModsToggle;
 
         private static UICheckBox _displayMphToggle;
-        private static UIDropDown _roadSignsMphThemeDropdown;
-        private static int _roadSignMphStyleInt;
+
+        private static UIDropDown _roadSignsThemeDropdown;
 
         private static UICheckBox _useUUI;
 
@@ -141,17 +145,18 @@ internal static void MakeSettings_General(ExtUITabstrip tabStrip) {
 
             // General: Simulation
             UIHelperBase simGroup = panelHelper.AddGroup(T("General.Group:Simulation"));
+            string[] simPrecisionOptions = new[] {
+                T("General.Dropdown.Option:Very low"),
+                T("General.Dropdown.Option:Low"),
+                T("General.Dropdown.Option:Medium"),
+                T("General.Dropdown.Option:High"),
+                T("General.Dropdown.Option:Very high"),
+            };
             _simulationAccuracyDropdown = simGroup.AddDropdown(
-                                       text: T("General.Dropdown:Simulation accuracy") + ":",
-                                       options: new[] {
-                                                          T("General.Dropdown.Option:Very low"),
-                                                          T("General.Dropdown.Option:Low"),
-                                                          T("General.Dropdown.Option:Medium"),
-                                                          T("General.Dropdown.Option:High"),
-                                                          T("General.Dropdown.Option:Very high"),
-                                                      },
-                                       defaultSelection: (int)Options.simulationAccuracy,
-                                       eventCallback: OnSimulationAccuracyChanged) as UIDropDown;
+                                              text: T("General.Dropdown:Simulation accuracy") + ":",
+                                              options: simPrecisionOptions,
+                                              defaultSelection: (int)Options.simulationAccuracy,
+                                              eventCallback: OnSimulationAccuracyChanged) as UIDropDown;
 
             _instantEffectsToggle = simGroup.AddCheckbox(
                                        text: T("General.Checkbox:Apply AI changes right away"),
@@ -160,23 +165,29 @@ internal static void MakeSettings_General(ExtUITabstrip tabStrip) {
         }
 
         private static void SetupSpeedLimitsPanel(UIHelperBase generalGroup) {
+            Main mainConfig = GlobalConfig.Instance.Main;
+
             _displayMphToggle = generalGroup.AddCheckbox(
                                     text: Translation.SpeedLimits.Get("Checkbox:Display speed limits mph"),
-                                    defaultValue: GlobalConfig.Instance.Main.DisplaySpeedLimitsMph,
+                                    defaultValue: mainConfig.DisplaySpeedLimitsMph,
                                     eventCallback: OnDisplayMphChanged) as UICheckBox;
-            string[] mphThemeOptions = {
-                Translation.SpeedLimits.Get("General.Theme.Option:Square US"),
-                Translation.SpeedLimits.Get("General.Theme.Option:Round UK"),
-                Translation.SpeedLimits.Get("General.Theme.Option:Round German"),
-            };
-            _roadSignMphStyleInt = (int)GlobalConfig.Instance.Main.MphRoadSignStyle;
-            _roadSignsMphThemeDropdown
+
+            string FormatThemeName(string themeName) {
+                return Translation.SpeedLimits.Get($"RoadSignTheme:{themeName}");
+            }
+
+            var themeOptions = SpeedLimitTextures.ThemeNames
+                                                    .Select(FormatThemeName)
+                                                    .ToArray();
+            int selectedThemeIndex = SpeedLimitTextures.ThemeNames.FindIndex(x => x == mainConfig.RoadSignTheme);
+            int defaultGermanSignsThemeIndex = SpeedLimitTextures.ThemeNames.FindIndex(x => x == SpeedLimitTextures.GERMAN_KM_SIGNS);
+            _roadSignsThemeDropdown
                 = generalGroup.AddDropdown(
-                      text: Translation.SpeedLimits.Get("General.Dropdown:Road signs theme mph") + ":",
-                      options: mphThemeOptions,
-                      defaultSelection: _roadSignMphStyleInt,
-                      eventCallback: OnRoadSignsMphThemeChanged) as UIDropDown;
-            _roadSignsMphThemeDropdown.width = 400;
+                      text: Translation.SpeedLimits.Get("General.Dropdown:Road signs theme") + ":",
+                      options: themeOptions,
+                      defaultSelection: selectedThemeIndex >= 0 ? selectedThemeIndex : defaultGermanSignsThemeIndex,
+                      eventCallback: OnRoadSignsThemeChanged) as UIDropDown;
+            _roadSignsThemeDropdown.width *= 2.0f;
         }
 
         private static void OnLanguageChanged(int newLanguageIndex) {
@@ -325,8 +336,25 @@ private static void OnIgnoreDisabledModsChanged(bool newValue) {
         }
 
         private static void OnDisplayMphChanged(bool newValue) {
-            Log._Debug($"Display MPH changed to {newValue}");
-            GlobalConfig.Instance.Main.DisplaySpeedLimitsMph = newValue;
+            bool supportedByTheme = newValue
+                                        ? SpeedLimitTextures.ActiveTheme.SupportsMph
+                                        : SpeedLimitTextures.ActiveTheme.SupportsKmph;
+            Main mainConfig = GlobalConfig.Instance.Main;
+
+            if (!supportedByTheme) {
+                // Reset to German road signs theme
+                _roadSignsThemeDropdown.selectedIndex = SpeedLimitTextures.ThemeNames.FindIndex(
+                    x => x == SpeedLimitTextures.GERMAN_KM_SIGNS);
+                mainConfig.RoadSignTheme = SpeedLimitTextures.GERMAN_KM_SIGNS;
+                Log.Info(
+                    $"Display MPH changed to {newValue}, but was not supported by current theme, "
+                    + "so theme was also reset to German_Kmph");
+            } else {
+                Log.Info($"Display MPH changed to {newValue}");
+            }
+
+            mainConfig.DisplaySpeedLimitsMph = newValue;
+
             GlobalConfig.WriteConfig();
 
             ModUI.Instance.Events.DisplayMphChanged(newValue);
@@ -338,24 +366,38 @@ public static void SetDisplayInMph(bool value) {
             }
         }
 
-        private static void OnRoadSignsMphThemeChanged(int newRoadSignStyle) {
+        private static void OnRoadSignsThemeChanged(int newThemeIndex) {
             if (!Options.IsGameLoaded()) {
                 return;
             }
 
-            // The UI order is: US, UK, German
-            var newStyle = MphSignStyle.RoundGerman;
-            switch (newRoadSignStyle) {
-                case 1:
-                    newStyle = MphSignStyle.RoundUK;
-                    break;
-                case 0:
-                    newStyle = MphSignStyle.SquareUS;
-                    break;
+            var newTheme = SpeedLimitTextures.ThemeNames[newThemeIndex];
+
+            Main mainConfig = GlobalConfig.Instance.Main;
+            if (SpeedLimitTextures.OnThemeChanged(
+                newTheme: newTheme,
+                mphEnabled: mainConfig.DisplaySpeedLimitsMph))
+            {
+                Log.Info($"Road Sign theme changed to {newTheme}");
+                mainConfig.RoadSignTheme = newTheme;
+            } else {
+                Log.Info(
+                    $"Road Sign theme was not changed to {newTheme} (doesn't support MPH={mainConfig.DisplaySpeedLimitsMph}). "
+                    + "Toggling MPH and trying once again.");
+
+                bool invertedMph = !mainConfig.DisplaySpeedLimitsMph;
+                if (SpeedLimitTextures.OnThemeChanged(
+                    newTheme: newTheme,
+                    mphEnabled: invertedMph))
+                {
+                    Log.Info($"Road Sign theme changed to {newTheme}. ShowMPH config value is now {invertedMph}.");
+                    _displayMphToggle.isChecked = invertedMph;
+                    mainConfig.DisplaySpeedLimitsMph = invertedMph;
+                    mainConfig.RoadSignTheme = newTheme;
+                }
             }
 
-            Log._Debug($"Road Sign theme changed to {newStyle}");
-            GlobalConfig.Instance.Main.MphRoadSignStyle = newStyle;
+            GlobalConfig.WriteConfig();
         }
 
         private static void OnSimulationAccuracyChanged(int newAccuracy) {