diff --git a/cat/KeyTapHand.png b/cat/KeyTapHand.png deleted file mode 100644 index 4445712..0000000 Binary files a/cat/KeyTapHand.png and /dev/null differ diff --git a/cat/KeyTapHand2.png b/cat/KeyTapHand2.png index f8fe3b1..4a18bfd 100644 Binary files a/cat/KeyTapHand2.png and b/cat/KeyTapHand2.png differ diff --git a/cat/mouse/Hand A.png b/cat/mouse/Hand A.png index cab8537..57f4a8e 100644 Binary files a/cat/mouse/Hand A.png and b/cat/mouse/Hand A.png differ diff --git a/cat/mouse/Hand B.png b/cat/mouse/Hand B.png index edd1a7d..c8dfb13 100644 Binary files a/cat/mouse/Hand B.png and b/cat/mouse/Hand B.png differ diff --git a/cat/mouse/Hand C.png b/cat/mouse/Hand C.png index 6d0998b..da51d35 100644 Binary files a/cat/mouse/Hand C.png and b/cat/mouse/Hand C.png differ diff --git a/cat/mouse/Hand D.png b/cat/mouse/Hand D.png index a0c0497..113f344 100644 Binary files a/cat/mouse/Hand D.png and b/cat/mouse/Hand D.png differ diff --git a/cat/mouse/Hand E.png b/cat/mouse/Hand E.png index eef71e9..7283b92 100644 Binary files a/cat/mouse/Hand E.png and b/cat/mouse/Hand E.png differ diff --git a/cat/mouse/Hand F.png b/cat/mouse/Hand F.png index 0972972..26c6a55 100644 Binary files a/cat/mouse/Hand F.png and b/cat/mouse/Hand F.png differ diff --git a/cat/mouse/Hand G.png b/cat/mouse/Hand G.png index d2835c5..760ef0b 100644 Binary files a/cat/mouse/Hand G.png and b/cat/mouse/Hand G.png differ diff --git a/cat/mouse/Hand H.png b/cat/mouse/Hand H.png index 67f0a58..bab30ca 100644 Binary files a/cat/mouse/Hand H.png and b/cat/mouse/Hand H.png differ diff --git a/cat/mouse/Hand I.png b/cat/mouse/Hand I.png index 28deaf7..510d639 100644 Binary files a/cat/mouse/Hand I.png and b/cat/mouse/Hand I.png differ diff --git a/cat/mouse/Hand IA.png b/cat/mouse/Hand IA.png index c5e52c5..6a46d47 100644 Binary files a/cat/mouse/Hand IA.png and b/cat/mouse/Hand IA.png differ diff --git a/cat/mouse/Hand IB.png b/cat/mouse/Hand IB.png index c840e8f..531315a 100644 Binary files a/cat/mouse/Hand IB.png and b/cat/mouse/Hand IB.png differ diff --git a/cat/mouse/Hand IC.png b/cat/mouse/Hand IC.png index e074fd5..adb19f5 100644 Binary files a/cat/mouse/Hand IC.png and b/cat/mouse/Hand IC.png differ diff --git a/cat/mouse/Hand ID.png b/cat/mouse/Hand ID.png index fde9c8b..5be1c04 100644 Binary files a/cat/mouse/Hand ID.png and b/cat/mouse/Hand ID.png differ diff --git a/cat/tablet/Hand A.png b/cat/tablet/Hand A.png index 0a2b76c..2d28c69 100644 Binary files a/cat/tablet/Hand A.png and b/cat/tablet/Hand A.png differ diff --git a/cat/tablet/Hand B.png b/cat/tablet/Hand B.png index 2400923..243c836 100644 Binary files a/cat/tablet/Hand B.png and b/cat/tablet/Hand B.png differ diff --git a/cat/tablet/Hand C.png b/cat/tablet/Hand C.png index c6d7db7..1ed8ea3 100644 Binary files a/cat/tablet/Hand C.png and b/cat/tablet/Hand C.png differ diff --git a/cat/tablet/Hand D.png b/cat/tablet/Hand D.png index 388b60e..95664f8 100644 Binary files a/cat/tablet/Hand D.png and b/cat/tablet/Hand D.png differ diff --git a/cat/tablet/Hand E.png b/cat/tablet/Hand E.png index c8a4b86..bed4540 100644 Binary files a/cat/tablet/Hand E.png and b/cat/tablet/Hand E.png differ diff --git a/cat/tablet/Hand F.png b/cat/tablet/Hand F.png index 5ac5ec3..651e44d 100644 Binary files a/cat/tablet/Hand F.png and b/cat/tablet/Hand F.png differ diff --git a/cat/tablet/Hand G.png b/cat/tablet/Hand G.png index fe19ffd..02e5ed3 100644 Binary files a/cat/tablet/Hand G.png and b/cat/tablet/Hand G.png differ diff --git a/cat/tablet/Hand H.png b/cat/tablet/Hand H.png index d87ad8a..5491337 100644 Binary files a/cat/tablet/Hand H.png and b/cat/tablet/Hand H.png differ diff --git a/cat/tablet/Hand I.png b/cat/tablet/Hand I.png index 3fb1f67..61bac26 100644 Binary files a/cat/tablet/Hand I.png and b/cat/tablet/Hand I.png differ diff --git a/cat/tablet/Hand IA.png b/cat/tablet/Hand IA.png index b414318..995b6db 100644 Binary files a/cat/tablet/Hand IA.png and b/cat/tablet/Hand IA.png differ diff --git a/cat/tablet/Hand IB.png b/cat/tablet/Hand IB.png index 0ebd899..1a08226 100644 Binary files a/cat/tablet/Hand IB.png and b/cat/tablet/Hand IB.png differ diff --git a/cat/tablet/Hand IC.png b/cat/tablet/Hand IC.png index 0e06031..ab31299 100644 Binary files a/cat/tablet/Hand IC.png and b/cat/tablet/Hand IC.png differ diff --git a/cat/tablet/Hand ID.png b/cat/tablet/Hand ID.png index f4c9383..817dd34 100644 Binary files a/cat/tablet/Hand ID.png and b/cat/tablet/Hand ID.png differ diff --git a/osu!cat.py b/osu!cat.py index a600ae6..47c07e9 100644 --- a/osu!cat.py +++ b/osu!cat.py @@ -6,6 +6,7 @@ from math import sqrt from time import sleep +version = 'v1.1.1' def close_window(): root.withdraw() @@ -15,7 +16,7 @@ def close_window(): root = Tk() root.resizable(width=False, height=False) -root.title('osu!cat v1.0.0') +root.title('osu!cat ' + version) root.protocol('WM_DELETE_WINDOW', close_window) screen_x = root.winfo_screenwidth() @@ -73,13 +74,13 @@ def find_frame(cx, cy, f): return best_d[1] -print('Bongo Cat Live Cam v1.0.0') +print('Bongo Cat Live Cam ' + version) print('----------------------------------------------------------------------------------------------------------------------') -print('Disclaimer: There is a high probability you will experience som bugs or that the program will now work at all.\n' - 'This program will also most likely not work on resolutions where the height is bigger than the width, it will most\n' - 'likely use much of your cpu and there is no support for custom ingame resolutions. You have been warned.') +print('Disclaimer: There is a high probability you will experience some bugs or that the program will now work at all.\n' + 'This program will also most likely not work on resolutions where the height is bigger than the width and there\n' + '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 key 1, key 2 and tablet/mouse') +print('Before you can use this program you need to configure key 1, key 2, tablet/mouse and window size') while True: k1 = input('Key 1: ') k2 = input('Key 2: ') @@ -100,21 +101,31 @@ def find_frame(cx, cy, f): else: print('Invalid input') +print('(Type 0 for small and 1 for standard)') +while True: + i_type = input('Window size: ') + if i_type == '0': + size = (320, 320) + break + elif i_type == '1': + size = (640, 640) + break + else: + print('Invalid input') + print('All done! To reconfigure, just close and relaunch the application') #preload all images hit_images = { - 1: PIL.Image.open("cat/KeyTapHand.png"), - 2: PIL.Image.open("cat/KeyTapHand2.png") + 1: PIL.Image.open("cat/KeyTapHand1.png").resize(size), + 2: PIL.Image.open("cat/KeyTapHand2.png").resize(size) } cursor_images = { } for key in frame_points.keys(): - cursor_images[key] = PIL.Image.open("cat/{0}/Hand {1}.png".format(cursor_device, key)) - -#l_xyf = StringVar() # Label string for x and y cursor position + current base frame + cursor_images[key] = PIL.Image.open("cat/{0}/Hand {1}.png".format(cursor_device, key)).resize(size) default_img = PIL.ImageTk.PhotoImage(cursor_images['A']) -image_label = Label(root, image=default_img) # ,textvariable=l_xyf, compound=CENTER) +image_label = Label(root, image=default_img) image_label.image = default_img image_label.pack() @@ -159,5 +170,4 @@ def find_frame(cx, cy, f): image_label.configure(image=n_base_img) image_label.image = n_base_img - #l_xyf.set('x: ' + str(x) + ' ' + 'y: ' + str(y) + ' ' + 'frame: ' + f) # Updates x, y and frame values root.update()