Merge branch 'dev'

cadon · May 15, 2020 · beb86bd · beb86bd
2 parents 177f131 + 9d173af
commit beb86bd
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 33 deletions.
diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs
diff --git a/ARKBreedingStats/Form1.collection.cs b/ARKBreedingStats/Form1.collection.cs
@@ -399,7 +399,11 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                 creatureBoxListView.Clear();
             }
 
-            creatureCollection.DeletedCreatureGuids = null; // no longer needed
+            creatureCollection.DeletedCreatureGuids = null; // the info was processed and is no longer needed.
+
+            // remove creature entries without species information. some outdated and invisible entries can exist with that. the blueprintInfo is not deleted with the current version, so no new such entries should appear.
+            creatureCollection.creatures = creatureCollection.creatures
+                .Where(c => !string.IsNullOrEmpty(c.speciesBlueprint)).ToList();
 
             InitializeCollection();
 

diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -14,7 +14,6 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows.Forms;

diff --git a/ARKBreedingStats/Form1.extractor.cs b/ARKBreedingStats/Form1.extractor.cs
@@ -802,7 +802,7 @@ private void ExtractExportedFileInExtractor(importExported.ExportedCreatureContr
             // gets deleted in extractLevels()
             exportedCreatureControl = ecc;
 
-            if (exportedCreatureList != null && exportedCreatureList.ownerSuffix != null)
+            if (!string.IsNullOrEmpty(exportedCreatureList?.ownerSuffix))
                 creatureInfoInputExtractor.CreatureOwner += exportedCreatureList.ownerSuffix;
         }
 

diff --git a/ARKBreedingStats/Form1.library.cs b/ARKBreedingStats/Form1.library.cs
@@ -104,6 +104,9 @@ private void AddCreatureToCollection(bool fromExtractor = true, long motherArkId
 
             creatureCollection.MergeCreatureList(new List<Creature> { creature });
 
+            // set status of exportedCreatureControl if available
+            exportedCreatureControl?.setStatus(importExported.ExportedCreatureControl.ImportStatus.JustImported, DateTime.Now);
+
             // if creature already exists by guid, use the already existing creature object for the parent assignments
             creature = creatureCollection.creatures.SingleOrDefault(c => c.guid == creature.guid) ?? creature;
 
@@ -142,9 +145,6 @@ private void AddCreatureToCollection(bool fromExtractor = true, long motherArkId
             creatureInfoInputExtractor.parentListValid = false;
             creatureInfoInputTester.parentListValid = false;
 
-            // set status of exportedCreatureControl if available
-            exportedCreatureControl?.setStatus(importExported.ExportedCreatureControl.ImportStatus.JustImported, DateTime.Now);
-
             SetCollectionChanged(true, species);
         }
 
@@ -1048,7 +1048,7 @@ private void FilterLib()
             if (listBoxSpeciesLib.SelectedIndex > 0
                 && listBoxSpeciesLib.SelectedItem is Species selectedSpecies)
             {
-                filteredList = filteredList.Where(c => c.Species.Equals(selectedSpecies));
+                filteredList = filteredList.Where(c => c.Species == selectedSpecies);
                 if (selectedSpecies.IsGlowSpecies)
                     chargeStatsHeaders = true;
             }

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.39.6.0")]
+[assembly: AssemblyFileVersion("0.39.6.1")]
 [assembly: NeutralResourcesLanguage("en")]