Merge branch 'dev'

cadon · Nov 4, 2023 · db8d137 · db8d137
2 parents 8fad058 + 0f6e7bd
commit db8d137
Show file tree

Hide file tree

Showing 30 changed files with 485 additions and 133 deletions.
diff --git a/ARKBreedingStats/Ark.cs b/ARKBreedingStats/Ark.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using ARKBreedingStats.species;
-
-namespace ARKBreedingStats
+namespace ARKBreedingStats
 {
     /// <summary>
     /// Constants of the game Ark.
@@ -92,8 +89,7 @@ public static class Ark
         #region Colors
 
         public const byte ColorFirstId = 1;
-        public const byte ColorMaxId = 200;
-        public const byte DyeFirstId = 201;
+        public const byte DyeFirstIdASE = 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).
@@ -111,6 +107,28 @@ public static class Ark
         /// The name is trimmed to this length in game.
         /// </summary>
         public const int MaxCreatureNameLength = 24;
+
+        public enum Game
+        {
+            /// <summary>
+            /// ARK: Survival Evolved (2015)
+            /// </summary>
+            ASE,
+            /// <summary>
+            /// ARK: Survival Ascended (2023)
+            /// </summary>
+            ASA
+        }
+
+        /// <summary>
+        /// Collection indicator for ARK: Survival Evolved.
+        /// </summary>
+        public const string Ase = "ASE";
+
+        /// <summary>
+        /// Collection indicator for ARK: Survival Ascended, also the mod tag id for the ASA values.
+        /// </summary>
+        public const string Asa = "ASA";
     }
 
     /// <summary>

diff --git a/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs b/ARKBreedingStats/BreedingPlanning/BreedingPlan.cs
@@ -787,7 +787,7 @@ private void SetBestLevels(int[] bestLevels, IEnumerable<Creature> creatures, bo
                 : string.Format(Loc.S(bestInSpecies ? "BestPossibleSpeciesLibrary" : "BestPossibleSpeciesLibraryFiltered"), _currentSpecies.name);
 
             Creature crB = new Creature(_currentSpecies, bestLevelsOfWhat,
-                null, null, 0, new int[Stats.StatsCount], null, 1, true, levelStep: levelStep);
+                null, null, 0, new int[Stats.StatsCount], null, null, 1, true, levelStep: levelStep);
             bool totalLevelUnknown = false;
             for (int s = 0; s < Stats.StatsCount; s++)
             {

diff --git a/ARKBreedingStats/Extraction.cs b/ARKBreedingStats/Extraction.cs
@@ -123,6 +123,8 @@ public void ExtractLevels(Species species, int level, StatIO[] statIOs, double l
             if (imprintingBonusList == null)
                 imprintingBonusList = new List<MinMaxDouble> { new MinMaxDouble(0) };
 
+            double[] statImprintMultipliers = species.StatImprintMultipliers;
+
             for (int IBi = 0; IBi < imprintingBonusList.Count; IBi++)
             {
                 _imprintingBonusRange = imprintingBonusList[IBi];
@@ -133,7 +135,7 @@ public void ExtractLevels(Species species, int level, StatIO[] statIOs, double l
                 var imprintingMultiplierRanges = new MinMaxDouble[Stats.StatsCount];
                 for (int s = 0; s < Stats.StatsCount; s++)
                 {
-                    double statImprintingMultiplier = species.StatImprintMultipliers[s];
+                    double statImprintingMultiplier = statImprintMultipliers[s];
                     imprintingMultiplierRanges[s] = statImprintingMultiplier != 0
                         ? new MinMaxDouble(1 + _imprintingBonusRange.Min * imprintingBonusMultiplier * statImprintingMultiplier,
                                            1 + _imprintingBonusRange.Max * imprintingBonusMultiplier * statImprintingMultiplier)
@@ -237,7 +239,7 @@ public void ExtractLevels(Species species, int level, StatIO[] statIOs, double l
 
                     MinMaxDouble statImprintingMultiplierRange = new MinMaxDouble(1);
                     // only use imprintingMultiplier for stats that use them. Stamina and Oxygen don't use ist. Sometimes speed neither.
-                    if (bred && species.StatImprintMultipliers[s] != 0)
+                    if (bred && statImprintMultipliers[s] != 0)
                         statImprintingMultiplierRange = imprintingMultiplierRanges[s].Clone();
 
                     // if dom levels have no effect, just calculate the wild level
@@ -268,7 +270,7 @@ public void ExtractLevels(Species species, int level, StatIO[] statIOs, double l
                     }
 
                     bool resultWasSortedOutBecauseOfImpossibleTe = false;
-                    for (int lw = minLW; lw < maxLW + 1; lw++)
+                    for (int lw = minLW; lw <= maxLW; lw++)
                     {
                         // imprinting bonus is applied to all stats except stamina (s==1) and oxygen (s==2) and speed (s==6)
                         MinMaxDouble valueWODomRange = new MinMaxDouble(statBaseValue * (1 + stats[s].IncPerWildLevel * lw) * statImprintingMultiplierRange.Min + (PostTamed ? stats[s].AddWhenTamed : 0),

diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs
diff --git a/ARKBreedingStats/Form1.collection.cs b/ARKBreedingStats/Form1.collection.cs
@@ -558,6 +558,7 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                 speciesSelector1.SetSpecies(_creatureCollection.creatures[0].Species);
 
             // set library species to what it was before loading
+            selectedLibrarySpecies = Values.V.SpeciesByBlueprint(selectedLibrarySpecies?.blueprintPath);
             if (selectedLibrarySpecies != null)
                 listBoxSpeciesLib.SelectedItem = selectedLibrarySpecies;
             else if (Properties.Settings.Default.LibrarySelectSelectedSpeciesOnLoad)