Merge branch 'dev'

ARKBreedingStats/ARKBreedingStats.csproj

@@ -50,6 +50,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>ARKSmartBreeding.ico</ApplicationIcon>
@@ -630,6 +631,7 @@
     <Compile Include="utils\Debouncer.cs" />
     <Compile Include="utils\ExportFolderLocation.cs" />
     <Compile Include="utils\ExtensionMethods.cs" />
+    <Compile Include="utils\CreatureListSorter.cs" />
     <Compile Include="utils\MessageBoxes.cs" />
     <Compile Include="NamePatterns\NamePatternFunctions.cs" />
     <Compile Include="utils\RepositoryInfo.cs" />

ARKBreedingStats/App.config

@@ -261,9 +261,6 @@
             <setting name="FilterOnlyIfColorId" serializeAs="String">
                 <value>0</value>
             </setting>
-            <setting name="LibraryGroupBySpecies" serializeAs="String">
-                <value>True</value>
-            </setting>
             <setting name="LibraryFilterWindowRect" serializeAs="String">
                 <value>50, 50, 800, 600</value>
             </setting>
@@ -460,6 +457,12 @@
             <setting name="ImportExportedBringToFrontOnIssue" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="HideInvisibleColorRegions" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="UseTribeFilterForBreedingPlan" serializeAs="String">
+                <value>False</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>

ARKBreedingStats/Ark.cs

@@ -77,6 +77,10 @@ public static class Ark
         public const byte ColorMaxId = 200;
         public const byte DyeFirstId = 201;
         public const byte DyeMaxId = 255;
+        /// <summary>
+        /// When choosing a random color for a mutation, ARK can erroneously select an undefined color. Usually this is color id 227 (one too high to be defined).
+        /// </summary>
+        public const byte UndefinedColorId = 227;
 
         /// <summary>
         /// Number of possible color regions for all species.

ARKBreedingStats/BreedingPlanning/BreedingPlan.cs

@@ -1128,12 +1128,6 @@ public void SetLocalizations()
             Loc.SetToolTip(cbBPTagExcludeDefault, _tt);
         }
 
-        private void cbServerFilterLibrary_CheckedChanged(object sender, EventArgs e)
-        {
-            Settings.Default.UseServerFilterForBreedingPlan = cbServerFilterLibrary.Checked;
-            CalculateBreedingScoresAndDisplayPairs();
-        }
-
         private void btShowAllCreatures_Click(object sender, EventArgs e)
         {
             // remove restriction on manually selected creatures
@@ -1147,12 +1141,24 @@ private void btShowAllCreatures_Click(object sender, EventArgs e)
                 CalculateBreedingScoresAndDisplayPairs();
         }
 
+        private void cbServerFilterLibrary_CheckedChanged(object sender, EventArgs e)
+        {
+            Settings.Default.UseServerFilterForBreedingPlan = cbServerFilterLibrary.Checked;
+            CalculateBreedingScoresAndDisplayPairs();
+        }
+
         private void cbOwnerFilterLibrary_CheckedChanged(object sender, EventArgs e)
         {
             Settings.Default.UseOwnerFilterForBreedingPlan = cbOwnerFilterLibrary.Checked;
             CalculateBreedingScoresAndDisplayPairs();
         }
 
+        private void cbTribeFilterLibrary_CheckedChanged(object sender, EventArgs e)
+        {
+            Settings.Default.UseTribeFilterForBreedingPlan = cbTribeFilterLibrary.Checked;
+            CalculateBreedingScoresAndDisplayPairs();
+        }
+
         private void cbOnlyOneSuggestionForFemales_CheckedChanged(object sender, EventArgs e)
         {
             Settings.Default.BreedingPlanOnlyBestSuggestionForEachFemale = cbBPOnlyOneSuggestionForFemales.Checked;

ARKBreedingStats/CreatureBox.cs

@@ -203,8 +203,11 @@ public void Clear()
             groupBox1.Text = string.Empty;
             _creature = null;
             LbMotherAndWildInfo.Text = string.Empty;
+            LbFather.Text = string.Empty;
             statsDisplay1.Clear();
             pictureBox1.Visible = false;
+            labelSpecies.Text = string.Empty;
+            labelNotes.Text = string.Empty;
             regionColorChooser1.Clear();
         }
 

ARKBreedingStats/Form1.collection.cs

@@ -14,6 +14,7 @@
 using System.Xml.Serialization;
 using ARKBreedingStats.uiControls;
 using ARKBreedingStats.utils;
+using System.Diagnostics;
 
 namespace ARKBreedingStats
 {
@@ -531,15 +532,6 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
             // calculate creature values
             RecalculateAllCreaturesValues();
 
-            // set flags for all creatures. this is needed for backwards compatibility (added 05/2020) TODO: remove in late 2021.
-            foreach (Creature c in _creatureCollection.creatures)
-            {
-                c.InitializeFlags();
-                c.RecalculateNewMutations();
-                if (c.ArkIdImported && c.ArkIdInGame == null)
-                    c.ArkIdInGame = Utils.ConvertImportedArkIdToIngameVisualization(c.ArkId);
-            }
-
             if (!keepCurrentSelections && _creatureCollection.creatures.Any())
                 tabControlMain.SelectedTab = tabPageLibrary;
 
@@ -568,7 +560,7 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
             FilterLibRecalculate();
 
             // apply last sorting
-            listViewLibrary.Sort();
+            //listViewLibrary.Sort(); // TODO
 
             UpdateTempCreatureDropDown();