Merge branch 'dev'

cadon · Sep 9, 2024 · b3e6e17 · b3e6e17
2 parents b77c803 + 798aba1
commit b3e6e17
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.63.1.0")]
+[assembly: AssemblyFileVersion("0.63.1.1")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/StatsOptions/LevelColorSettings/LevelGraphOptionsControl.cs b/ARKBreedingStats/StatsOptions/LevelColorSettings/LevelGraphOptionsControl.cs
@@ -58,7 +58,8 @@ private void ResetCurrentSettingsToDefault(object sender, EventArgs e)
                 SelectedStatsOptions.StatOptions[si] = new StatLevelColors
                 {
                     LevelGraphRepresentation = LevelGraphRepresentation.GetDefaultValue,
-                    LevelGraphRepresentationMutation = LevelGraphRepresentation.GetDefaultMutationLevelValue
+                    LevelGraphRepresentationMutation = LevelGraphRepresentation.GetDefaultMutationLevelValue,
+                    UseDifferentColorsForMutationLevels = true
                 };
                 _statOptionsControls[si].SetStatOptions(SelectedStatsOptions.StatOptions[si], isNotRoot, SelectedStatsOptions.ParentOptions);
             }

diff --git a/ARKBreedingStats/StatsOptions/LevelColorSettings/StatLevelColors.cs b/ARKBreedingStats/StatsOptions/LevelColorSettings/StatLevelColors.cs
@@ -56,7 +56,7 @@ private LevelGraphRepresentation GetLevelGraphRepresentation(int level, bool use
                 && level % 2 == 1)
                 return LevelGraphRepresentationOdd;
 
-            return LevelGraphRepresentation;
+            return LevelGraphRepresentation ?? LevelGraphRepresentation.GetDefaultValue;
         }
 
         public Color GetLevelColor(int level, bool useCustomOdd = true, bool mutationLevel = false)
@@ -85,9 +85,9 @@ public override void Initialize()
         /// <summary>
         /// Call before saving. Sets unused settings to null.
         /// </summary>
-        public override void PrepareForSaving()
+        public override void PrepareForSaving(bool isRoot)
         {
-            if (!OverrideParent)
+            if (!OverrideParent && !isRoot)
             {
                 LevelGraphRepresentation = null;
                 LevelGraphRepresentationOdd = null;

diff --git a/ARKBreedingStats/StatsOptions/StatOptionsBase.cs b/ARKBreedingStats/StatsOptions/StatOptionsBase.cs
@@ -4,7 +4,7 @@ public abstract class StatOptionsBase
     {
         public abstract void Initialize();
 
-        public abstract void PrepareForSaving();
+        public abstract void PrepareForSaving(bool isRoot);
 
         /// <summary>
         /// If true don't use values of parent but overrides of this object.

diff --git a/ARKBreedingStats/StatsOptions/StatsOptionsSettings.cs b/ARKBreedingStats/StatsOptions/StatsOptionsSettings.cs
@@ -131,7 +131,7 @@ public void SaveSettings()
                     o.ParentName = null; // don't save direct loop
                 foreach (var so in o.StatOptions)
                 {
-                    so.PrepareForSaving();
+                    so.PrepareForSaving(string.IsNullOrEmpty(o.Name));
                 }
             }
 
@@ -171,7 +171,7 @@ public StatsOptions<T> GetStatsOptions(Species species)
             }
             else
             {
-                // error, on default settings available
+                // error, no default settings available
                 return null;
             }
 

diff --git a/ARKBreedingStats/StatsOptions/TopStatsSettings/ConsiderTopStats.cs b/ARKBreedingStats/StatsOptions/TopStatsSettings/ConsiderTopStats.cs
@@ -22,9 +22,9 @@ public override void Initialize()
             OverrideParent = OverrideParentBool;
         }
 
-        public override void PrepareForSaving()
+        public override void PrepareForSaving(bool isRoot)
         {
-            OverrideParentBool = OverrideParent;
+            OverrideParentBool = OverrideParent || isRoot;
         }
 
         public override bool DefinesData() => true;

diff --git a/ARKBreedingStats/_manifest.json b/ARKBreedingStats/_manifest.json
@@ -4,7 +4,7 @@
     "ARK Smart Breeding": {
       "Id": "ARK Smart Breeding",
       "Category": "main",
-      "version": "0.63.1.0"
+      "version": "0.63.1.1"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",