Commit Graph

64 Commits

Author SHA1 Message Date
Adam Saudagar
d09dd42666 FishingMode import fixed, updated the warning text for semifisher 2021-11-21 16:37:09 +05:30
Adam Saudagar
8ae46dd5a5 integrated fishyqr v0.0.2 for semi fisher
- remove color detection code
- move qr detection from full auto into common
- refactor both engines to use qr from common
2021-11-21 12:42:14 +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
b0a8db7528 wait for eso window active, stop engine when window becomes inactive 2021-05-02 23:35:06 +05:30
Adam Saudagar
c86e86b901 hotfix: data not being send, when fishing is interupted 2021-04-21 21:53:18 +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
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
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
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