Merge branch 'dev'

cadon · Apr 22, 2023 · 4a1b7b8 · 4a1b7b8
2 parents d09673b + aaafdfc
commit 4a1b7b8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/ARKBreedingStats/AboutBox1.cs b/ARKBreedingStats/AboutBox1.cs
@@ -109,6 +109,7 @@ private void linkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 * Myrmecoleon (extra species images)
 * Lunat1q (improved OCR)
 * ThatGamerBlue (species dividers in virtual listview)
+* Jaymei (ATLAS species data)
 
 Translations:
 * French by Vykan and Yanuut

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.52.0.0")]
+[assembly: AssemblyFileVersion("0.52.1.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
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.52.0.0"
+      "version": "0.52.1.0"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",

diff --git a/ARKBreedingStats/species/CreatureColored.cs b/ARKBreedingStats/species/CreatureColored.cs
@@ -470,9 +470,9 @@ public static string RegionColorInfo(Species species, byte[] colorIds)
             var cs = species.colors;
             for (int r = 0; r < Ark.ColorRegionCount; r++)
             {
-                if (!string.IsNullOrEmpty(cs[r]?.name))
+                if (species.EnabledColorRegions[r])
                 {
-                    creatureRegionColors.Append($"\n{cs[r].name} ({r}): {CreatureColors.CreatureColorName(colorIds[r])} ({colorIds[r]})");
+                    creatureRegionColors.Append($"\n{cs[r]?.name} ({r}): {CreatureColors.CreatureColorName(colorIds[r])} ({colorIds[r]})");
                 }
             }
             return creatureRegionColors.ToString();

diff --git a/ARKBreedingStats/uiControls/LibraryInfo.cs b/ARKBreedingStats/uiControls/LibraryInfo.cs
@@ -122,7 +122,7 @@ void AddParagraph(string text, string suffixForPlainText = null, bool bold = fal
             for (int i = 0; i < Ark.ColorRegionCount; i++)
             {
                 if (!species.EnabledColorRegions[i]) continue;
-                AddParagraph($"Color region {i}: {species.colors[i].name}", bold: true, relativeFontSize: 1.1f);
+                AddParagraph($"Color region {i}: {species.colors[i]?.name}", bold: true, relativeFontSize: 1.1f);
                 var colorsExist = colorsExistPerRegion[i].Count;
                 AddParagraph($"{colorsExist} color id{(colorsExist != 1 ? "s" : string.Empty)} available in your library:");
                 AddParagraph(CreateNumberRanges(colorsExistPerRegion[i]));