Merge branch 'dev'

Author: cadon

ARKBreedingStats/ARKBreedingStats.csproj

@@ -109,6 +109,7 @@
     <Compile Include="NamePatterns\JavaScriptNamePattern.cs" />
     <Compile Include="NamePatterns\TokenModel.cs" />
     <Compile Include="species\CanHaveWildLevelExceptions.cs" />
+    <Compile Include="species\ColorPattern.cs" />
     <Compile Include="StatsOptions\StatsOptionsControl.cs">
       <SubType>Component</SubType>
     </Compile>

ARKBreedingStats/AboutBox1.cs

@@ -119,6 +119,7 @@ private void linkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 * Lunat1q: improved OCR
 * ThatGamerBlue: species dividers in virtual listView
 * Jaymei: ATLAS species data
+* Shen: many ASA color region images
 
 Translations:
 * French by Vykan and Yanuut

ARKBreedingStats/App.config

@@ -535,6 +535,9 @@
             <setting name="ColorSelectorShowAllColors" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="BeginServerListeningOnLaunch" serializeAs="String">
+                <value>False</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>

ARKBreedingStats/CreatureBox.cs

@@ -151,7 +151,7 @@ void SetParentLabel(Label l, string lbText = null, bool clickable = false)
                 labelNotes.Text = _creature.note;
                 _tt.SetToolTip(labelNotes, _creature.note);
                 labelSpecies.Text = _creature.SpeciesName;
-                pictureBox1.SetImageAndDisposeOld(CreatureColored.GetColoredCreature(_creature.colors, _creature.Species, _colorRegionUseds, creatureSex: _creature.sex));
+                pictureBox1.SetImageAndDisposeOld(CreatureColored.GetColoredCreature(_creature.colors, _creature.Species, _colorRegionUseds, creatureSex: _creature.sex, game: _cc.Game));
                 _tt.SetToolTip(pictureBox1, CreatureColored.RegionColorInfo(_creature.Species, _creature.colors)
                     + "\n\nClick to copy creature infos as image to the clipboard");
                 pictureBox1.Visible = true;
@@ -251,7 +251,7 @@ private void RegionColorChooser1_RegionColorChosen()
             if (_creature == null) return;
 
             _creature.colors = regionColorChooser1.ColorIds;
-            pictureBox1.SetImageAndDisposeOld(CreatureColored.GetColoredCreature(_creature.colors, _creature.Species, _colorRegionUseds, creatureSex: _creature.sex));
+            pictureBox1.SetImageAndDisposeOld(CreatureColored.GetColoredCreature(_creature.colors, _creature.Species, _colorRegionUseds, creatureSex: _creature.sex, game: _cc.Game));
             Changed?.Invoke(_creature, false, false);
         }
 

ARKBreedingStats/CreatureInfoInput.cs

@@ -123,7 +123,9 @@ private void UpdateRegionColorImage()
         {
             ParentInheritance?.UpdateColors(RegionColors);
             ColorsChanged?.Invoke(this);
-            PbColorRegion?.SetImageAndDisposeOld(CreatureColored.GetColoredCreature(RegionColors, _selectedSpecies, regionColorChooser1.ColorRegionsUseds, 256, onlyImage: true, creatureSex: CreatureSex));
+            PbColorRegion?.SetImageAndDisposeOld(CreatureColored.GetColoredCreature(RegionColors, _selectedSpecies,
+                regionColorChooser1.ColorRegionsUseds, 256, onlyImage: true, creatureSex: CreatureSex
+                , game: CreatureCollection.CurrentCreatureCollection?.Game));
         }
 
         /// <summary>

ARKBreedingStats/Form1.Designer.cs

@@ -384,7 +384,7 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
 
             if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath))
             {
-                MessageBoxes.ShowMessageBox($"Save file with name \"{filePath}\" does not exist!", $"File not found");
+                MessageBoxes.ShowMessageBox($"Couldn't load file with name\n{filePath}\nit does not exist!", "File not found");
                 return false;
             }
 
@@ -404,6 +404,7 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                     Thread.Sleep(delayOnRetry);
                     continue;
                 }
+
                 try
                 {
                     if (Path.GetExtension(filePath).ToLower() == ".xml")
@@ -413,7 +414,8 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                         {
                             // use xml-serializer for old library-format
                             XmlSerializer reader = new XmlSerializer(typeof(oldLibraryFormat.CreatureCollectionOld));
-                            var creatureCollectionOld = (oldLibraryFormat.CreatureCollectionOld)reader.Deserialize(fileStream);
+                            var creatureCollectionOld =
+                                (oldLibraryFormat.CreatureCollectionOld)reader.Deserialize(fileStream);
 
                             List<Mod> mods = null;
                             // first check if additional values are used, and if the according values-file is already available.
@@ -422,40 +424,49 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                             {
                                 // usually the old filename is equal to the mod-tag
                                 bool modFound = false;
-                                string modTag = Path.GetFileNameWithoutExtension(creatureCollectionOld.additionalValues).Replace(" ", "").ToLower().Replace("gaiamod", "gaia");
+                                string modTag = Path.GetFileNameWithoutExtension(creatureCollectionOld.additionalValues)
+                                    .Replace(" ", "").ToLower().Replace("gaiamod", "gaia");
                                 foreach (KeyValuePair<string, ModInfo> tmi in Values.V.modsManifest.modsByTag)
                                 {
                                     if (tmi.Key.ToLower() == modTag)
                                     {
                                         modFound = true;
 
-                                        MessageBox.Show("The library contains creatures of modded species. For a correct file-conversion the correct mod-values file is needed.\n\n"
+                                        MessageBox.Show(
+                                            "The library contains creatures of modded species. For a correct file-conversion the correct mod-values file is needed.\n\n"
                                             + "If the mod-value file is not loaded, the conversion may assign wrong species to your creatures.\n"
                                             + "If the mod-value file is not available locally, it will be tried to download it.",
-                                            $"Mod values needed - {Utils.ApplicationNameVersion}", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                                            $"Mod values needed - {Utils.ApplicationNameVersion}", MessageBoxButtons.OK,
+                                            MessageBoxIcon.Information);
 
                                         if (Values.V.loadedModsHash != Values.NoModsHash)
                                             LoadStatAndKibbleValues(false); // reset values to default
-                                        LoadModValueFiles(new List<string> { tmi.Value.mod.FileName }, true, true, out mods);
+                                        LoadModValueFiles(new List<string> { tmi.Value.mod.FileName }, true, true,
+                                            out mods);
                                         break;
                                     }
                                 }
+
                                 if (!modFound
-                                    && MessageBox.Show("The additional-values file in the library you're loading is unknown. You should first get a values-file in the new format for that mod.\n"
+                                    && MessageBox.Show(
+                                        "The additional-values file in the library you're loading is unknown. You should first get a values-file in the new format for that mod.\n"
                                         + "If you're loading the library the conversion of some modded species to the new format may fail and the according creatures have to be imported again later.\n\n"
                                         + $"File:\n{filePath}\n"
                                         + $"unknown mod-file: {modTag}\n\n"
-                                        + "Do you want to load the library and risk losing creatures?", $"Unknown mod-file - {Utils.ApplicationNameVersion}",
+                                        + "Do you want to load the library and risk losing creatures?",
+                                        $"Unknown mod-file - {Utils.ApplicationNameVersion}",
                                         MessageBoxButtons.YesNo, MessageBoxIcon.Warning) != DialogResult.Yes)
                                     return false;
                             }
 
-                            _creatureCollection = oldLibraryFormat.FormatConverter.ConvertXml2Asb(creatureCollectionOld, filePath);
+                            _creatureCollection =
+                                oldLibraryFormat.FormatConverter.ConvertXml2Asb(creatureCollectionOld, filePath);
                             _creatureCollection.ModList = mods ?? new List<Mod>(0);
 
                             if (_creatureCollection == null) throw new Exception("Conversion failed");
 
-                            string fileNameWOExt = Path.Combine(Path.GetDirectoryName(filePath), Path.GetFileNameWithoutExtension(filePath));
+                            string fileNameWOExt = Path.Combine(Path.GetDirectoryName(filePath),
+                                Path.GetFileNameWithoutExtension(filePath));
                             // check if new fileName is not yet existing
                             filePath = fileNameWOExt + CollectionFileExtension;
                             if (File.Exists(filePath))
@@ -472,19 +483,24 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                     else
                     {
                         // new json-format
-                        if (FileService.LoadJsonFile(filePath, out CreatureCollection readCollection, out string errorMessage))
+                        if (FileService.LoadJsonFile(filePath, out CreatureCollection readCollection,
+                                out string errorMessage))
                         {
                             if (!Version.TryParse(readCollection.FormatVersion, out Version ccVersion)
-                               || !Version.TryParse(CreatureCollection.CurrentLibraryFormatVersion, out Version currentVersion)
-                               || ccVersion > currentVersion)
+                                || !Version.TryParse(CreatureCollection.CurrentLibraryFormatVersion,
+                                    out Version currentVersion)
+                                || ccVersion > currentVersion)
                             {
-                                throw new FormatException($"Unsupported format version: {readCollection.FormatVersion ?? "null"}");
+                                throw new FormatException(
+                                    $"Unsupported format version: {readCollection.FormatVersion ?? "null"}");
                             }
+
                             _creatureCollection = readCollection;
                         }
                         else
                         {
-                            MessageBoxes.ShowMessageBox($"Error while trying to read the library-file\n{filePath}\n\n{errorMessage}");
+                            MessageBoxes.ShowMessageBox(
+                                $"Error while trying to read the library-file\n{filePath}\n\n{errorMessage}");
                             return false;
                         }
                     }
@@ -499,15 +515,23 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                 catch (FormatException ex)
                 {
                     // This FormatVersion is not understood, abort
-                    MessageBoxes.ShowMessageBox("This library format is unsupported in this version of ARK Smart Breeding." +
-                                                 $"\n\n{ex.Message}\n\nTry updating to a newer version.");
+                    MessageBoxes.ShowMessageBox(
+                        "This library format is unsupported in this version of ARK Smart Breeding." +
+                        $"\n\n{ex.Message}\n\nTry updating to a newer version.");
                     if ((DateTime.Now - Properties.Settings.Default.lastUpdateCheck).TotalMinutes < 10)
                         CheckForUpdates();
                     return false;
                 }
                 catch (InvalidOperationException ex)
                 {
-                    MessageBoxes.ExceptionMessageBox(ex, $"The library-file\n{filePath}\ncouldn't be opened, we thought you should know.");
+                    MessageBoxes.ExceptionMessageBox(ex,
+                        $"The library-file\n{filePath}\ncouldn't be opened, we thought you should know.");
+                    return false;
+                }
+                catch (Exception ex)
+                {
+                    MessageBoxes.ExceptionMessageBox(ex,
+                        $"The library-file\n{filePath}\ncouldn't be opened, an unexpected exception occurred.");
                     return false;
                 }
                 finally
@@ -1015,7 +1039,8 @@ private void DetermineLevelStatusAndSoundFeedback(Creature c, bool playImportSou
             var species = c.Species;
             _topLevels.TryGetValue(species, out var topLevels);
             var statWeights = breedingPlan1.StatWeighting.GetWeightingForSpecies(species);
-            LevelStatusFlags.DetermineLevelStatus(species, topLevels, statWeights,
+            var considerAsTopStat = StatsOptionsConsiderTopStats.GetStatsOptions(species).StatOptions;
+            LevelStatusFlags.DetermineLevelStatus(species, topLevels, statWeights, considerAsTopStat,
                 c.levelsWild, c.levelsMutated, c.valuesBreeding, out _, out _);
 
             if (playImportSound)
@@ -1043,11 +1068,19 @@ private void CopyTopCreatureStatsToClipboard(object sender, EventArgs e)
                     var si = Stats.DisplayOrder[s];
                     if (si == Stats.Torpidity) continue;
                     var level = sp.Key.UsesStat(si)
-                        ? (statWeights.Item1[si] < 0 ? sp.Value.WildLevelsLowest[si] : sp.Value.WildLevelsHighest[si]) : -1;
-                    if (level < 0) continue;
-                    maxLevel += level;
-                    columns[s + 1].Add(level.ToString());
+                        ? (statWeights.Item1[si] < 0 ? sp.Value.WildLevelsLowest[si] : sp.Value.WildLevelsHighest[si])
+                        : -1;
+                    if (level >= 0)
+                    {
+                        maxLevel += level;
+                        columns[s + 1].Add(level.ToString());
+                    }
+                    else
+                    {
+                        columns[s + 1].Add(string.Empty);
+                    }
                 }
+
                 columns[Stats.StatsCount + 1].Add(maxLevel.ToString());
             }