Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

Bot control keyboard shortcut improvements #101

Merged
merged 4 commits into from
Jan 19, 2023
Merged

Bot control keyboard shortcut improvements #101

merged 4 commits into from
Jan 19, 2023
+18 −7

Conversation

kelltom
Copy link
Owner

@kelltom kelltom commented Jan 17, 2023

This PR includes a fix for keyboard shortcuts not triggering the bot start/stop immediately. It also changes the current Ctrl keybind to a key combination instead.

TODO: The key combination is up for debate. Also, the way the combination is displayed on the button needs to be replaced. Right now, it takes up too much space and resizes the button. A good alternative would be to set a max width on the button and replace the text with an image, or proper symbols that are compatible with Tkinter and other operating systems.

@kelltom kelltom added type: bug Something isn't working status: needs information This issue or pull request needs additional information type: enhancement This issue or pull request enhances existing code type: discussion This issue contains a discussion labels Jan 17, 2023
@kelltom
Copy link
Owner Author

kelltom commented Jan 19, 2023

The default keybind has been set to "shift + enter".

@kelltom kelltom merged commit 2a7d5c1 into main Jan 19, 2023
@kelltom kelltom deleted the Bot-control-keyboard-shortcut-improvements branch January 19, 2023 00:31
theloniusfunk added a commit to theloniusfunk/OSRS-Bot-COLOR that referenced this pull request Jan 21, 2023
@theloniusfunk
Squashed commit of the following:
45f1910 
commit 7a2f89c
Merge: 2a7d5c1 615154c
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Fri Jan 20 18:13:56 2023 -0500

    Merge pull request kelltom#110 from kelltom/Fixed-type-annotation-flaw

    Fixed type annotation flaw

commit 615154c
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Fri Jan 20 18:11:55 2023 -0500

    Fixed type annotation flaw

commit 2a7d5c1
Merge: d911778 4cb2e2e
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Wed Jan 18 19:31:27 2023 -0500

    Merge pull request kelltom#101 from kelltom/Bot-control-keyboard-shortcut-improvements

    Bot control keyboard shortcut improvements

commit 4cb2e2e
Merge: 92c6309 d911778
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Wed Jan 18 19:24:21 2023 -0500

    Merge branch 'main' into Bot-control-keyboard-shortcut-improvements

commit d911778
Merge: e92f01f 75c17b6
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Wed Jan 18 18:33:50 2023 -0500

    Merge pull request kelltom#106 from kelltom/Remove-unused-code

    Remove unused function

commit 75c17b6
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Wed Jan 18 18:33:01 2023 -0500

    Remove unused function

commit 92c6309
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Wed Jan 18 18:29:08 2023 -0500

    Switched to a better default keybind

commit 0c623d6
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Mon Jan 16 19:12:22 2023 -0500

    Enabled key combination

    TODO: add symbols or image instead of text key combination.

commit 88931b6
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Mon Jan 16 18:02:58 2023 -0500

    Fixed issue where two key-presses were required to stop bot

commit e92f01f
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sun Jan 15 19:32:21 2023 -0500

    Added donation buttons

commit 8d68cfc
Merge: 087cc54 03a63bd
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sun Jan 15 13:16:38 2023 -0500

    Merge pull request kelltom#99 from kelltom/Improve-Morg-API-error-handling

    Improve Morg API error handling

commit 03a63bd
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 15 13:07:07 2023 -0500

    Linting

commit 5a9cc96
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 15 13:04:39 2023 -0500

    Linting

commit 0fb03ba
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 15 12:32:00 2023 -0500

    Moved Item ID DB link to proper file

commit e0ed59f
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 15 12:30:31 2023 -0500

    Small fixes

commit a06033a
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 15 12:23:45 2023 -0500

    Improved error handling, fixed issue with empty inv

    Empty inventories were resulting in a SocketError, despite the API call succeeding.

commit 087cc54
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Mon Jan 9 21:56:47 2023 -0500

    Minor improvements

commit 33fd888
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Mon Jan 9 21:56:37 2023 -0500

    Fixed crashing when searching image without alpha channel

commit d071b44
Merge: 9a0bf94 48126c2
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sun Jan 8 17:24:31 2023 -0500

    Merge pull request kelltom#96 from kelltom/Minor-utility-improvements

    Various utility improvements

commit 48126c2
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 16:43:06 2023 -0500

    Fixed type casting, removed None returns

commit b9dc831
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 16:30:15 2023 -0500

    Removed unnecessary exception handling for __do_get calls

commit eb469a2
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 16:15:42 2023 -0500

    Update pickpocket.py

commit d4cc925
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 16:09:43 2023 -0500

    Added coins list

commit 29a40e1
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 16:08:51 2023 -0500

    Changed params named "id" to "item_id"

    "id" is a Python keyword and should not be used.

commit bb16e6d
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 16:04:53 2023 -0500

    Added item stack checker

commit 25e868c
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 15:59:34 2023 -0500

    Added item stack checker

commit a596c52
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 15:56:27 2023 -0500

    Added coin pouch ids list & sorted alphabetically

commit ac32c28
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 15:54:58 2023 -0500

    Improved test code

commit 55193eb
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 15:54:53 2023 -0500

    Further deprecated __is_red_click, adding suggested solution

commit 27b43c3
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 15:54:37 2023 -0500

    Added click_delay property that can be assigned in scripts

    This is useful for RSPS's where click delay isn't really beneficial and instead just slows down the bot. Click functions now optionally have a force_delay param.

commit 2c741db
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 15:15:09 2023 -0500

    Make relative click pixel variance normally distributed

commit ae10dd5
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 14:56:47 2023 -0500

    Modified mouseSpeed setter to use normal distributions

commit f8e85fd
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 14:56:27 2023 -0500

    Moved function for organization

commit 67e2cd9
Merge: 6a9de53 9a0bf94
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 14:45:18 2023 -0500

    Merge branch 'main' into Minor-utility-improvements

commit 6a9de53
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 14:45:12 2023 -0500

    Added optional fancy behaviour to Bot.take_breaks()

commit fb68717
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 14:44:35 2023 -0500

    Separated fancy normal sample behaviour into another func

commit 9a0bf94
Merge: d996130 db5681d
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sun Jan 8 14:08:15 2023 -0500

    Merge pull request kelltom#95 from kelltom/Add-RSN-Hider-to-plugin-list

    Add RSN Hider to plugin list

commit db5681d
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sun Jan 8 13:52:52 2023 -0500

    Added RSN Hider to plugin list

commit 6242b7e
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 23:18:36 2023 -0500

    Changed `MouseUtil` to `Mouse`

commit eb1dfee
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 23:16:30 2023 -0500

    Replaced manual timers with decorator

commit 64330f8
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 22:00:25 2023 -0500

    Improved docstrings

commit 0638e80
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 19:38:19 2023 -0500

    Fixed incorrect center parameter

commit 95c9417
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 19:09:11 2023 -0500

    Added test code

commit d996130
Merge: 3d93bb9 8150eed
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sat Jan 7 14:37:46 2023 -0500

    Merge pull request kelltom#93 from Mironor/feature/add_agility_rooftop_plugin_osrs

    Adds rooftop plugin for training agility

commit 8150eed
Merge: d2bcc75 3d93bb9
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sat Jan 7 14:33:30 2023 -0500

    Merge branch 'main' into feature/add_agility_rooftop_plugin_osrs

commit 3d93bb9
Merge: 4244b4b f3bb083
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sat Jan 7 13:42:23 2023 -0500

    Merge pull request kelltom#86 from MataiRepublic/branch2

    Add prayer book support

commit f3bb083
Merge: 16d1a00 4244b4b
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sat Jan 7 13:40:16 2023 -0500

    Merge branch 'main' into branch2

commit 16d1a00
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 13:37:17 2023 -0500

    Corrected prayer book variable name

commit 6b39d53
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 13:32:51 2023 -0500

    Removed prayer selection function

    This function is not necessarily needed, as the developer should have the freedom to decide how and when prayers are selected.

commit 5f07342
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 13:29:53 2023 -0500

    Corrected prayer location logic

commit 4244b4b
Merge: cf9df59 0fa7b8c
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sat Jan 7 12:42:35 2023 -0500

    Merge pull request kelltom#92 from KarlKennerley/Fix-for-Issue#90

    Added random time interval between clicking

commit 0fa7b8c
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 12:31:10 2023 -0500

    Adjusted other code to use new function

commit cca6a71
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 12:00:40 2023 -0500

    Added option to delay clicks, fixed up right_click function

    Also modified docstrings

commit 83269d2
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 11:32:16 2023 -0500

    Linting

commit 83939a8
Merge: 8edc16a cf9df59
Author: Kellen Evoy <kellenevoy@gmail.com>
Date:   Sat Jan 7 11:25:19 2023 -0500

    Merge branch 'main' into pr/86

commit ded902e
Merge: 4b9aa98 cf9df59
Author: Kell <44652363+kelltom@users.noreply.github.com>
Date:   Sat Jan 7 11:21:35 2023 -0500

    Merge branch 'main' into Fix-for-Issue#90

commit 4b9aa98
Author: Karl <58265182+KarlKennerley@users.noreply.github.com>
Date:   Thu Jan 5 09:09:05 2023 +0000

    Updated click function

    Updated the click function.

commit d2bcc75
Merge: 4a29eeb cf9df59
Author: Alexandre Bedrytski <github@bedryt.ski>
Date:   Wed Jan 4 16:18:14 2023 +0100

    Merge branch 'main' into feature/add_agility_rooftop_plugin_osrs

commit 4a29eeb
Author: Alexandre Bedrytski <github@bedryt.ski>
Date:   Wed Jan 4 15:16:42 2023 +0000

    Adds rooftop plugin for training agility

commit 00a6c43
Author: Karl <58265182+KarlKennerley@users.noreply.github.com>
Date:   Wed Jan 4 15:10:08 2023 +0000

    Added time interval between mDown & mUp.

    Added time interval between mDown & mUp.

commit 2b7c6fd
Author: Karl <58265182+KarlKennerley@users.noreply.github.com>
Date:   Tue Jan 3 23:20:10 2023 +0000

    Corrected time.sleep param

    Changed time.sleep parameter to millisecnds instead of seconds.

commit b32d93f
Author: Karl <58265182+KarlKennerley@users.noreply.github.com>
Date:   Tue Jan 3 23:11:59 2023 +0000

    Added random time interval before clicking

    Added random pause to click function using decorator.
    Uses the truncated_normal_sample() function from random_util to generate a random pause time.

    Fixes issue #90

commit 8edc16a
Author: enkidu <a7made_derazi@hotmail.com>
Date:   Mon Jan 2 19:04:10 2023 +0300

    prayer book
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
status: needs information This issue or pull request needs additional information type: bug Something isn't working type: discussion This issue contains a discussion type: enhancement This issue or pull request enhances existing code
Projects
None yet
Milestone
No milestone
1 participant
@kelltom