fix for level-bar-maxWidth. fix for setting multipliers to official v…

…alues. fix of too many decimals of imprintingBonus. fix for cuddleIntervall-Setting, also increase decimals to 3.

ARKBreedingStats/Extraction.cs

@@ -182,7 +182,11 @@ public void extractLevels(int speciesI, int level, List<StatIO> statIOs, double
             if (imprintingBonusRounded == 1)
                 imprintingBonus = 1;
             else if (Values.V.species[speciesI].breeding != null && Values.V.species[speciesI].breeding.maturationTimeAdjusted > 0)
-                imprintingBonus = Math.Round(imprintingBonusRounded * Values.V.species[speciesI].breeding.maturationTimeAdjusted * cuddleIntervalMultiplier / 14400) * 14400 / (Values.V.species[speciesI].breeding.maturationTimeAdjusted * cuddleIntervalMultiplier);
+            {
+                imprintingBonus = Math.Round(Math.Round(imprintingBonusRounded * Values.V.species[speciesI].breeding.maturationTimeAdjusted / (14400 * cuddleIntervalMultiplier)) * 14400 * cuddleIntervalMultiplier / (Values.V.species[speciesI].breeding.maturationTimeAdjusted), 4);
+                if (imprintingBonus > 1)
+                    imprintingBonus = 1;
+            }
             else
                 imprintingBonus = 0;
             double imprintingMultiplier = (1 + imprintingBonus * imprintingBonusMultiplier * .2);

ARKBreedingStats/Form1.cs

@@ -209,7 +209,7 @@ private void Form1_Load(object sender, EventArgs e)
 
             // check for updates
             DateTime lastUpdateCheck = Properties.Settings.Default.lastUpdateCheck;
-            if (DateTime.Now.AddDays(-7) > lastUpdateCheck)
+            if (DateTime.Now.AddDays(-3) > lastUpdateCheck)
                 checkForUpdates(true);
 
             //// TODO: debug-numbers
@@ -479,7 +479,7 @@ private void extractionFailed()
             labelErrorHelp.Visible = true;
             groupBoxPossibilities.Visible = false;
             labelDoc.Visible = false;
-            if (numericUpDownImprintingBonusExtractor.Value > 0)
+            if (checkBoxAlreadyBred.Checked && numericUpDownImprintingBonusExtractor.Value > 0)
                 labelImprintingFailInfo.Visible = true;
         }
 
@@ -1085,7 +1085,7 @@ private void loadCollectionFile(string fileName, bool keepCurrentCreatures = fal
             {
                 creatureCollection.multipliers = oldMultipliers;
                 if (creatureCollection.multipliers == null)
-                    creatureCollection.multipliers = Values.V.statMultipliers;
+                    creatureCollection.multipliers = Values.V.getOfficialMultipliers();
             }
 
             applyMultipliersToValues();
@@ -1111,8 +1111,8 @@ private void loadCollectionFile(string fileName, bool keepCurrentCreatures = fal
             creatureBoxListView.CreatureCollection = creatureCollection;
             for (int s = 0; s < 8; s++)
             {
-                statIOs[s].cc = creatureCollection;
-                testingIOs[s].cc = creatureCollection;
+                statIOs[s].barMaxLevel = creatureCollection.maxWildLevel / 3;
+                testingIOs[s].barMaxLevel = creatureCollection.maxWildLevel / 3;
             }
 
             lastAutoSaveBackup = DateTime.Now.AddMinutes(-10);
@@ -1493,12 +1493,12 @@ private void newCollection()
         {
             if (collectionDirty)
             {
-                if (MessageBox.Show("Your Creature Collection has been modified since it was last saved, are you sure you want to discard your changes and quit without saving?", "Discard Changes?", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == System.Windows.Forms.DialogResult.No)
+                if (MessageBox.Show("Your Creature Collection has been modified since it was last saved, are you sure you want to discard your changes and create a new Library without saving?", "Discard Changes?", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == System.Windows.Forms.DialogResult.No)
                     return;
             }
 
             if (creatureCollection.multipliers == null)
-                creatureCollection.multipliers = Values.V.statMultipliers;
+                creatureCollection.multipliers = Values.V.getOfficialMultipliers();
             // use previously used multipliers again in the new file
             double[][] oldMultipliers = creatureCollection.multipliers;
 
@@ -2630,6 +2630,11 @@ private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
                 creatureBoxListView.maxDomLevel = creatureCollection.maxDomLevel;
                 breedingPlan1.maxSuggestions = creatureCollection.maxBreedingSuggestions;
                 fileSync.changeFile(currentFileName);
+                for (int s = 0; s < 8; s++)
+                {
+                    statIOs[s].barMaxLevel = creatureCollection.maxWildLevel / 3;
+                    testingIOs[s].barMaxLevel = creatureCollection.maxWildLevel / 3;
+                }
                 setCollectionChanged(true);
             }
         }

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.20.8.2")]
+[assembly: AssemblyFileVersion("0.20.8.3")]

ARKBreedingStats/Settings.cs

@@ -79,7 +79,8 @@ private void saveSettings()
         {
             for (int s = 0; s < 8; s++)
             {
-                cc.multipliers[s] = multSetter[s].Multipliers;
+                for (int sm = 0; sm < 4; sm++)
+                    cc.multipliers[s][sm] = multSetter[s].Multipliers[sm];
             }
             cc.breedingMultipliers[0] = (double)numericUpDownHatching.Value;
             cc.breedingMultipliers[1] = (double)numericUpDownMaturation.Value;
@@ -113,15 +114,11 @@ private void buttonAllToOne_Click(object sender, EventArgs e)
 
         private void buttonSetToOfficial_Click(object sender, EventArgs e)
         {
-            cc.multipliers = Values.V.statMultipliers;
-            if (cc.multipliers.Length > 7)
+            if (Values.V.statMultipliers.Length > 7)
             {
                 for (int s = 0; s < 8; s++)
                 {
-                    if (cc.multipliers[s].Length > 3)
-                    {
-                        multSetter[s].Multipliers = cc.multipliers[s];
-                    }
+                    multSetter[s].Multipliers = Values.V.statMultipliers[s];
                 }
             }
         }

ARKBreedingStats/StatIO.cs

@@ -25,7 +25,7 @@ public partial class StatIO : UserControl
         public int statIndex;
         private bool domZeroFixed;
         ToolTip tt = new ToolTip();
-        public CreatureCollection cc;
+        public int barMaxLevel = 45;
 
         public StatIO()
         {
@@ -206,7 +206,7 @@ public void Clear()
 
         private void numLvW_ValueChanged(object sender, EventArgs e)
         {
-            int lengthPercentage = (int)((int)numLvW.Value * (300.0f / (cc!=null? cc.maxWildLevel:40))); // in percentage of the max-barwidth
+            int lengthPercentage = 100 * (int)numLvW.Value / barMaxLevel; // in percentage of the max-barwidth
 
             if (lengthPercentage > 100) { lengthPercentage = 100; }
             if (lengthPercentage < 0) { lengthPercentage = 0; }
@@ -220,7 +220,7 @@ private void numLvW_ValueChanged(object sender, EventArgs e)
 
         private void numLvD_ValueChanged(object sender, EventArgs e)
         {
-            int lengthPercentage = (int)((int)numLvD.Value * (300.0f / (cc!=null? cc.maxWildLevel:40))); // in percentage of the max-barwidth
+            int lengthPercentage = 100 * (int)numLvD.Value / barMaxLevel; // in percentage of the max-barwidth
 
             if (lengthPercentage > 100) { lengthPercentage = 100; }
             if (lengthPercentage < 0) { lengthPercentage = 0; }

ARKBreedingStats/Values.cs

@@ -124,5 +124,17 @@ public void applyMultipliersToBreedingTimes(double[] multipliers)
             }
         }
 
+        public double[][] getOfficialMultipliers()
+        {
+            double[][] offMultipliers = new double[8][];
+            for (int s = 0; s < 8; s++)
+            {
+                offMultipliers[s] = new double[4];
+                for (int sm = 0; sm < 4; sm++)
+                    offMultipliers[s][sm] = statMultipliers[s][sm];
+            }
+            return offMultipliers;
+        }
+
     }
 }

ARKBreedingStats/ver.txt

@@ -1 +1 @@
-2530000,0.20.8.2
+2530000,0.20.8.3