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
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
01a8c50769
increased version, modified test to use venv instead of conda
2021-04-18 13:00:53 +05:30
Adam Saudagar
b7dbbf4599
cleaned imports
2021-04-18 12:52:57 +05:30
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
