values of best possible breeding result can now be copied to clipboar…

…d. added harpoon to taming-tab. improved layout of taming-tab so text is no longer cutoff. added Tek Stego.
cadon · Aug 15, 2018 · f8afcdb · f8afcdb
1 parent 52da1ae
commit f8afcdb
Show file tree

Hide file tree

Showing 8 changed files with 502 additions and 313 deletions.
diff --git a/ARKBreedingStats/BreedingPlan.cs b/ARKBreedingStats/BreedingPlan.cs
@@ -47,6 +47,7 @@ public BreedingPlan()
             breedingPairs = new List<BreedingPair>();
             pedigreeCreatureBest.IsVirtual = true;
             pedigreeCreatureWorst.IsVirtual = true;
+            pedigreeCreatureBestPossibleInSpecies.IsVirtual = true;
             pedigreeCreatureBest.onlyLevels = true;
             pedigreeCreatureWorst.onlyLevels = true;
             pedigreeCreatureBestPossibleInSpecies.onlyLevels = true;
@@ -75,6 +76,7 @@ public void bindEvents()
             pedigreeCreatureWorst.CreatureEdit += new PedigreeCreature.CreatureEditEventHandler(EditCreature);
             pedigreeCreatureBest.exportToClipboard += new PedigreeCreature.ExportToClipboardEventHandler(exportToClipboard);
             pedigreeCreatureWorst.exportToClipboard += new PedigreeCreature.ExportToClipboardEventHandler(exportToClipboard);
+            pedigreeCreatureBestPossibleInSpecies.exportToClipboard += new PedigreeCreature.ExportToClipboardEventHandler(exportToClipboard);
             pedigreeCreatureBest.CreatureClicked += new PedigreeCreature.CreatureChangedEventHandler(CreatureClicked);
             pedigreeCreatureWorst.CreatureClicked += new PedigreeCreature.CreatureChangedEventHandler(CreatureClicked);
         }

diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs
diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -34,6 +34,6 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.28.7")]
+[assembly: AssemblyFileVersion("0.28.8")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/TamingControl.Designer.cs b/ARKBreedingStats/TamingControl.Designer.cs
diff --git a/ARKBreedingStats/TamingControl.cs b/ARKBreedingStats/TamingControl.cs
@@ -108,11 +108,11 @@ public void setSpeciesIndex(int speciesIndex)
                         if (i >= foodControls.Count)
                         {
                             tf = new TamingFoodControl(f);
-                            tf.Location = new Point(20, 80 + 45 * i);
+                            tf.Location = new Point(20, 60 + 45 * i);
                             tf.valueChanged += new TamingFoodControl.ValueChangedEventHandler(updateTamingData);
                             tf.Clicked += new TamingFoodControl.ClickedEventHandler(onlyOneFood);
                             foodControls.Add(tf);
-                            Controls.Add(tf);
+                            panel1.Controls.Add(tf);
                         }
                         else
                         {
@@ -286,7 +286,7 @@ private void updateKOCounting(double boneDamageAdjuster = 0)
             if (boneDamageAdjuster == 0)
                 boneDamageAdjuster = currentBoneDamageAdjuster;
             bool knockoutNeeded;
-            labelKOCount.Text = Taming.knockoutInfo(speciesIndex, (int)nudLevel.Value,
+            lbKOInfo.Text = Taming.knockoutInfo(speciesIndex, (int)nudLevel.Value,
                 chkbDmLongneck.Checked ? (double)nudWDmLongneck.Value / 100 : 0,
                 chkbDmCrossbow.Checked ? (double)nudWDmCrossbow.Value / 100 : 0,
                 chkbDmBow.Checked ? (double)nudWDmBow.Value / 100 : 0,
@@ -296,7 +296,7 @@ private void updateKOCounting(double boneDamageAdjuster = 0)
                 chkbDmHarpoon.Checked ? (double)nudWDmHarpoon.Value / 100 : 0,
                 boneDamageAdjuster,
                 out knockoutNeeded, out koNumbers) + (boneDamageAdjustersImmobilization.Length > 0 ? "\n\n" + boneDamageAdjustersImmobilization : "");
-            labelKOCount.ForeColor = knockoutNeeded ? SystemColors.ControlText : SystemColors.GrayText;
+            lbKOInfo.ForeColor = knockoutNeeded ? SystemColors.ControlText : SystemColors.GrayText;
             if (!knockoutNeeded)
                 koNumbers = "";
         }
@@ -307,7 +307,7 @@ public double[] weaponDamages
             {
                 if (value != null)
                 {
-                    NumericUpDown[] nuds = new NumericUpDown[] { nudWDmLongneck, nudWDmCrossbow, nudWDmBow, nudWDmSlingshot, nudWDmClub, nudWDmProd };
+                    NumericUpDown[] nuds = new NumericUpDown[] { nudWDmLongneck, nudWDmCrossbow, nudWDmBow, nudWDmSlingshot, nudWDmClub, nudWDmProd, nudWDmHarpoon };
                     for (int i = 0; i < value.Length && i < nuds.Length; i++)
                     {
                         nuds[i].Value = (decimal)value[i];
@@ -316,20 +316,20 @@ public double[] weaponDamages
             }
             get
             {
-                return new double[] { (double)nudWDmLongneck.Value, (double)nudWDmCrossbow.Value, (double)nudWDmBow.Value, (double)nudWDmSlingshot.Value, (double)nudWDmClub.Value, (double)nudWDmProd.Value };
+                return new double[] { (double)nudWDmLongneck.Value, (double)nudWDmCrossbow.Value, (double)nudWDmBow.Value, (double)nudWDmSlingshot.Value, (double)nudWDmClub.Value, (double)nudWDmProd.Value, (double)nudWDmHarpoon.Value };
             }
         }
 
         public int weaponDamagesEnabled
         {
             set
             {
-                CheckBox[] ckbs = new CheckBox[] { chkbDmLongneck, chkbDmCrossbow, chkbDmBow, chkbDmSlingshot, chkbDmClub, chkbDmProd };
+                CheckBox[] ckbs = new CheckBox[] { chkbDmLongneck, chkbDmCrossbow, chkbDmBow, chkbDmSlingshot, chkbDmClub, chkbDmProd, chkbDmHarpoon };
                 for (int i = 0; i < ckbs.Length; i++) { ckbs[i].Checked = (value & (1 << i)) > 0; }
             }
             get
             {
-                CheckBox[] ckbs = new CheckBox[] { chkbDmLongneck, chkbDmCrossbow, chkbDmBow, chkbDmSlingshot, chkbDmClub, chkbDmProd };
+                CheckBox[] ckbs = new CheckBox[] { chkbDmLongneck, chkbDmCrossbow, chkbDmBow, chkbDmSlingshot, chkbDmClub, chkbDmProd, chkbDmHarpoon };
                 int r = 0;
                 for (int i = 0; i < ckbs.Length; i++) { r += (ckbs[i].Checked ? (1 << i) : 0); }
                 return r;