Merge branch 'main' of https://github.com/olesgeras/wow-fishing-bot i…

…nto main

README.md

@@ -21,7 +21,7 @@
 
 ## Fishing bot :fish:
 
-A fishing bot for World of Warcraft, wrapped in [Electron](https://github.com/electron/electron) it uses [keysender](https://github.com/Krombik/keysender) library to analyze the screen and automate a fishing process in a human-like manner in **one** or **multiple** windows of the game at the same time.
+A fishing bot for World of Warcraft, wrapped in [Electron](https://github.com/electron/electron) it uses [keysender](https://github.com/Krombik/keysender) library to analyze the screen and automate a fishing process in a human-like manner. The bot can work with one or multiple windows of the game at the same time. The bot also uses [tesseract.js](https://github.com/naptha/tesseract.js) for analyzing loot.
 
 **Features:**
 - Multiple windows support.
@@ -32,7 +32,7 @@ A fishing bot for World of Warcraft, wrapped in [Electron](https://github.com/el
 
 For more detailed review you can watch <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/09/YouTube_full-color_icon_%282017%29.svg/1280px-YouTube_full-color_icon_%282017%29.svg.png" width="20"> [AutoFish 1.0](https://www.youtube.com/watch?v=e0D5dBptQUg&ab_channel=olesgeras) and <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/09/YouTube_full-color_icon_%282017%29.svg/1280px-YouTube_full-color_icon_%282017%29.svg.png" width="20">  [AutoFish 1.1](https://youtu.be/o1i_cgZzuHc).
 
-This is so called "pixel bot", it doesn't change anything in the processes memory nor use any vision libraries like OpenCV, it uses a more simple solution (and much faster): it analyzes the window of the game for condensed red colors and then sticks to them checking their position for changes. It moves with the bobber while the bobber slowly wobbles, but when the bobber is jerked, the bot sees this as a change of the color and understands it as time to hook. In a very simplified way, it acts as a human.
+This is so called "pixel bot", it doesn't change anything in the processes memory nor use any vision libraries like OpenCV, it uses a simpler solution: it analyzes the window of the game for condensed red colors and then sticks to them checking the area for changes. It moves with the bobber while the bobber slowly wobbles, but when the bobber is jerked, it clicks on it and catches the fish. 
 
 The bot doesn't work in the background and requires the window of the game to be opened all the time, to get around this you can use a **virtual machine** (like [VirtualBox](https://www.virtualbox.org/)) with installed World of Warcraft and launch AutoFish there. *(tested)*
 
@@ -102,12 +102,18 @@ If we consider **only the software itself**, the very simplified answer you seek
 
 **Additional:**
 
+<<<<<<< HEAD
 - If the bot can't find a bobber at all, decrease the red color threshold value. (e.g. 20 -> 10)
 - If the bot can't pass the preliminary checks for red colors, increase the red color threshold value (e.g. 20 -> 30)
 - If you play on Classic/Vanilla/TBC and want to use lures:
   - Your character window should be assign to default 'c' key, bot opens it and applies lures to your fishing pole.
   - Your UI scale should be set to default.
 - You can turn off all the "sleeping" and random values to make the bot work x2-x3 times faster.
+=======
+- If the bot can't find a bobber at all, decrease "Threshold" value. (e.g. 20 -> 10)
+- If the bot can't pass the preliminary checks for red colors, increase "Threshold" value (e.g. 20 -> 30)
+- Turn off all the "sleeping" and random values to make the bot work 2-3 times faster.
+>>>>>>> 7bb966dc822baccf8ab7f776032bb4b52d583c4f
 
 ## Fishing Zone :dart:
 
@@ -135,7 +141,8 @@ Here are quick self-explanatory "good-bad" screenshots of the bobber:
 ## Download :open_file_folder:
 
 AutoFish 1.6.2 Setup: [Download](https://drive.google.com/file/d/13uX8rnWBz6sbrG5bGVzKGv_LkOw3OJNT/view?usp=sharing)
-AutoFish 1.7.6 Setup: [Download](https://drive.google.com/file/d/1i1nAT1AG9puz3ERbxWU0Ye6Xvtr1r5V8/view?usp=sharing)
+
+AutoFish 1.7.6 Setup: [Download](https://github.com/olesgeras/AutoFish/releases/download/v1.7.6/AutoFish.1.7.6.Setup.exe)
 
 It's open-source software, so if you are afraid of downloading the executable file,  you can clone the repository, check the code and lanch it from the CLI.