Merge branch 'dev'

cadon · Apr 22, 2023 · d09673b · d09673b
2 parents 4ace471 + 0c69f92
commit d09673b
Show file tree

Hide file tree

Showing 22 changed files with 4,356 additions and 74 deletions.
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -487,6 +487,12 @@
             <setting name="NaturalSortIgnoreSpaces" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="ShowColorIdOnRegionButtons" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="AlwaysShowAllColorRegions" serializeAs="String">
+                <value>False</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs
diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -2925,7 +2925,7 @@ private void UpdateTempCreatureDropDown()
         {
             toolStripCBTempCreatures.Items.Clear();
             foreach (CreatureValues cv in _creatureCollection.creaturesValues)
-                toolStripCBTempCreatures.Items.Add($"{cv.name} ({cv.Species?.name ?? "unknown species"})");
+                toolStripCBTempCreatures.Items.Add($"{cv.name} ({cv.Species?.name ?? "unknown species"}, Lv {cv.level})");
         }
 
         /// <summary>
@@ -3106,6 +3106,7 @@ private void LoadMultipliersFromTestCase(testCases.ExtractionTestCase etc)
             // set all stat-multipliers from testCase
             _creatureCollection.serverMultipliers = etc.serverMultipliers.Copy(true);
             _creatureCollection.singlePlayerSettings = etc.singleplayerSettings;
+            _creatureCollection.AtlasSettings = etc.AtlasSettings;
             _creatureCollection.allowMoreThanHundredImprinting = etc.allowMoreThanHundredPercentImprinting;
             _creatureCollection.maxWildLevel = etc.maxWildLevel;
 
@@ -3139,6 +3140,7 @@ private void tsBtAddAsExtractionTest_Click(object sender, EventArgs e)
                 etc.serverMultipliers = _creatureCollection.serverMultipliers;
                 etc.Species = speciesSelector1.SelectedSpecies;
                 etc.singleplayerSettings = _creatureCollection.singlePlayerSettings;
+                etc.AtlasSettings = _creatureCollection.AtlasSettings;
                 etc.allowMoreThanHundredPercentImprinting = _creatureCollection.allowMoreThanHundredImprinting;
                 etc.maxWildLevel = _creatureCollection.maxWildLevel;
 

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.51.1.0")]
+[assembly: AssemblyFileVersion("0.52.0.0")]
 [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
@@ -545,5 +545,11 @@
     <Setting Name="NaturalSortIgnoreSpaces" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ShowColorIdOnRegionButtons" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="AlwaysShowAllColorRegions" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
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.51.1.0"
+      "version": "0.52.0.0"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",