Commit Graph

149 Commits

Author SHA1 Message Date
Adam Saudagar
db3def3948 pause Instead of shutting off engine when qr doesn't get read 2021-05-15 17:50:38 +05:30
Adam Saudagar
41232cc723 path editing mode done 2021-05-13 17:34:50 +05:30
Adam Saudagar
fa02a0895b show the name of the recording while saving 2021-05-13 16:55:49 +05:30
Adam Saudagar
73a377d919 added config for edit mode 2021-05-13 14:51:59 +05:30
Adam Saudagar
c21a6f06f2 resume from closest point instead of start 2021-05-13 14:23:54 +05:30
Adam Saudagar
55c867f790 changed from yes/no to overwrite/save as/cancel option in recorder 2021-05-13 13:47:43 +05:30
Adam Saudagar
ab81d09741 ask whether to save or not when recording ends 2021-05-12 21:07:20 +05:30
Adam Saudagar
8f7b6b71c4 Merge remote-tracking branch 'origin/master' into feature/fullauto
# Conflicts:
#	fishy/engine/fullautofisher/controls.py
#	fishy/engine/fullautofisher/engine.py
#	fishy/engine/fullautofisher/mode/calibrator.py
#	fishy/engine/fullautofisher/mode/recorder.py
#	fishy/engine/fullautofisher/player.py
#	fishy/engine/semifisher/fishing_event.py
#	fishy/gui/config_top.py
2021-05-12 20:44:55 +05:30
Semjon Kerner
fa83c10394 fix flake8: F841, E111 E711, E262 2021-05-09 11:48:35 +02:00
Semjon Kerner
b16f776749 too long lines 2021-05-09 11:44:19 +02:00
Semjon Kerner
1c5530dca4 fix whitespaces according to flake8 2021-05-09 11:09:26 +02:00
Semjon Kerner
3172b30d98 sort imports with isort 2021-05-09 09:05:51 +02:00
Semjon Kerner
fb89fdf4fb remove unused imports 2021-05-09 08:46:46 +02:00
Semjon Kerner
ff39f7d9bf accumulate event functions 2021-05-07 20:07:03 +02:00
Semjon Kerner
699354cd0b rename send_hole_deplete to send_fish_caught 2021-05-07 20:07:03 +02:00
Semjon Kerner
0396ea3239 playsond beep twice, moved from hotkey to engine 2021-05-07 20:07:03 +02:00
Semjon Kerner
363a0dd1bd reorder imports 2021-05-07 19:36:41 +02:00
Semjon Kerner
708f64fd7b act on lookaway as on idle 2021-05-07 19:35:25 +02:00
Semjon Kerner
b2d43df57e playsound whenever user interaction is required 2021-05-07 19:35:25 +02:00
Semjon Kerner
58457ef798 fixup luaparser 2021-05-07 15:19:22 +02:00
Semjon Kerner
b6a375f486 add luaparser and read saved var 2021-05-07 15:19:22 +02:00
Semjon Kerner
ac18f3f2cc fixupfixup enum-dict 2021-05-07 15:19:22 +02:00
Semjon Kerner
f790a83acf fixup enum-dict 2021-05-07 15:19:22 +02:00
Semjon Kerner
734477dc28 change state detection to dict and use rgb 2021-05-07 15:19:22 +02:00
Mat R
c6654ade4f
Add a 100ms sleep to semifisher loop
While the main monitor loop runs we are constantly rechecking, which drives a lot of CPU usage.
By sleeping for 100ms we can significantly reduce this without significantly impacting the bot.
2021-05-06 19:35:06 -06:00
Adam Saudagar
65052f3fa3 automatically load recording when it ends 2021-05-03 00:38:39 +05:30
Adam Saudagar
aa207dae02 fixed divide by zero error 2021-05-03 00:10:08 +05:30
Adam Saudagar
bfb498d1c9 add sound feedback to recording hole 2021-05-02 23:53:18 +05:30
Adam Saudagar
b0a8db7528 wait for eso window active, stop engine when window becomes inactive 2021-05-02 23:35:06 +05:30
Adam Saudagar
6440ec1000 calibrate connected to config 2021-05-02 22:19:44 +05:30
Adam Saudagar
3ce3c24dd1 connected mode select in config with the engine
- restructed player and recorder to work with new system,
- remove FullAuto.State
2021-05-02 21:10:38 +05:30
Adam Saudagar
1290c877f1 removed controls from engine 2021-05-01 15:04:38 +05:30
Adam Saudagar
a710246081 abstracted event_handler and config to make developing gui easier 2021-05-01 14:58:09 +05:30
Adam Saudagar
c86e86b901 hotfix: data not being send, when fishing is interupted 2021-04-21 21:53:18 +05:30
Adam Saudagar
b7dbbf4599 cleaned imports 2021-04-18 12:52:57 +05:30
Adam Saudagar
1b30bc3c82 changed look up down timing, added log message for when player starts 2021-04-17 22:54:12 +05:30
Adam Saudagar
c05355fb77 don't warn about fishing not started if it's not attached to gui (to avoid it showing in fullauto) 2021-04-17 22:04:10 +05:30
Adam Saudagar
ce1bc0391b added fishyqr and libgps addons download in constants 2021-04-17 22:03:27 +05:30
Adam Saudagar
babcdd262a created multiprocess solution for mouse click callback for recording 2021-04-17 22:02:20 +05:30
Adam Saudagar
96db413f61 renamed calibrate class to calibrator,
removed updown calibration process,
changed controls accordingly
2021-04-17 22:01:19 +05:30
Adam Saudagar
23488d4c3d Merge branch 'master' into feature/fullauto 2021-04-17 13:53:10 +05:30
Adam Saudagar
e47d74afc3
Merge pull request #59 from SemjonKerner/remove_sleep_before_fishing
remove sleep before fishing, with bugfix in chalutier 1.1.3
2021-04-17 13:36:58 +05:30
Adam Saudagar
c165a0e237
Merge pull request #62 from SemjonKerner/autoloot_default
Set auto_collect always enabled
2021-04-17 13:21:59 +05:30
Semjon Kerner
2a3b79a12b remove all traces of collect_allow_auto 2021-04-15 12:49:17 +02:00
Semjon Kerner
0b0a984d22 remove label from fishingmode for logging 2021-04-15 12:31:37 +02:00
Semjon Kerner
f31e008fbb remove sleep before fishing, with bugfix in chalutier 1.1.3 2021-04-15 11:50:03 +02:00
Adam Saudagar
10cbd899f8 removed ocr things, using blob detection to find qr code, using qr code to get data from eso 2021-04-13 20:22:55 +05:30
Semjon Kerner
fc671d6dab use dark grey for dead 2021-04-12 18:34:02 +02:00
Semjon Kerner
ab9a8a0d0b detect color of invfull, nobait 2021-03-28 19:23:52 +02:00
Semjon Kerner
7656aecea0 add notification dead,fighting 2021-03-26 12:18:29 +01:00
Semjon Kerner
fe92ac5779 remove didnt start popup 2021-03-25 12:37:42 +01:00
Semjon Kerner
4fe22e7703 map fishy tightly to chalutier states 2021-03-25 11:58:33 +01:00
Semjon Kerner
f7d7583883 remove Provisions Chalutier 2021-03-24 17:59:07 +01:00
Semjon Kerner
f334a32bd9 init collect_key to default r 2021-03-08 20:53:40 +01:00
Adam Saudagar
6fe99d3300 update uid on discord login, and fetch uid from config (never cache it) 2021-03-08 20:28:32 +05:30
Adam Saudagar
3a6f29b642 Merge branch 'fix_key_eso_focus' 2020-12-27 19:45:14 +05:30
Adam Saudagar
38e5b72774 using wrapper for validation 2020-12-27 18:26:43 +05:30
Adam Saudagar
58ef4e2594
Merge branch 'master' into fix_auto_collect_predelay 2020-12-27 17:39:26 +05:30
Adam Saudagar
6ed8644ca1
Merge pull request #27 from SemjonKerner/fix_auto_loot_key
Fix: auto loot has hard coded loot key
2020-12-27 17:34:09 +05:30
Semjon Kerner
b269360e63 add check if eso window is focused before clicking 2020-12-22 13:21:22 +01:00
Semjon Kerner
3992156ada use the correct key for collecting 2020-12-16 22:56:22 +01:00
Semjon Kerner
8da470de8f extend sleep time before collecting 2020-12-15 14:00:26 +01:00
Semjon Kerner
291cbf0809 fixupfixup remove condition parantheses 2020-12-13 21:07:06 +01:00
Semjon Kerner
797663ff5a fixup remove condition parantheses 2020-12-13 21:04:45 +01:00
Semjon Kerner
38df271376 fixup rebase and max waittime 2020-12-13 20:13:15 +01:00
Semjon Kerner
d0e170c6b5 add option to have human like jitter in delays 2020-12-13 19:01:35 +01:00
Semjon Kerner
00f0bf97e9 add auto loot option 2020-12-13 17:27:52 +01:00
Adam Saudagar
b01701e474 fix for a bug where semi-fisher doesn't work when stopped and started again 2020-12-13 12:26:43 +05:30
Adam Saudagar
fb6c27271c reduced control modes 2020-12-07 22:01:34 +05:30
Adam Saudagar
a964c65776 full auto bug fixing
- changed engine.toggle_start to abstract method
- check for state before turning off bot engine
- added and corrected logging messages for contorls and calibration
- callibrate._get_factor returning None fixed
- optimized controls
- removed config for show crop
- recorder now runs asksaveasfile in gui thread and blocks itself till resoponse
- corrrected logic for saving failed files
- semifisher dont log started bot engine if not ran from gui
- added file name label in full auto config top
- call in thread now can return values
- gui now saves location when closed
- dynamic config location, now uses correct document folder if config file is not found in incorrect document folder
2020-12-01 02:34:33 +05:30
Adam Saudagar
367e2bea55 states for when playing/recording is running, added error message when window is not found in full auto, added beep sound when hotkey is pressed, made hotkey callable Optional 2020-11-19 18:49:27 +05:30
Adam Saudagar
a51a301070 abstracted modules of fullauto engine into different scripts 2020-11-07 22:10:57 +05:30
Adam Saudagar
50083edd8a added player file in config 2020-10-18 19:23:46 +05:30
Adam Saudagar
aecb3a0af7 don't invoke other states when subscribed, play sound even if interupted 2020-10-18 13:17:24 +05:30
Adam Saudagar
80c2a5e900 fixed situations where app doesnt shut down without crash
- when bot is closed while engine is running
- when start is pressed when the game is minimized, then app is closed
2020-10-18 06:20:25 +05:30
Adam Saudagar
db5299004b optimized event handler 2020-10-18 06:13:59 +05:30
Adam Saudagar
b44039780c dynamicly download tesseract if not installed when full auto is launched 2020-10-18 06:13:24 +05:30
Adam Saudagar
69edc75c16 now engine shutdowns properly when quiting, corrected logic for window show 2020-10-18 04:42:48 +05:30
Adam Saudagar
fafb6ea952 made full auto runable via gui 2020-10-18 04:05:20 +05:30
Adam Saudagar
2893b2270c full auto engine done
- semi fisher, calls last event when subscribed
- corrected ping pong logic
- f8 to stop player
- save coods image if not able to read for debug purpose
- created better controls
2020-10-18 03:34:25 +05:30
Adam Saudagar
421d755a7f crop is now saved in config, instead of calculating at every launch
- semi auto callbacks are turned on and off by fullauto now
- use pprint to print recorded path data
2020-10-18 01:15:57 +05:30
Adam Saudagar
51560f26d9 made config global 2020-10-18 00:36:07 +05:30
Adam Saudagar
c63ff4c3ba refactored semifisher state machine feature to be much simpler,
- now different systems can subscribe to semifisher events
2020-10-17 21:34:44 +05:30
Adam Saudagar
315adf9799 re structured window into server client model so that multiple engine can use them simultaneously 2020-10-17 16:22:04 +05:30
Adam Saudagar
825ce11ced engines can now run without gui
- corrected logic for look_for_hole, made hotkey start new threads, created mock interface for gui
2020-10-17 13:36:49 +05:30
Adam Saudagar
2edad8110f changed save system to pickle instead of json, changed calibrate to class, added offset in crop coods for better ocr 2020-10-15 08:49:08 +05:30
Adam Saudagar
b88cb8567c finished player code 2020-10-15 07:53:15 +05:30
Adam Saudagar
66e6a70fba better hotkey code, moved calibrate to seperate file, created player and recorder for full auto, created rotate_to metho in full auto engine 2020-10-15 06:56:31 +05:30
Adam Saudagar
d9eb85d542 removed pyautogui from dependencies 2020-10-13 20:06:19 +05:30
Adam Saudagar
21065e55ee play sound when fish hole complete feature, normal and anti-lag shortcut options 2020-10-13 19:20:01 +05:30
DESKTOP-JVKHS7I\Adam
decfdfb994 - auto update fixed
- keyboard ghosting for full auto fixed
2020-06-26 00:21:12 +05:30
DESKTOP-JVKHS7I\Adam
cfc41d6a5c fixed input ghosting bug cauzed by pynput 2020-06-25 22:10:18 +05:30
DESKTOP-JVKHS7I\Adam
066ec93742 move to target created 2020-06-25 19:10:05 +05:30
DESKTOP-JVKHS7I\Adam
1ae645294d ai fix and full-auto test setup:
gui
- enable "Debug > Keep Console" to unhide full auto
- Removed Log Dump from Debug menu

semi-auto
- starting ai fix, sometime bot doesnt start
- minimize bug fix, when minimized gui goes out of sync
- keyboard button to pause play, now bot can be paused and played using f9
- now shows running as admin message
- better error message, now tells to check #read-me-first instead

full-auto
- add tesseract binary in directory
- install addon for full auto
2020-06-25 07:02:34 +05:30
DESKTOP-JVKHS7I\Adam
648f3a8a32 full auto: ocr, callibration, get coods done 2020-06-25 04:46:23 +05:30
DESKTOP-JVKHS7I\Adam
49cc7f191d fullauto rect detection done, and...
- window.show now also shows ready images,
- removed debug condition to print "Running with admin"
2020-06-03 07:11:54 +05:30
DESKTOP-JVKHS7I\Adam
686252d39e created interface for engines 2020-06-01 18:28:18 +05:30
DESKTOP-JVKHS7I\Adam
cd1b2dd8f6 0.3.5 reworked ui for multiple bot engine support
- shifted config into a toplevel
- logs before starting update
2020-05-24 03:44:09 +05:30
DESKTOP-JVKHS7I\Adam
c8510d56cf restructured engine 2020-05-23 10:24:11 +05:30