changed options defautls.

fixed option serialization.
CitiesSkylinesMods · Apr 30, 2020 · 7b98e0f · 7b98e0f
1 parent 3bf8c9f
commit 7b98e0f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/TLM/TLM/Manager/Impl/OptionsManager.cs b/TLM/TLM/Manager/Impl/OptionsManager.cs
@@ -1,4 +1,4 @@
-namespace TrafficManager.Manager.Impl {
+namespace TrafficManager.Manager.Impl {
     using CSUtil.Commons;
     using System;
     using TrafficManager.API.Manager;
@@ -8,8 +8,7 @@
 
     public class OptionsManager
         : AbstractCustomManager,
-          IOptionsManager
-    {
+          IOptionsManager {
         // TODO I contain ugly code
         public static OptionsManager Instance = new OptionsManager();
 
@@ -216,7 +215,7 @@ public bool LoadData(byte[] data) {
                 OptionsVehicleRestrictionsTab.SetAddTrafficLightsIfApplicable(data[41] == 1);
             }
 
-            int LoadBool (int idx, ILegacySerializableOption opt) {
+            int LoadBool(int idx, ILegacySerializableOption opt) {
                 if (data.Length > idx) {
                     opt.Load(data[idx]);
                 }
@@ -236,6 +235,11 @@ int LoadBool (int idx, ILegacySerializableOption opt) {
             index = LoadBool(index, OptionsMassEditTab.PriorityRoad_EnterBlockedYeild);
             index = LoadBool(index, OptionsMassEditTab.PriorityRoad_StopAtEntry);
 
+            index = LoadBool(index, OptionsMassEditTab.RoundAboutQuickFix_KeepClearYieldR);
+            index = LoadBool(index, OptionsMassEditTab.RoundAboutQuickFix_RealisticSpeedLimits);
+            index = LoadBool(index, OptionsMassEditTab.RoundAboutQuickFix_ParkingBanMainR);
+            index = LoadBool(index, OptionsMassEditTab.RoundAboutQuickFix_ParkingBanYieldR);
+
             return true;
         }
 
@@ -295,6 +299,11 @@ public byte[] SaveData(ref bool success) {
                 (byte)(OptionsMassEditTab.PriorityRoad_AllowLeftTurns.Save()),
                 (byte)(OptionsMassEditTab.PriorityRoad_EnterBlockedYeild.Save()),
                 (byte)(OptionsMassEditTab.PriorityRoad_StopAtEntry.Save()),
+
+                (byte)(OptionsMassEditTab.RoundAboutQuickFix_KeepClearYieldR.Save()),
+                (byte)(OptionsMassEditTab.RoundAboutQuickFix_RealisticSpeedLimits.Save()),
+                (byte)(OptionsMassEditTab.RoundAboutQuickFix_ParkingBanMainR.Save()),
+                (byte)(OptionsMassEditTab.RoundAboutQuickFix_ParkingBanYieldR.Save()),
             };
         }
     }

diff --git a/TLM/TLM/State/Options.cs b/TLM/TLM/State/Options.cs
@@ -104,7 +104,7 @@ public class Options : MonoBehaviour {
         public static bool RoundAboutQuickFix_KeepClearYieldR = true; 
         public static bool RoundAboutQuickFix_RealisticSpeedLimits = false;
         public static bool RoundAboutQuickFix_ParkingBanMainR = true;
-        public static bool RoundAboutQuickFix_ParkingBanYieldR = true;
+        public static bool RoundAboutQuickFix_ParkingBanYieldR = false;
         public static bool PriorityRoad_CrossMainR = false;
         public static bool PriorityRoad_AllowLeftTurns = false;
         public static bool PriorityRoad_EnterBlockedYeild = false;

diff --git a/TLM/TLM/State/OptionsTabs/OptionsMassEditTab.cs b/TLM/TLM/State/OptionsTabs/OptionsMassEditTab.cs
@@ -39,8 +39,8 @@ public static class OptionsMassEditTab {
 
         public static CheckboxOption RoundAboutQuickFix_KeepClearYieldR =
             new CheckboxOption("RoundAboutQuickFix_KeepClearYieldR") {
-            Label = "Roundabout.Option:Keep Clear of roundabout.",
-            Tooltip = "Roundabout.Tooltip:Enter blocked roundabout",
+            Label = "Roundabout.Option:Keep clear of roundabout for yield road",
+            Tooltip = "Roundabout.Tooltip:Keep clear of roundabout for yield road",
         };
 
         public static CheckboxOption RoundAboutQuickFix_RealisticSpeedLimits =
@@ -56,7 +56,7 @@ public static class OptionsMassEditTab {
 
         public static CheckboxOption RoundAboutQuickFix_ParkingBanYieldR =
             new CheckboxOption("RoundAboutQuickFix_ParkingBanYieldR") {
-            Label = "Roundabout.Option:Put parking ban on connecting segments",
+            Label = "Roundabout.Option:Put parking ban on roundabout branches",
         };
 
         #endregion