Commit Graph

295 Commits

Author SHA1 Message Date
Adam Saudagar
3fbc67c49b using cv2 qr detection instead of manual blob detection, removed pyzbar from dependencies 2022-05-26 18:17:58 +05:30
Adam Saudagar
84e8150dd7 increased version 2022-04-15 07:03:14 +05:30
Adam Saudagar
8b2ba7a600 fullauto player now waits for first loop of semifisher to complete before looking for hole 2022-04-09 01:40:40 +05:30
Adam Saudagar
fb08e29ae6 increased version to 0.5.9 2022-03-18 10:39:13 +05:30
Adam Saudagar
35e27f277b web pings before starting the scheduler 2022-03-18 10:33:39 +05:30
Adam Saudagar
b67c047f0c fixed uid generation fo new user 2022-03-18 10:33:16 +05:30
Adam Saudagar
241728d75c
Merge pull request #110 from fishyboteso/feature/update_0.5.8 2022-02-26 21:09:46 +05:30
Adam Saudagar
e1c7bd626d
Merge pull request #108 from fishyboteso/feature/hotfix_idle_state_blocking 2022-02-26 21:08:58 +05:30
Semjon Kerner
14e3c9aa84 update fishy to 0.5.8 and fishyqr to 1.2.0 2022-02-25 11:11:46 +01:00
Semjon Kerner
13319e2606 add timeout to unblock idle state 2022-02-25 10:50:00 +01:00
Adam Saudagar
a80e1ee84b
Merge branch 'main' into feature/hotkey_fishyQR 2022-02-25 04:56:29 +05:30
Adam Saudagar
3761ad813d
Merge pull request #107 from fishyboteso/feature/menu_show_qr_value 2022-02-25 04:53:53 +05:30
Semjon Kerner
a6ec33f30f add short delay to give FishyQR keybind a headsup 2022-02-22 10:17:28 +01:00
Semjon Kerner
4b2364818c decrease max human like delay by 25% and 500ms 2022-02-20 20:48:08 +01:00
Semjon Kerner
0fd8a22e02 add menu entry to show qr value 2022-02-20 20:44:00 +01:00
Adam Saudagar
6c4b00775e 0.5.7 update 2022-02-03 07:06:50 +05:30
Adam Saudagar
8d41616720 fixed double action key press 2022-02-03 06:06:07 +05:30
Adam Saudagar
fd7237161b added few debug logs for engine 2022-02-03 05:51:31 +05:30
Adam Saudagar
d4a5297a97 create only one instance of d3dshot in fishy lifecycle 2022-02-03 05:51:03 +05:30
Adam Saudagar
2893465571 pep8 cleanup 2022-02-03 05:29:10 +05:30
Adam Saudagar
76e17c4502 decoupled logger and gui
logger is connected to gui after gui is ready
moved all logging configuration to log_config file
2022-02-03 05:15:00 +05:30
Adam Saudagar
c624557a41 wait for engine threads to stop before exiting 2022-02-03 04:50:36 +05:30
Adam Saudagar
608a8548fb set logging level to info by default, and switch to debug when turned on from debug options
changed almost all of print statement to debug logs
2022-02-03 04:09:39 +05:30
Adam Saudagar
fc3c8746c8 update in file menu not showing on first launch
removed feature: hide update in file menu if dont ask is not checked
2022-02-03 03:57:22 +05:30
Adam Saudagar
a12c397357 instead of restarting fishy when session is not created due to incorrect uid, re generate uid and try to create session again
removed restart from debug options (fishy should always exit safely)
added debug logs for when systems start and stop
update button from tool bar now opens update dialogue correctly
2022-02-03 03:47:35 +05:30
Adam Saudagar
d22a4e79e5 splash screen not responding fix 2022-02-03 03:43:01 +05:30
Adam Saudagar
c9c2982403 show update prompt after gui is loaded
renamed auto_upgrade to update_now
made config init similar to hotkey
update now is a popup which runs from gui thread instead of an independent process
if the user decides to upgrade, bot is quited and update is started in the end of the main thread if update flag is set
2022-02-03 02:51:08 +05:30
Adam Saudagar
572604ff36 fixed dangling threads after denying eula,
now only config is partially initialized just to check if eula is accepted
2022-02-03 01:40:18 +05:30
Adam Saudagar
17c014d690 close splash when gui finishes loading
hide fishy window until its ready to show
draw splash screen above fishy window
2022-02-03 01:06:41 +05:30
Adam Saudagar
4ea27ae7da added a null check in get_coords
changed print_exec to print in both console and fishy
fixed engine couldn't be stoped with toggle
fixed full auto stop getting called multiple times due to inactive stop
set logging for d3dshot to info, to remove debug logs caused by it
2022-02-01 22:20:57 +05:30
Adam Saudagar
9bcde7e922 window server reworked for improved threading 2022-02-01 17:21:58 +05:30
Adam Saudagar
245493fbc4 fullauto reworked with the new parent class
- removed double beep on turnoff
- removed show crop feature in fullauto
- semi fisher is started only when needed, and turned off when the job is done by mode, instead of full auto engine
- use the last coord from recording isntead of getting a new one when using editor in recorder mode, to avoid recording failure when saving the recording
2022-02-01 16:57:14 +05:30
Adam Saudagar
a5236e9b30 semi fisher reworked to work with new parent class 2022-01-31 23:19:24 +05:30
Adam Saudagar
0f35faa59f reworked engine parent class to impement common things in both the engine 2022-01-31 23:18:51 +05:30
Adam Saudagar
b79a7ed076 0.5.6 update 2022-01-31 13:37:27 +05:30
Adam Saudagar
3d393cef93 setup process will no long try to import libraries 2022-01-31 11:46:00 +05:30
Adam Saudagar
b745fd915b turned off debug logging 2022-01-30 19:58:30 +05:30
Adam Saudagar
6326a83434 added multi monitor support for window module 2022-01-30 19:58:17 +05:30
Adam Saudagar
f77478d52b increased version 2021-12-20 12:05:16 +05:30
Adam Saudagar
f31fa11804 created look for hole option 2021-12-20 11:57:55 +05:30
Adam Saudagar
814ca1e0d5 0.5.4 hotfix
fixed get_coords() tupple overflow issue,
improved hole check in full auto fishing,
improved message when FishyQR is not found,
keeping chalutier in migration
2021-12-01 11:27:16 +05:30
Adam Saudagar
d09dd42666 FishingMode import fixed, updated the warning text for semifisher 2021-11-21 16:37:09 +05:30
Adam Saudagar
6bb02778f9 Merge remote-tracking branch 'origin/master' into improvement/fishyqr-integration 2021-11-21 16:31:42 +05:30
Adam Saudagar
9f0974abb3 created migration code which is used to migrate data after an update
moved version code to constants so that code can access it too
changed Install/Remove Chalutier to FIshyQR in options
2021-11-21 16:30:41 +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
gruvdev
8054128664 limit decode() by type QRCODE 2021-08-09 15:05:49 -07:00
Adam Saudagar
5d18b8538e hotfix 0.5.2: opencv error on new version 2021-08-06 10:46:22 +05:30
Adam Saudagar
40451b1867 hotfix 0.5.1: playsound requirement version specified 2021-07-29 16:52:43 +05:30
Adam Saudagar
a2b7d0a31c increased version number 2021-05-22 06:14:08 +05:30
Adam Saudagar
d642362f85 give overwrite option only in edit mode 2021-05-22 05:43:41 +05:30
Adam Saudagar
df2ab36021 removed drm from full auto 2021-05-22 05:24:09 +05:30
Adam Saudagar
25bec628fd updated need help link 2021-05-22 04:52:49 +05:30
Adam Saudagar
7929ed47be hotfix 0.4.11: fullauto tabout stop config added, improved full auto config layout 2021-05-18 05:53:28 +05:30
Adam Saudagar
2bc0d48843 updated version to 0.4.10 2021-05-16 21:31:24 +05:30
Adam Saudagar
3ab22743cf
Merge pull request #78 from fishyboteso/improvement/fullscreen-config
removed fullscreen config from semi fisher
2021-05-16 21:25:18 +05:30
Adam Saudagar
7a93b18ec6 removed fullscreen config from semi fisher 2021-05-16 20:13:59 +05:30
Adam Saudagar
1e9c667c44 Merge branch 'feature/fullauto' 2021-05-16 19:59:33 +05:30
Adam Saudagar
0ccbf7ba7e fixed calibrater mode gives you need to calibrate error 2021-05-16 19:58:49 +05:30
Adam Saudagar
e5e45bb006
Merge branch 'master' into feature/mp-hotkey 2021-05-16 19:55:35 +05:30
Adam Saudagar
46083bbaa9 active count feature created 2021-05-16 08:34:35 +05:30
Adam Saudagar
84b2b19b1a moved hotkey to other process 2021-05-16 04:10:48 +05:30
Adam Saudagar
901c8d6ea8 full auto doesn't stop when waiting for game window to be active 2021-05-15 18:24:27 +05:30
Adam Saudagar
810c0276a1 possible fix for ingnoring fishing holes 2021-05-15 17:52:04 +05:30
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
0622531c2b switched tk to ttk in config_top for fullauto 2021-05-13 13:45:44 +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
d9b37c5911 remove star imports from tk and ttk 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
fe3715b21b fixup chalutier version 2021-05-07 15:19:22 +02:00
Semjon Kerner
a1ce1ccae9 update chalutier addon for default dead color 2021-05-07 15:19:22 +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
73a0500cdf added mode option and recalibrate option 2021-05-01 14:59:12 +05:30