From 60ef24fac5560b1e0c96da5feed6ee595364a66a Mon Sep 17 00:00:00 2001 From: cadon Date: Sat, 22 Apr 2023 13:31:29 +0200 Subject: [PATCH 1/3] credit to ATLAS species data --- ARKBreedingStats/AboutBox1.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ARKBreedingStats/AboutBox1.cs b/ARKBreedingStats/AboutBox1.cs index 2f546575..5fe699e3 100644 --- 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 From a059af7bc97697c75add3b18d3b62a281fc610a0 Mon Sep 17 00:00:00 2001 From: cadon Date: Sat, 22 Apr 2023 19:11:14 +0200 Subject: [PATCH 2/3] null fix --- ARKBreedingStats/species/CreatureColored.cs | 4 ++-- ARKBreedingStats/uiControls/LibraryInfo.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ARKBreedingStats/species/CreatureColored.cs b/ARKBreedingStats/species/CreatureColored.cs index ec9dd721..092d9c8f 100644 --- 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 index 2ae2159e..f5310bf8 100644 --- 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])); From aaafdfcc394fd47e8c846aaadb5cb9de76d5dafb Mon Sep 17 00:00:00 2001 From: cadon Date: Sat, 22 Apr 2023 19:12:15 +0200 Subject: [PATCH 3/3] ver --- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- ARKBreedingStats/_manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index f2f73e87..1392ef8c 100644 --- 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 index 1e83f774..d6b68c9d 100644 --- 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",