Merge branch 'dev'

cadon · May 19, 2024 · 36c5fd3 · 36c5fd3
2 parents ca99f6e + a3a047e
commit 36c5fd3
Show file tree

Hide file tree

Showing 30 changed files with 941 additions and 87 deletions.
diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj
@@ -105,6 +105,7 @@
     <Compile Include="library\DummyCreatures.cs" />
     <Compile Include="library\LevelStatusFlags.cs" />
     <Compile Include="multiplierTesting\CalculateMultipliers.cs" />
+    <Compile Include="multiplierTesting\TaTmSolver.cs" />
     <Compile Include="NamePatterns\NameList.cs" />
     <Compile Include="NamePatterns\NamePatternEntry.cs">
       <SubType>Component</SubType>

diff --git a/ARKBreedingStats/Ark.cs b/ARKBreedingStats/Ark.cs
@@ -232,5 +232,25 @@ public static class Stats
             false, //TemperatureFortitude,
             false, //CraftingSpeedMultiplier
         };
+
+        /// <summary>
+        /// Returns if the stat is a percentage value.
+        /// </summary>
+        public static bool IsPercentage(int statIndex)
+        {
+            return statIndex == MeleeDamageMultiplier
+                   || statIndex == SpeedMultiplier
+                   || statIndex == TemperatureFortitude
+                   || statIndex == CraftingSpeedMultiplier;
+        }
+
+        /// <summary>
+        /// Returns the displayed decimal values of the stat with the given index
+        /// </summary>
+        public static int Precision(int statIndex)
+        {
+            // damage and speed are percentage values and thus the displayed values have a higher precision
+            return IsPercentage(statIndex) ? 3 : 1;
+        }
     }
 }
diff --git a/ARKBreedingStats/Extraction.cs b/ARKBreedingStats/Extraction.cs
@@ -186,7 +186,7 @@ public void ExtractLevels(Species species, int level, StatIO[] statIOs, double l
                     statIOs[s].postTame = PostTamed;
 
                     // determine the precision of the input value
-                    float toleranceForThisStat = StatValueCalculation.DisplayedAberration(statIOs[s].Input, Utils.Precision(s), highPrecisionInputs);
+                    float toleranceForThisStat = StatValueCalculation.DisplayedAberration(statIOs[s].Input, Stats.Precision(s), highPrecisionInputs);
                     //Console.WriteLine($"Precision stat {s}: {toleranceForThisStat}");
 
                     MinMaxDouble inputValue = new MinMaxDouble(statIOs[s].Input - toleranceForThisStat, statIOs[s].Input + toleranceForThisStat);

diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -214,7 +214,7 @@ public Form1()
                     statIndex = s
                 };
 
-                if (Utils.Precision(s) == 3)
+                if (Stats.IsPercentage(s))
                 {
                     statIo.Percent = true;
                     statIoTesting.Percent = true;

diff --git a/ARKBreedingStats/NamePatterns/NamePattern.cs b/ARKBreedingStats/NamePatterns/NamePattern.cs
@@ -355,7 +355,7 @@ public static Dictionary<string, string> CreateTokenDictionary(Creature creature
             for (int s = 0; s < Stats.StatsCount; s++)
             {
                 dict.Add(StatAbbreviationFromIndex[s], creature.levelsWild[s].ToString());
-                dict.Add($"{StatAbbreviationFromIndex[s]}_vb", (creature.valuesBreeding[s] * (Utils.Precision(s) == 3 ? 100 : 1)).ToString());
+                dict.Add($"{StatAbbreviationFromIndex[s]}_vb", (creature.valuesBreeding[s] * (Stats.IsPercentage(s) ? 100 : 1)).ToString());
                 dict.Add($"istop{StatAbbreviationFromIndex[s]}", speciesTopLevels == null ? (creature.levelsWild[s] > 0 ? "1" : string.Empty) :
                     creature.levelsWild[s] >= speciesTopLevels[s] ? "1" : string.Empty);
                 dict.Add($"isnewtop{StatAbbreviationFromIndex[s]}", speciesTopLevels == null ? (creature.levelsWild[s] > 0 ? "1" : string.Empty) :

diff --git a/ARKBreedingStats/Pedigree/PedigreeCreature.cs b/ARKBreedingStats/Pedigree/PedigreeCreature.cs
@@ -208,8 +208,8 @@ public Creature Creature
                         _labels[s].BackColor = Color.WhiteSmoke;
                         _labels[s].ForeColor = Color.LightGray;
                         _ttMonospaced.SetToolTip(_labels[s], Utils.StatName(si, false, _creature.Species?.statNames) + ": "
-                            + $"{_creature.valuesBreeding[si] * (Utils.Precision(si) == 3 ? 100 : 1),7:#,0.0}"
-                            + (Utils.Precision(si) == 3 ? "%" : string.Empty));
+                            + $"{_creature.valuesBreeding[si] * (Stats.IsPercentage(si) ? 100 : 1),7:#,0.0}"
+                            + (Stats.IsPercentage(si) ? "%" : string.Empty));
                     }
                     else
                     {
@@ -234,8 +234,8 @@ public Creature Creature
                             _labels[s].BackColor = Utils.GetColorFromPercent((int)(_creature.levelsWild[si] * 2.5), _creature.IsTopStat(si) ? 0.2 : 0.7);
                         _labels[s].ForeColor = Parent?.ForeColor ?? Color.Black; // needed so text is not transparent on overlay
                         _ttMonospaced.SetToolTip(_labels[s], Utils.StatName(si, false, _creature.Species?.statNames) + ": "
-                            + $"{_creature.valuesBreeding[si] * (Utils.Precision(si) == 3 ? 100 : 1),7:#,0.0}"
-                            + (Utils.Precision(si) == 3 ? "%" : string.Empty)
+                            + $"{_creature.valuesBreeding[si] * (Stats.IsPercentage(si) ? 100 : 1),7:#,0.0}"
+                            + (Stats.IsPercentage(si) ? "%" : string.Empty)
                             + (_creature.levelsMutated == null ? string.Empty
                                 : Environment.NewLine + Loc.S("Mutations") + ": " + _creature.levelsMutated[si]
                                 ));

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.61.3.0")]
+[assembly: AssemblyFileVersion("0.61.4.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/Stats.cs b/ARKBreedingStats/Stats.cs
@@ -48,7 +48,7 @@ public static double CalculateValue(Species species, int stat, int levelWild, in
             if (result <= 0) return 0;
 
             if (roundToIngamePrecision)
-                return Math.Round(result, Utils.Precision(stat), MidpointRounding.AwayFromZero);
+                return Math.Round(result, Stats.Precision(stat), MidpointRounding.AwayFromZero);
 
             return result;
         }

diff --git a/ARKBreedingStats/Utils.cs b/ARKBreedingStats/Utils.cs
@@ -390,15 +390,6 @@ public static string StatName(int statIndex, bool abbreviation = false, Dictiona
             return abbreviation ? _statNamesAbb[statIndex] : _statNames[statIndex];
         }
 
-        /// <summary>
-        /// Returns the displayed decimal values of the stat with the given index
-        /// </summary>
-        public static int Precision(int statIndex)
-        {
-            // damage and speed are percentage values, need more precision
-            return (statIndex == Stats.SpeedMultiplier || statIndex == Stats.MeleeDamageMultiplier || statIndex == Stats.CraftingSpeedMultiplier) ? 3 : 1;
-        }
-
         /// <summary>
         /// String that represents a duration.
         /// </summary>

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.61.3.0"
+      "version": "0.61.4.0"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",

diff --git a/ARKBreedingStats/importExportGun/ImportExportGun.cs b/ARKBreedingStats/importExportGun/ImportExportGun.cs
@@ -116,19 +116,19 @@ private static Creature ConvertExportGunToCreature(ExportGunCreatureFile ec, out
                 wildLevels[si] = s.Wild;
                 domLevels[si] = s.Tamed;
                 mutLevels[si] = s.Mutated;
-                statValues[si] = s.Value;
+                statValues[si] = s.Value + (Stats.IsPercentage(si) ? 1 : 0);
                 si++;
             }
 
             var arkId = Utils.ConvertArkIdsToLongArkId(ec.DinoId1Int, ec.DinoId2Int);
 
+            // wild creatures have a TE of 100 %, so don't use that here
             var isWild = string.IsNullOrEmpty(ec.DinoName)
                          && string.IsNullOrEmpty(ec.TribeName)
                          && string.IsNullOrEmpty(ec.TamerString)
                          && string.IsNullOrEmpty(ec.OwningPlayerName)
                          && string.IsNullOrEmpty(ec.ImprinterName)
                          && ec.OwningPlayerID == 0
-                         && ec.TameEffectiveness == 0
                          ;
 
             var isBred = !string.IsNullOrEmpty(ec.ImprinterName)

diff --git a/ARKBreedingStats/json/serverMultipliers.json b/ARKBreedingStats/json/serverMultipliers.json
@@ -82,6 +82,22 @@
       "MatingIntervalMultiplier": 0.5,
       "EggHatchSpeedMultiplier": 2,
       "BabyMatureSpeedMultiplier": 2
+    },
+	"all 1": {
+      "statMultipliers": [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ]
     }
   }
 }