added Harpoon Launcher and Tranq Spear Bolts

Signed-off-by: cadaei <[email protected]>
cadon · Aug 5, 2018 · 52da1ae · 52da1ae
1 parent c45dd98
commit 52da1ae
Show file tree

Hide file tree

Showing 8 changed files with 250 additions and 77 deletions.
diff --git a/ARKBreedingStats/Taming.cs b/ARKBreedingStats/Taming.cs
@@ -242,7 +242,7 @@ public static TimeSpan tamingDuration(int speciesI, int foodQuantity, string foo
             return new TimeSpan(0, 0, seconds);
         }
 
-        public static string knockoutInfo(int speciesIndex, int level, double longneck, double crossbow, double bow, double slingshot, double club, double prod, double boneDamageAdjuster, out bool knockoutNeeded, out string koNumbers)
+        public static string knockoutInfo(int speciesIndex, int level, double longneck, double crossbow, double bow, double slingshot, double club, double prod, double harpoon, double boneDamageAdjuster, out bool knockoutNeeded, out string koNumbers)
         {
             koNumbers = "";
             knockoutNeeded = false;
@@ -267,7 +267,8 @@ public static string knockoutInfo(int speciesIndex, int level, double longneck,
                 // shocking tranq dart: 26*17 = 442
                 // electric prod: 226
 
-                koNumbers = (longneck > 0 ? Math.Ceiling(totalTorpor / (442 * boneDamageAdjuster * longneck)) + " × " + Loc.s("ShockingTranqDarts") + "\n" : "")
+                koNumbers = (harpoon > 0 ? Math.Ceiling(totalTorpor / (306 * boneDamageAdjuster * harpoon)) + " × " + Loc.s("TranqSpearBolts") + "\n" : "")
+                     + (longneck > 0 ? Math.Ceiling(totalTorpor / (442 * boneDamageAdjuster * longneck)) + " × " + Loc.s("ShockingTranqDarts") + "\n" : "")
                      + (longneck > 0 ? Math.Ceiling(totalTorpor / (221 * boneDamageAdjuster * longneck)) + " × " + Loc.s("TranqDarts") + "\n" : "")
                      + (prod > 0 ? Math.Ceiling(totalTorpor / (226 * boneDamageAdjuster * prod)) + " × " + Loc.s("ElectricProdHits") + "\n" : "")
                      + (crossbow > 0 ? Math.Ceiling(totalTorpor / (157.5 * boneDamageAdjuster * crossbow)) + " × " + Loc.s("TranqArrowsCrossBow") + "\n" : "")

diff --git a/ARKBreedingStats/TamingControl.Designer.cs b/ARKBreedingStats/TamingControl.Designer.cs
diff --git a/ARKBreedingStats/TamingControl.cs b/ARKBreedingStats/TamingControl.cs
@@ -70,7 +70,7 @@ public void setSpeciesIndex(int speciesIndex)
                     {
                         RadioButton rbBD = new RadioButton();
                         gbWeaponDamage.Controls.Add(rbBD);
-                        rbBD.Location = new Point(6, 173 + 19 * ib);
+                        rbBD.Location = new Point(6, 199 + 19 * ib);
                         rbBD.AutoSize = false;
                         rbBD.Size = new Size(194, 17);
 
@@ -293,6 +293,7 @@ private void updateKOCounting(double boneDamageAdjuster = 0)
                 chkbDmSlingshot.Checked ? (double)nudWDmSlingshot.Value / 100 : 0,
                 chkbDmClub.Checked ? (double)nudWDmClub.Value / 100 : 0,
                 chkbDmProd.Checked ? (double)nudWDmProd.Value / 100 : 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;
@@ -388,6 +389,7 @@ public void SetLocalizations()
             Loc.ControlText(gpStarvingTime);
             Loc.ControlText(btnAddStarvingTimer);
             Loc.ControlText(gbWeaponDamage);
+            Loc.ControlText(chkbDmHarpoon, "HarpoonLauncher");
             Loc.ControlText(chkbDmProd, "ElectricProd");
             Loc.ControlText(chkbDmLongneck, "Longneck");
             Loc.ControlText(chkbDmCrossbow, "Crossbow");