Merge branch 'dev'

cadon · Sep 12, 2024 · 44c717b · 44c717b
2 parents 150c58d + b640cbf
commit 44c717b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 94 deletions.
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -312,9 +312,6 @@
             <setting name="Highlight255Level" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="HighlightEvenOdd" serializeAs="String">
-                <value>False</value>
-            </setting>
             <setting name="LastUsedCollectionFolder" serializeAs="String">
                 <value />
             </setting>
@@ -408,18 +405,6 @@
             <setting name="InfoGraphicShowRegionNamesIfNoImage" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="ChartHueEvenMin" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="ChartHueEvenMax" serializeAs="String">
-                <value>120</value>
-            </setting>
-            <setting name="ChartHueOddMin" serializeAs="String">
-                <value>240</value>
-            </setting>
-            <setting name="ChartHueOddMax" serializeAs="String">
-                <value>320</value>
-            </setting>
             <setting name="PatternNameToClipboardAfterManualApplication"
                 serializeAs="String">
                 <value>False</value>

diff --git a/ARKBreedingStats/Pedigree/PedigreeCreature.cs b/ARKBreedingStats/Pedigree/PedigreeCreature.cs
@@ -214,7 +214,7 @@ public Creature Creature
                         _labels[s].Text = _creature.levelsWild[si].ToString();
                         if (Properties.Settings.Default.Highlight255Level && _creature.levelsWild[si] > 253) // 255 is max, 254 is the highest that allows dom leveling
                             _labels[s].BackColor = Utils.AdjustColorLight(_creature.levelsWild[si] == 254 ? Utils.Level254 : Utils.Level255, _creature.IsTopStat(si) ? 0.2 : 0.7);
-                        else if (Properties.Settings.Default.HighlightEvenOdd)
+                        else
                             _labels[s].BackColor = Utils.AdjustColorLight(levelColorOptions.StatOptions[si].GetLevelColor(_creature.levelsWild[si]),
                                 _creature.IsTopStat(si) ? 0.2 : 0.7);
 

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.2")]
+[assembly: AssemblyFileVersion("0.63.1.3")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/Properties/Settings.Designer.cs b/ARKBreedingStats/Properties/Settings.Designer.cs
diff --git a/ARKBreedingStats/Properties/Settings.settings b/ARKBreedingStats/Properties/Settings.settings
@@ -350,9 +350,6 @@
     <Setting Name="Highlight255Level" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="HighlightEvenOdd" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="LastUsedCollectionFolder" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
@@ -461,18 +458,6 @@
     <Setting Name="InfoGraphicShowRegionNamesIfNoImage" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ChartHueEvenMin" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="ChartHueEvenMax" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">120</Value>
-    </Setting>
-    <Setting Name="ChartHueOddMin" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">240</Value>
-    </Setting>
-    <Setting Name="ChartHueOddMax" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">320</Value>
-    </Setting>
     <Setting Name="PatternNameToClipboardAfterManualApplication" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>

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.2"
+      "version": "0.63.1.3"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",