Commit Graph

241 Commits

Author SHA1 Message Date
Adam Saudagar
54406cf120 corrected addons versions 2021-04-18 12:01:36 +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
d186af77ce
Merge pull request #60 from fishyboteso/feature/remove_with_update
remove uninstallation of old addons
2021-04-17 13:24:23 +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
Adam Saudagar
db70ae1889
Merge pull request #63 from SemjonKerner/call_in_thread_fifo
Make call_in_thread fifo
2021-04-17 13:21:17 +05:30
Adam Saudagar
b5a7c9621b
Merge pull request #61 from SemjonKerner/fixup_checkpixelval
remove label from fishingmode for logging
2021-04-17 13:20:41 +05:30
Adam Saudagar
a4208e2ef7 not sending fishy hole data hotfix 2021-04-17 12:02:45 +05:30
Semjon Kerner
81edb6f6e1 change datatype of _function_queue to queue 2021-04-15 13:47:43 +02:00
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
85f05a51ef remove uninstallation of old addons 2021-04-09 21:19:59 +02:00
Adam Saudagar
ee511e2c81 or might cause issue for 0 value in config, replacing it with ternary statement 2021-04-07 13:24:12 +05:30
Adam Saudagar
639df8ce5b moved config code into 2 parts, class (Config) and singleton (config)... singleton needs to be initlaized and stopped in main,
now config backups the config file every 5 minutes in temp folder, if the file gets corrupted, it restores the backup and continues working
2021-03-29 18:45:40 +05:30
Adam Saudagar
cdb1bc7f51
Merge pull request #44 from SemjonKerner/version_update
Version update to 0.4.5
2021-03-29 01:20:53 +05:30
Semjon Kerner
3f7d42f3d7 remove FooAddon from addon folder 2021-03-28 21:44:55 +02:00
Semjon Kerner
3841848944 version update 2021-03-28 21:42:20 +02:00
Semjon Kerner
e6865d3ba7 check is_subbed for the submitted value to fix notification checkbox 2021-03-28 20:38:18 +02:00
Adam Saudagar
862a5dc114
Merge pull request #53 from SemjonKerner/fixup_quit_messagebox
remove brackets
2021-03-28 23:06:40 +05:30
Semjon Kerner
dcbecd261b remove brackets 2021-03-28 19:31:03 +02:00
Semjon Kerner
ab9a8a0d0b detect color of invfull, nobait 2021-03-28 19:23:52 +02:00
Adam Saudagar
92c74f180c let server create uid instead of client, keeping session creating code on oneside 2021-03-28 16:49:22 +02:00
Semjon Kerner
2ac57c2f36 newline at end of constants.py 2021-03-26 12:41:55 +01:00
Semjon Kerner
439a3d707a add addon de/install errorhandling 2021-03-26 12:41:55 +01:00
Semjon Kerner
a5bcbaf28c add Add-On versioncheck 2021-03-26 12:41:55 +01:00
Semjon Kerner
b157420d77
Merge pull request #50 from SemjonKerner/fix_notifications
Fix bug calling is_subbed
2021-03-26 12:41:07 +01:00
Semjon Kerner
79445b33f0 fix is_subbed: call without uid 2021-03-26 12:19:09 +01:00
Semjon Kerner
7656aecea0 add notification dead,fighting 2021-03-26 12:18:29 +01:00
Semjon Kerner
51e1577fe7 remove ProvisionsChalutier once 2021-03-25 13:07:52 +01:00
Semjon Kerner
ff21cd0e96 add config sort 2021-03-25 12:48:50 +01:00
Semjon Kerner
4d6b6b865c
Merge pull request #47 from SemjonKerner/improve_ask_update
Improve ask for update popup (0.4.5)
2021-03-25 12:46:12 +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
6056449c4d add Chalutier Add-On 2021-03-25 11:53:53 +01:00
Semjon Kerner
f7d7583883 remove Provisions Chalutier 2021-03-24 17:59:07 +01:00
Semjon Kerner
cd3e5a91b5 add logo and name to update popup 2021-03-24 12:36:09 +01:00
Semjon Kerner
07b98d2a95 increase attraction of yes-button 2021-03-24 12:36:09 +01:00
Semjon Kerner
e7b7e60dfa version bump to 0.4.4 2021-03-08 20:59:24 +01:00
Semjon Kerner
f334a32bd9 init collect_key to default r 2021-03-08 20:53:40 +01:00
Semjon Kerner
c409546f39 let python find new fishy version 2021-03-08 20:51:55 +01:00
Semjon Kerner
e47789c8ea add update filemenu 2021-03-08 20:51:55 +01:00
Semjon Kerner
4845c593f7 move update decision to update dialog 2021-03-08 20:51:55 +01:00
Semjon Kerner
444aef9f20 add update dialog 2021-03-08 20:51:55 +01:00
Semjon Kerner
3c0b6488b7 init first, gui later 2021-03-08 20:51:55 +01:00
Semjon Kerner
693df9bf2d catch config delete exception 2021-03-08 20:51:55 +01:00
Semjon Kerner
7f913dfc90 splash fix 2021-03-08 20:51:54 +01:00
Semjon Kerner
884c853139
Merge pull request #38 from SemjonKerner/remove_fooaddon
Remove fooaddon (0.4.4)
2021-03-08 20:45:34 +01:00
Semjon Kerner
5df04406a8 create and submit apiversion 2021-03-08 18:08:20 +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
Semjon Kerner
2a81d7ad16 remove foo addon 2021-03-07 16:51:24 +01:00
Adam Saudagar
3a6f29b642 Merge branch 'fix_key_eso_focus' 2020-12-27 19:45:14 +05:30
Adam Saudagar
0fe926f1f4
Merge pull request #26 from SemjonKerner/entry_one_key
Feature: enforce single key input into hotkey entrys
2020-12-27 19:41:34 +05:30
Adam Saudagar
1a65908488 removed code duplication, using 1 function for both of the key entry callbacks 2020-12-27 18:58:09 +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
bd4bf6e25b enforce single key binds in entrys 2020-12-15 19:23:32 +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
f505e20d9d
Merge pull request #17 from SemjonKerner/version_fix
Version fixes: downgrade numpy, enable python 3.9
2020-12-13 13:12:27 +05:30
Adam Saudagar
e912ce980c
Merge pull request #20 from SemjonKerner/quit_ask
Add messagebox for quit while engine running
2020-12-13 13:00:51 +05:30
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
Semjon Kerner
640973fb27 add import re (Regex) for python 3.9 2020-12-08 23:11:26 +01:00
Semjon Kerner
ea1ec06336 Add messagebox for quit while engine running 2020-12-08 23:09:36 +01:00
Adam Saudagar
fb6c27271c reduced control modes 2020-12-07 22:01:34 +05:30
Adam Saudagar
c6fa96ea97 0.4.0 release 2020-12-01 04:14:54 +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
721c2ae7ce show full auto only if has beta access 2020-11-03 00:34:50 +05:30
Adam Saudagar
7e00771887 discord login panel reworked for backend changes 2020-10-30 03:34:43 +05:30
Adam Saudagar
84f6b25f4f notify config endpoint changed 2020-10-30 02:54:52 +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
3143d8cd2f removed tesseract from config 2020-10-18 06:24:48 +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
ee8392e426 0.3.14 code cleanup 2020-10-14 07:59:58 +05:30
Adam Saudagar
0b75bb1820 fixed first shortcut creation 2020-10-13 23:53:27 +05:30
Adam Saudagar
d9eb85d542 removed pyautogui from dependencies 2020-10-13 20:06:19 +05:30
Adam Saudagar
f6af3311da better method for getting documents folder 2020-10-13 20:05:11 +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
2d49d74af2 - fixed restart bug; random window disapears when restart option is used
- removed troubleshoot option from options
2020-06-27 20:53:32 +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
1418271583 now disables config and engine selector when engine is running 2020-06-25 07:26:17 +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
DESKTOP-JVKHS7I\Adam
168e902e36 0.3.4 removed tkhtmlview from deps 2020-05-20 16:49:01 +05:30
DESKTOP-JVKHS7I\Adam
3e96fbed2c 0.3.3 reworked notifications again (now uses discord chat)
- fixed ui scaling issues
- now uses callables for thread comunication instead of enums (removed comms.py altogether)
- added options to run using test server
2020-05-19 10:56:50 +05:30
DESKTOP-JVKHS7I\Adam
b1ee1d1188 fixed an import which caused crash on hole deplete
- now uses envions instead of os.path.expand users for config file name
- made readme smaller
2020-05-15 05:21:55 +05:30
DESKTOP-JVKHS7I\Adam
5972aebc7d code cleanup:
- restructured code
- pep8 cleanup
- spelling mistakes fixed
- import fixes
- added cli arg to use local server
- got rid of globals.py
2020-05-14 07:33:13 +05:30
DESKTOP-JVKHS7I\Adam
66eeb9d6f8 0.3.1 hotfix: doesnt throw the stick back when action key is changed 2020-05-12 11:46:36 +05:30
DESKTOP-JVKHS7I\Adam
bb83a33b82 documentation and code cleanup: auto_update, config, helper 2020-05-12 11:43:42 +05:30
DESKTOP-JVKHS7I\Adam
30b8477d8d pre update hotfix, added banner in manifest, hides on first launch fixed, test notification doesnt send fixed 2020-05-10 17:37:45 +05:30
DESKTOP-JVKHS7I\Adam
066c25f08a 0.3.0 final
- build now deletes old version before building the new one
- prints lauching before initializing
- removed multithreading from config saving
- better logic for fising interupted
- fix terms link bug
- now prints exception during web calls
- removes the uid if not found during get_session
2020-05-07 11:33:30 +05:30
DESKTOP-JVKHS7I\Adam
79c7f748e1 0.3.0 bugs squashed
- sends hole_deplete even on interupt
- application doesnt restart after updating
- image doesnt display in shortcut
- optimize startup: multithreaded web request for gui init
2020-05-05 20:41:00 +05:30
DESKTOP-JVKHS7I\Adam
3fdfb35622 0.3.0 initial commit:
- added eula
- noticiation via web push
- data collection changes
- updated readme
- created session system
2020-05-05 18:25:06 +05:30
DESKTOP-JVKHS7I\Adam
b8155ef468 fishy network removed, integreted web push notificaitons 2020-04-28 02:49:30 +05:30
DESKTOP-JVKHS7I\Adam
36daacbf42 ui fix: start button and andoid ip label, fixed shorcut 2020-04-23 14:21:28 +05:30
DESKTOP-JVKHS7I\Adam
379d8ac4bf 0.2.6 shifted gui logging initialization to constructor, add ip, added folder selection for folder 2020-04-21 01:16:12 +05:30
DESKTOP-JVKHS7I\Adam
7361cc46ee 0.2.5 fixed path joining error for shortcut and addon
- added a warning for addon not visible
- added requests and bs4 in requirements
2020-04-20 18:33:44 +05:30
DESKTOP-JVKHS7I\Adam
6a708e55e6 auto install addon, dc function added and more,
- moved config to documents
- reduced readme
- updated requirements
- action key implemented
- when non saved config is get for the first time, default is saved
- added icon
- added unhandled exception logging
- added debug mode
- made dark mode and debug mode check buttons instead of command
- created manifest
- moved addon to a zip
2020-04-20 01:21:49 +05:30
DESKTOP-JVKHS7I\Adam
faf2c62e9c added help menu, removed pause and stop system, tweaked window, fishing_mode, fishing_event to work with new design, config now saves on other thread 2020-04-18 17:02:14 +05:30
DESKTOP-JVKHS7I\Adam
9a6f46f02d gui comunication reworked, now using function_queue and event_buffer 2020-04-18 09:51:18 +05:30
DESKTOP-JVKHS7I\Adam
e474fb0280 gui logging configured 2020-04-17 18:38:26 +05:30
DESKTOP-JVKHS7I\Adam
49fa3c6294 gui interface re created for multi threading 2020-04-17 18:15:22 +05:30
DESKTOP-JVKHS7I\Adam
ba20738cbf gui theming done 2020-04-17 07:28:09 +05:30
DESKTOP-JVKHS7I\Adam
5b90524d91 gui base template created 2020-04-17 04:44:33 +05:30
DESKTOP-JVKHS7I\Adam
d6c013c1a2 restructured the code for packaging, created configuration for packaging 2020-04-15 16:57:26 +05:30