Changed image resolution to 640x640, fixed wrong version display and …

…added a small window option
ZeCryptic · Sep 22, 2018 · 5d3a2a0 · 5d3a2a0
1 parent 8f1a410
commit 5d3a2a0
Show file tree

Hide file tree

Showing 29 changed files with 23 additions and 13 deletions.
diff --git a/cat/KeyTapHand.png b/cat/KeyTapHand.png
diff --git a/cat/KeyTapHand2.png b/cat/KeyTapHand2.png
diff --git a/cat/mouse/Hand A.png b/cat/mouse/Hand A.png
diff --git a/cat/mouse/Hand B.png b/cat/mouse/Hand B.png
diff --git a/cat/mouse/Hand C.png b/cat/mouse/Hand C.png
diff --git a/cat/mouse/Hand D.png b/cat/mouse/Hand D.png
diff --git a/cat/mouse/Hand E.png b/cat/mouse/Hand E.png
diff --git a/cat/mouse/Hand F.png b/cat/mouse/Hand F.png
diff --git a/cat/mouse/Hand G.png b/cat/mouse/Hand G.png
diff --git a/cat/mouse/Hand H.png b/cat/mouse/Hand H.png
diff --git a/cat/mouse/Hand I.png b/cat/mouse/Hand I.png
diff --git a/cat/mouse/Hand IA.png b/cat/mouse/Hand IA.png
diff --git a/cat/mouse/Hand IB.png b/cat/mouse/Hand IB.png
diff --git a/cat/mouse/Hand IC.png b/cat/mouse/Hand IC.png
diff --git a/cat/mouse/Hand ID.png b/cat/mouse/Hand ID.png
diff --git a/cat/tablet/Hand A.png b/cat/tablet/Hand A.png
diff --git a/cat/tablet/Hand B.png b/cat/tablet/Hand B.png
diff --git a/cat/tablet/Hand C.png b/cat/tablet/Hand C.png
diff --git a/cat/tablet/Hand D.png b/cat/tablet/Hand D.png
diff --git a/cat/tablet/Hand E.png b/cat/tablet/Hand E.png
diff --git a/cat/tablet/Hand F.png b/cat/tablet/Hand F.png
diff --git a/cat/tablet/Hand G.png b/cat/tablet/Hand G.png
diff --git a/cat/tablet/Hand H.png b/cat/tablet/Hand H.png
diff --git a/cat/tablet/Hand I.png b/cat/tablet/Hand I.png
diff --git a/cat/tablet/Hand IA.png b/cat/tablet/Hand IA.png
diff --git a/cat/tablet/Hand IB.png b/cat/tablet/Hand IB.png
diff --git a/cat/tablet/Hand IC.png b/cat/tablet/Hand IC.png
diff --git a/cat/tablet/Hand ID.png b/cat/tablet/Hand ID.png
diff --git 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()