fixed extraction-issue for HP of aberrant species. fix for crash in r…

…aising-tab if one parent was not declared. changed stat-names for glow-species in tester and extractor. fixed visual if creature in library is set to mature. fixed recalculation of breeding plan after a creature is set to ready-to-mate. fixed edit-timer-control in raising-tab. updated reaper-king values.
cadon · Jan 7, 2018 · ee6f3e4 · ee6f3e4
1 parent f6f7e6d
commit ee6f3e4
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 53 deletions.
diff --git a/ARKBreedingStats/BreedingPlan.Designer.cs b/ARKBreedingStats/BreedingPlan.Designer.cs
diff --git a/ARKBreedingStats/Extraction.cs b/ARKBreedingStats/Extraction.cs
@@ -282,7 +282,17 @@ public void extractLevels(int speciesI, int level, List<StatIO> statIOs, double
                     double maxLW = 0;
                     if (Values.V.species[speciesI].stats[s].BaseValue > 0 && Values.V.species[speciesI].stats[s].IncPerWildLevel > 0)
                     {
-                        maxLW = Math.Round(((inputValue / (postTamed ? 1 + lowerTEBound * Values.V.species[speciesI].stats[s].MultAffinity : 1) - (postTamed ? Values.V.species[speciesI].stats[s].AddWhenTamed : 0)) / (postTamed ? statBaseValueTamed : statBaseValueWild) - 1) / Values.V.species[speciesI].stats[s].IncPerWildLevel); // floor is too unprecise
+                        double multAffinityFactor = Values.V.species[speciesI].stats[s].MultAffinity;
+                        if (postTamed)
+                        {
+                            // the multiplicative bonus is only multiplied with the TE if it is positive (i.e. negative boni won't get less bad if the TE is low)
+                            if (multAffinityFactor > 0)
+                                multAffinityFactor *= lowerTEBound;
+                            multAffinityFactor += 1;
+                        }
+                        else
+                            multAffinityFactor = 1;
+                        maxLW = Math.Round(((inputValue / multAffinityFactor - (postTamed ? Values.V.species[speciesI].stats[s].AddWhenTamed : 0)) / (postTamed ? statBaseValueTamed : statBaseValueWild) - 1) / Values.V.species[speciesI].stats[s].IncPerWildLevel); // floor is too unprecise
                     }
                     if (s != 7 && maxLW > levelWildFromTorporRange[1]) { maxLW = levelWildFromTorporRange[1]; } // torpor level can be too high right after taming (torpor bug in the game)
 

diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs
diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -897,10 +897,13 @@ private void comboBoxSpeciesGlobal_SelectedIndexChanged(object sender, EventArgs
                 speciesIndex = comboBoxSpeciesGlobal.SelectedIndex;
                 creatureInfoInputExtractor.SpeciesIndex = speciesIndex;
                 creatureInfoInputTester.SpeciesIndex = speciesIndex;
+                bool isglowSpecies = (Values.V.glowSpecies.IndexOf(Values.V.species[speciesIndex].name) != -1);
                 for (int s = 0; s < 8; s++)
                 {
                     activeStats[s] = (Values.V.species[speciesIndex].stats[s].BaseValue > 0) && (s != 2 || !Values.V.species[speciesIndex].doesNotUseOxygen || oxygenForAll);
                     statIOs[s].Enabled = activeStats[s];
+                    statIOs[s].Title = Utils.statName(s, false, isglowSpecies);
+                    testingIOs[s].Title = Utils.statName(s, false, isglowSpecies);
                 }
                 if (tabControlMain.SelectedTab == tabPageExtractor)
                 {
@@ -3070,13 +3073,14 @@ private void removeCooldownGrowingToolStripMenuItem_Click(object sender, EventAr
                 if (c.growingUntil > DateTime.Now)
                     c.growingUntil = DateTime.Now;
 
-                i.SubItems[9].Text = "-";
+                i.SubItems[10].Text = "-";
                 // color for cooldown
                 Color forecolor, backcolor;
                 cooldownColors(c, out forecolor, out backcolor);
-                i.SubItems[9].ForeColor = forecolor;
-                i.SubItems[9].BackColor = backcolor;
+                i.SubItems[10].ForeColor = forecolor;
+                i.SubItems[10].BackColor = backcolor;
             }
+            breedingPlan1.breedingPlanNeedsUpdate = true;
             listViewLibrary.EndUpdate();
         }
 

diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/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.24.3")]
+[assembly: AssemblyFileVersion("0.24.4")]
diff --git a/ARKBreedingStats/RaisingControl.Designer.cs b/ARKBreedingStats/RaisingControl.Designer.cs
diff --git a/ARKBreedingStats/RaisingControl.cs b/ARKBreedingStats/RaisingControl.cs
@@ -450,6 +450,11 @@ private void dateTimePickerEditTimerFinish_ValueChanged(object sender, EventArgs
                 dhmsInputTimerEditTimer.Timespan = dateTimePickerEditTimerFinish.Value.Subtract(DateTime.Now);
         }
 
+        private void dhmsInputTimerEditTimer_ValueChanged(uiControls.dhmsInput sender, TimeSpan timespan)
+        {
+            dateTimePickerEditTimerFinish.Value = DateTime.Now.Add(timespan);
+        }
+
         private void bSaveTimerEdit_Click(object sender, EventArgs e)
         {
             if (iteEdit != null)

diff --git a/ARKBreedingStats/Stats.cs b/ARKBreedingStats/Stats.cs
@@ -17,6 +17,7 @@ public static double calculateValue(int speciesIndex, int stat, int levelWild, i
                 {
                     add = Values.V.species[speciesIndex].stats[stat].AddWhenTamed;
                     domMultAffinity = Values.V.species[speciesIndex].stats[stat].MultAffinity;
+                    // the multiplicative bonus is only multiplied with the TE if it is positive (i.e. negative boni won't get less bad if the TE is low)
                     if (domMultAffinity >= 0)
                         domMultAffinity *= tamingEff;
                     domMult = (tamingEff >= 0 ? (1 + domMultAffinity) : 1) * (1 + levelDom * Values.V.species[speciesIndex].stats[stat].IncPerTamedLevel);

diff --git a/ARKBreedingStats/Utils.cs b/ARKBreedingStats/Utils.cs
@@ -139,13 +139,21 @@ public static string levelPercentile(int l)
             return "This level is in the top " + prb[l].ToString("N2") + "% of what you can find.";
         }
 
-        public static string statName(int s, bool abr = false)
+        public static string statName(int s, bool abr = false, bool glow=false)
         {
             if (s >= 0 && s < 8)
             {
                 string[] statNames;
-                if (abr) statNames = new string[] { "HP", "St", "Ox", "Fo", "We", "Dm", "Sp", "To" };
-                else statNames = new string[] { "Health", "Stamina", "Oxygen", "Food", "Weight", "Damage", "Speed", "Torpidity" };
+                if (glow)
+                {
+                    if (abr) statNames = new string[] { "HP", "CC", "CRe", "Fo", "We", "CRa", "Sp", "To" };
+                    else statNames = new string[] { "Health", "Ch Capacity", "Ch Regen", "Food", "Weight", "Ch Emission Range", "Speed", "Torpidity" };
+                }
+                else
+                {
+                    if (abr) statNames = new string[] { "HP", "St", "Ox", "Fo", "We", "Dm", "Sp", "To" };
+                    else statNames = new string[] { "Health", "Stamina", "Oxygen", "Food", "Weight", "Damage", "Speed", "Torpidity" };
+                }
                 return statNames[s];
             }
             return "";

diff --git a/ARKBreedingStats/Values.cs b/ARKBreedingStats/Values.cs
@@ -45,6 +45,8 @@ public class Values
         public double tamingSpeedMultiplierSP = 1;
         public bool celsius = true;
 
+        public List<string> glowSpecies = new List<string>();
+
         public Values()
         {
         }
@@ -105,6 +107,8 @@ public bool loadValues()
                     sp.initialize();
                     _V.speciesNames.Add(sp.name);
                 }
+
+                _V.glowSpecies = new List<string> { "Bulbdog", "Featherlight", "Glowbug", "Glowtail", "Shinehorn" };
             }
 
             //saveJSON();

diff --git a/ARKBreedingStats/json/ocr_2560x1440_100.json b/ARKBreedingStats/json/ocr_2560x1440_100.json
diff --git a/ARKBreedingStats/json/values.json b/ARKBreedingStats/json/values.json
diff --git a/ARKBreedingStats/raising/ParentStats.cs b/ARKBreedingStats/raising/ParentStats.cs
@@ -58,8 +58,8 @@ public void setParentValues(Creature mother, Creature father)
                         mother != null && father != null ? (mother.valuesBreeding[s] > father.valuesBreeding[s] ? 1 : 2) : 0
                         );
                 }
-                labelMother.Text = mother.name;
-                labelFather.Text = (labelMother.Width > 78 ? "\n" : "") + father.name;
+                labelMother.Text = mother == null ? "unknown" : mother.name;
+                labelFather.Text = father == null ? "unknown" : (labelMother.Width > 78 ? "\n" : "") + father.name;
             }
         }
     }

diff --git a/ARKBreedingStats/settings/Settings.Designer.cs b/ARKBreedingStats/settings/Settings.Designer.cs
diff --git a/ARKBreedingStats/ver.txt b/ARKBreedingStats/ver.txt
@@ -1 +1 @@
-276.12,0.24.3
+276.21,0.24.4