Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed the Support to as Many Keys as you Want #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed the Support to as Many Keys as you Want #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a536403
Add files via upload
AmirNajjar99 Oct 1, 2018
a3cb757
Add files via upload
AmirNajjar99 Oct 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 35 additions & 25 deletions osu!cat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import PIL.ImageTk
import PIL.Image
from keyboard import is_pressed
from win32 import win32gui
from win32gui import GetCursorPos
from math import sqrt
from time import sleep
Expand Down Expand Up @@ -108,13 +109,16 @@ def find_frame(cx, cy, f):
'is no support for custom ingame resolutions or sensitivities. You have been warned.')
print('----------------------------------------------------------------------------------------------------------------------')
print('Before you can use this program you need to configure some things')
while True:
k1 = input('Key 1: ')
k2 = input('Key 2: ')
if len(k1) == 1 and len(k2) == 1:
break
else:
print('Keys can only be 1 character long')
key_list = list()
n = 0
print('Keep putting 1-letter keys and write \'done\' once you\'re done')
while True :
temp = input('take a letter? ')
if (temp == 'done') : break
elif len(temp) == 1 :
key_list.append(temp)
n = n + 1
else : print('Keys can only be 1 character long')

print('(Type 0 for tablet and 1 for mouse)')
while True:
Expand Down Expand Up @@ -143,7 +147,7 @@ def find_frame(cx, cy, f):
print('Invalid input')

print('All done! To reconfigure, just close and relaunch the application')
print('Note: When re-sizing, hit k1 or k2 to reload the image!')
print('Note: When re-sizing, hit one of your keys to reload the image!')


#preload all images
Expand All @@ -170,15 +174,20 @@ def find_frame(cx, cy, f):
first_iteration = True
force_update = True
last_hit = 1

global key_list_p_prev
key_list_p_prev = list()
for i in range(n) :
key_list_p_prev.append(False)
def iterate():
global f, f_prev, k1_p_prev, k2_p_prev, last_hit, drag, w_size_prev, w_size, first_iteration, force_update
global f, f_prev, key_list_p_prev, last_hit, drag, w_size_prev, w_size, first_iteration, force_update
if drag:
root.after(5, iterate)
return

k1_p = is_pressed(k1)
k2_p = is_pressed(k2)
key_list_p = list()
for i in range(n) :
key_list_p.append(is_pressed(key_list[i]))
#k1_p = is_pressed(k1)
#k2_p = is_pressed(k2)
x, y = GetCursorPos()
f = find_frame(x, y, f)

Expand All @@ -198,20 +207,21 @@ def forceUpdate():
return

resize()

if f == f_prev and k1_p == k1_p_prev and k2_p == k2_p_prev:
all_keys_are_same = True
for i in range(n) :
if key_list_p_prev[i] != key_list_p[i] :
all_keys_are_same = False
break
if f == f_prev and all_keys_are_same == True:
root.after(5, iterate)
return

if k1_p or k2_p:
a_key_is_pressed = False
final_hit = 1
for i in range(n) :
if key_list_p[i] : a_key_is_pressed = True
if a_key_is_pressed :
force_update = True
if (k1_p and not k1_p_prev) or (not k2_p and k2_p_prev):
final_hit = 1
elif (k2_p and not k2_p_prev) or (not k1_p and k1_p_prev):
final_hit = 2
else:
final_hit = last_hit

last_hit = final_hit
final_hit_img = hit_images[final_hit]
composite_image = PIL.Image.alpha_composite(base_img, final_hit_img)
Expand All @@ -222,8 +232,8 @@ def forceUpdate():
n_base_img = PIL.ImageTk.PhotoImage(base_img)

f_prev = f
k1_p_prev = k1_p
k2_p_prev = k2_p
for i in range(n) :
key_list_p_prev[i] = key_list_p[i]

image_label.configure(image=n_base_img)
image_label.image = n_base_img
Expand Down