fixed OCR for oxygen-less species again. added radarChart in library.…

… fix that a 0 in the game-setting files is now interpreted as a 1, like the game does. updated values to v259. Updated species-names. adjusted tameAff-stat-multipliers, so that if tameAdd is negative, tameAffMultiplier isn't used (Griffin).

ARKBreedingStats/ARKBreedingStats.csproj

@@ -327,7 +327,10 @@
     <None Include="json\classicFlyers.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="json\ocr.json">
+    <None Include="json\ocr_1920x1080_100.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="json\ocr_2680x1080_100.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Resources\kofi.png" />

ARKBreedingStats/App.config

@@ -74,7 +74,7 @@
                 <value>160</value>
             </setting>
             <setting name="ocrFile" serializeAs="String">
-                <value>json/ocr.json</value>
+                <value>json/ocr_1920x1080_100.json</value>
             </setting>
             <setting name="waitBeforeScreenCapture" serializeAs="String">
                 <value>500</value>

ARKBreedingStats/CreatureCollection.cs

@@ -26,7 +26,7 @@ namespace ARKBreedingStats
         public bool showNeutered = true;
         public bool showMutated = true;
         public bool useFiltersInTopStatCalculation = false;
-        public int maxDomLevel = 66;
+        public int maxDomLevel = 71;
         public int maxWildLevel = 150;
         public int maxChartLevel = 50;
         public int maxBreedingSuggestions = 10;

ARKBreedingStats/Form1.cs

@@ -302,6 +302,7 @@ private void Form1_Load(object sender, EventArgs e)
 
             radarChart1.initializeVariables(creatureCollection.maxChartLevel);
             radarChartExtractor.initializeVariables(creatureCollection.maxChartLevel);
+            radarChartLibrary.initializeVariables(creatureCollection.maxChartLevel);
 
             // check for updates
             DateTime lastUpdateCheck = Properties.Settings.Default.lastUpdateCheck;
@@ -1140,6 +1141,7 @@ private void applySettingsToValues()
             breedingPlan1.maxWildLevels = creatureCollection.maxWildLevel;
             radarChart1.initializeVariables(creatureCollection.maxChartLevel);
             radarChartExtractor.initializeVariables(creatureCollection.maxChartLevel);
+            radarChartLibrary.initializeVariables(creatureCollection.maxChartLevel);
             statPotentials1.levelDomMax = creatureCollection.maxDomLevel;
             statPotentials1.levelGraphMax = creatureCollection.maxChartLevel;
 
@@ -1852,6 +1854,8 @@ private void listViewLibrary_SelectedIndexChanged(object sender, EventArgs e)
             {
                 Creature c = (Creature)listViewLibrary.SelectedItems[0].Tag;
                 creatureBoxListView.setCreature(c);
+                if (tabControlLibFilter.SelectedTab == tabPageLibRadarChart)
+                    radarChartLibrary.setLevels(c.levelsWild);
                 pedigreeNeedsUpdate = true;
             }
         }
@@ -3737,8 +3741,16 @@ private void nameFixes(CreatureCollection cc)
             foreach (Creature c in cc.creatures)
             {
                 c.species = c.species.Trim();
-                if (c.species == "Wooly Rhino")
-                    c.species = "Woolly Rhino";
+                switch (c.species)
+                {
+                    case "Wooly Rhino": c.species = "Woolly Rhino"; break;
+                    case "Pachy": c.species = "Pachycephalosaurus"; break;
+                    case "Quetzal": c.species = "Quetzalcoatl"; break;
+                    case "Sarco": c.species = "Sarcosuchus"; break;
+                    case "Therizinosaurus": c.species = "Therizinosaur"; break;
+                    case "Rex": c.species = "Tyrannosaurus"; break;
+                    case "Compy": c.species = "Compsognathus"; break;
+                }
             }
         }
     }

ARKBreedingStats/Form1.resx

@@ -230,6 +230,47 @@ The TE can differ 0.1% due to ingame-rounding.</value>
 9. The stats of the creature were changed recently and the game displays the old values. Level up a stat, that should trigger a recalculation of the values.
 
 10. The stat-values in this tool are wrong or the game does show wrong stats. You can via reddit or github send me a screenshot that contains the stats of the creature ingame and the extractor with the typed in values along with the stat-multipliers in the settings.</value>
+  </data>
+  <data name="radarChartLibrary.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
   </data>
   <metadata name="contextMenuStripLibrary.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>364, 17</value>

ARKBreedingStats/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.23.7")]
+[assembly: AssemblyFileVersion("0.23.8")]

ARKBreedingStats/Properties/Settings.settings

@@ -78,7 +78,7 @@
       <Value Profile="(Default)">160</Value>
     </Setting>
     <Setting Name="ocrFile" Type="System.String" Scope="User">
-      <Value Profile="(Default)">json/ocr.json</Value>
+      <Value Profile="(Default)">json/ocr_1920x1080_100.json</Value>
     </Setting>
     <Setting Name="waitBeforeScreenCapture" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">500</Value>

ARKBreedingStats/Values.cs

@@ -231,7 +231,7 @@ public void applyMultipliers(CreatureCollection cc, bool eventMultipliers = fals
                         species[sp].stats[s].BaseValue = (double)species[sp].statsRaw[s][0];
                         // don't apply the multiplier if AddWhenTamed is negative (currently the only case is the Giganotosaurus, which does not get the subtraction multiplied)
                         species[sp].stats[s].AddWhenTamed = (double)species[sp].statsRaw[s][3] * (species[sp].statsRaw[s][3] > 0 ? cc.multipliers[s][0] : 1);
-                        species[sp].stats[s].MultAffinity = (double)species[sp].statsRaw[s][4] * cc.multipliers[s][1];
+                        species[sp].stats[s].MultAffinity = (double)species[sp].statsRaw[s][4] * (species[sp].statsRaw[s][3] > 0 ? cc.multipliers[s][1] : 1);
                         species[sp].stats[s].IncPerTamedLevel = (double)species[sp].statsRaw[s][2] * cc.multipliers[s][2];
                         species[sp].stats[s].IncPerWildLevel = (double)species[sp].statsRaw[s][1] * cc.multipliers[s][3];
                     }