Merge pull request #33 from tiemonl/feature/GH-26_remove_timer

Remove timer for casting

Author: Liam

csharp/fisher.sln

@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.27004.2009
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fisher", "fisher\fisher.csproj", "{93668F5E-8746-4070-AE80-19D2609EDE78}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fisherCLI", "fisherCLI\fisherCLI.csproj", "{76C7907B-3778-443F-9926-E099C04110E7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{93668F5E-8746-4070-AE80-19D2609EDE78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93668F5E-8746-4070-AE80-19D2609EDE78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93668F5E-8746-4070-AE80-19D2609EDE78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76C7907B-3778-443F-9926-E099C04110E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76C7907B-3778-443F-9926-E099C04110E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76C7907B-3778-443F-9926-E099C04110E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76C7907B-3778-443F-9926-E099C04110E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

csharp/fisher/Form1.Designer.cs

@@ -11,7 +11,6 @@ public partial class Form1 : Form {
 		#region Declarations
 
 		private static bool steam;
-		private static int rodType;
 		private static Point locationStartButton;
 		private static Point locationCloseShellDialogBox;
 		private static Point locationTradeFishButton;
@@ -33,7 +32,6 @@ public partial class Form1 : Form {
 		MethodHelper helper;
 		#endregion
 
-
 		public Form1() {
 
 			InitializeComponent();
@@ -43,35 +41,18 @@ public Form1() {
 			backgroundThreadGetTimes.WorkerReportsProgress = true;
 			backgroundThreadGetTimes.WorkerSupportsCancellation = true;
 
-			this.Size = new Size(375, 350);
-
-			rodTimerDebugToolTip.SetToolTip(rodTimerDebug, "Use this to adjust fishing timer to get a better catch result." +
-				"\nAdd/subtract milliseconds (you shouldn't have to change more than 10 milliseconds)" +
-				"\ndepending on if you are stopping before the max value or going past the max.");
-			getTimesDedubToolTip.SetToolTip(getTimesBtn, "This function will automatically calculate the rod timer.\n" +
-				"Press the button and wait for the program to time the cast bar going from max value to max value.\n" +
-				"This will calculate five passes of the cast bar maximizing and return an average.\n" +
-				"You can use this average as a solid rod timer to get a near 100% max cast.");
-
 			kongButton.CheckedChanged += new EventHandler(platform_CheckedChanged);
 			kartridgeButton.CheckedChanged += new EventHandler(platform_CheckedChanged);
 			steamButton.CheckedChanged += new EventHandler(platform_CheckedChanged);
 
-			woodFishingRod.CheckedChanged += new EventHandler(rodType_CheckedChanged);
-			trollingRod.CheckedChanged += new EventHandler(rodType_CheckedChanged);
-			spinningRod.CheckedChanged += new EventHandler(rodType_CheckedChanged);
-			flyRod.CheckedChanged += new EventHandler(rodType_CheckedChanged);
-			legRod.CheckedChanged += new EventHandler(rodType_CheckedChanged);
-
 			castCatchLocationLbl.Text = "Cast/Catch Location:\nPress start button when on fishing start screen";
 
-			rodChoiceGroupBox.Enabled = false;
+			helper = new MethodHelper(steam);
+
 			baitToUseText.Enabled = false;
 			findLocationBtn.Enabled = false;
 			autoBtn.Enabled = false;
 			cancelAutoModeBtn.Enabled = false;
-			getTimesBtn.Enabled = false;
-
 
 		}
 		/// <summary>
@@ -80,57 +61,15 @@ public Form1() {
 		/// </summary>
 		private void platform_CheckedChanged(object sender, EventArgs e) {
 			RadioButton radioButton = sender as RadioButton;
-
 			if (kongButton.Checked || kartridgeButton.Checked) {
 				steam = false;
 			} else if (steamButton.Checked) {
 				steam = true;
 			}
-			rodChoiceGroupBox.Enabled = true;
-		}
-
-		/// <summary>
-		/// This determines which radio button was clicked.
-		/// Each rod has a different timing.
-		/// The timing is the time it takes for the casting bar to go from its max value, down to its lowest point and back up to its max value.
-		/// I use this method of fishing as it has netted better results over clicking cast as soon as the program detects the casting bar at its max value.
-		/// </summary>
-		private void rodType_CheckedChanged(object sender, EventArgs e) {
-			RadioButton radioButton = sender as RadioButton;
-
-			if (woodFishingRod.Checked) {
-				if (steam)
-					rodType = 1250;
-				else
-					rodType = 1260;
-			} else if (trollingRod.Checked) {
-				if (steam)
-					rodType = 1350;
-				else
-					rodType = 1360;
-			} else if (spinningRod.Checked) {
-				if (steam)
-					rodType = 1450;
-				else
-					rodType = 1460;
-			} else if (flyRod.Checked) {
-				if (steam)
-					rodType = 1520;
-				else
-					rodType = 1525;
-			} else if (legRod.Checked) {
-				if (steam)
-					rodType = 1580;
-				else
-					rodType = 1585;
-			}
-			rodTimerDebug.Value = rodType;
-			helper = new MethodHelper(steam, rodType);
 			baitToUseText.Enabled = true;
 			findLocationBtn.Enabled = true;
 		}
 
-
 		private void CastCatchLocation_Click(object sender, EventArgs e) {
 			locationStartButton = helper.FindColor(startButtonGreen);
 			if (locationStartButton == new Point()) {
@@ -155,23 +94,13 @@ private void CastCatchLocation_Click(object sender, EventArgs e) {
 					locationTopLeftWeightScreenshot = new Point(locationStartButton.X - 25, locationStartButton.Y - 130);
 					locationBottomRightWeightScreenshot = new Point(locationStartButton.X + 160, locationStartButton.Y - 50);
 					location100Position = new Point(locationStartButton.X + 373, locationStartButton.Y - 81);
-
 				}
 				castCatchLocationLbl.Text = "Cast/Catch Location:\n" + locationStartButton.ToString();
 				autoBtn.Enabled = true;
 				cancelAutoModeBtn.Enabled = true;
-				getTimesBtn.Enabled = true;
 			}
 		}
 
-		private void getTimesBtn_Click(object sender, EventArgs e) {
-			getTimesBtn.Enabled = false;
-			backgroundThreadGetTimes.RunWorkerAsync();
-			getTimesBtn.Enabled = true;
-		}
-
-
-
 		private void autoBtn_Click(object sender, EventArgs e) {
 			backgroundThread.RunWorkerAsync();
 		}
@@ -189,7 +118,7 @@ private void backgroundThread_DoWork(object sender, DoWorkEventArgs e) {
 					//Performs cast
 					bool caughtFish = true;
 					bool fishGetAway = true;
-					printMessage(baitUsed, baitToUse, " bait used.\nPerforming cast.\nTimer: " + rodType);
+					printMessage(baitUsed, baitToUse, " bait used.\nPerforming cast.");
 					++baitUsed;
 					Invoke(new Action(() => Refresh()));
 					Invoke(new Action(() => helper.startCast(locationStartButton)));
@@ -214,7 +143,7 @@ private void backgroundThread_DoWork(object sender, DoWorkEventArgs e) {
 							Invoke(new Action(() => helper.catchFish(location100Position, oneHundredCatchColor)));
 							Thread.Sleep(5000);
 							while (fishGetAway) {
-							
+
 								//fish caught
 								if (worker.CancellationPending == true) {
 									e.Cancel = true;
@@ -253,8 +182,6 @@ private void backgroundThread_DoWork(object sender, DoWorkEventArgs e) {
 			backgroundThread.CancelAsync();
 		}
 
-
-
 		private void cancelAutoModeBtn_Click(object sender, EventArgs e) {
 			backgroundThread.CancelAsync();
 		}
@@ -264,30 +191,5 @@ private void printMessage(int baitUsed, int baitToUse, string msg) {
 				debugAutoStepLbl.Text = baitUsed + "/" + baitToUse + msg;
 			});
 		}
-
-		private void debugOptions_CheckedChanged(object sender, EventArgs e) {
-			if (debugOptions.Checked) {
-				this.Size = new Size(500, 350);
-
-			} else {
-				this.Size = new Size(375, 350);
-			}
-		}
-
-		private void rodTimerDebug_ValueChanged(object sender, EventArgs e) {
-			rodType = (int)rodTimerDebug.Value;
-			//initiliaze helper again to reflect the rodtype change.
-			helper = new MethodHelper(steam, rodType);
-		}
-
-		private void backgroundThreadGetTimes_DoWork(object sender, DoWorkEventArgs e) {
-			BackgroundWorker worker = sender as BackgroundWorker;
-			Invoke(new Action(() => helper.getTimesMessageBox(locationStartButton)));
-			backgroundThreadGetTimes.CancelAsync();
-		}
-
-		private void saveScreenshotButton_Click(object sender, EventArgs e) {
-			helper.GetScreenShot(true);
-		}
 	}
 }

csharp/fisher/Form1.cs

@@ -120,15 +120,9 @@
   <metadata name="backgroundThread.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="rodTimerDebugToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>172, 17</value>
-  </metadata>
   <metadata name="backgroundThreadGetTimes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>351, 17</value>
   </metadata>
-  <metadata name="getTimesDedubToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>557, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

csharp/fisher/Form1.resx

@@ -16,10 +16,8 @@ class MethodHelper {
 		/// Constructor
 		/// </summary>
 		/// <param name="usingSteam">Determines whether the user is using Steam or Kongregate for the program.</param>
-		/// <param name="rod">Determines which fishing rod the user is using to fish</param>
-		public MethodHelper(bool usingSteam, int rod) {
+		public MethodHelper(bool usingSteam) {
 			steam = usingSteam;
-			rodType = rod;
 		}
 
 		public partial class NativeMethods {
@@ -63,7 +61,6 @@ public partial class NativeMethods {
 
 		private int screenNumContainingGame;
 		private bool steam;
-		private int rodType;
 
 		FindWeight findWeight = new FindWeight();
 
@@ -257,12 +254,12 @@ public void castRod(Point location, Color color) {
 			while (true) {
 				var c = GetPixelColor(location);
 				if (c.R == color.R && c.G == color.G && c.B == color.B) {
-					Thread.Sleep(rodType);
 					SendKeys.Send(" ");
 					return;
 				}
 			}
 		}
+
 		public void catchFish(Point location, Color color) {
 			Cursor.Position = location;
 			while (true) {