diff --git a/cat/KeyTapHand1.png b/cat/KeyTapHand1.png index 5e55216..d6cabbd 100644 Binary files a/cat/KeyTapHand1.png and b/cat/KeyTapHand1.png differ diff --git a/cat/KeyTapHand2.png b/cat/KeyTapHand2.png index 6a580df..6ed37d5 100644 Binary files a/cat/KeyTapHand2.png and b/cat/KeyTapHand2.png differ diff --git a/cat/mouse/green/Hand A.png b/cat/mouse/green/Hand A.png index afbba60..fd6ab87 100644 Binary files a/cat/mouse/green/Hand A.png and b/cat/mouse/green/Hand A.png differ diff --git a/cat/mouse/green/Hand B.png b/cat/mouse/green/Hand B.png index 167b0cf..c69b9a2 100644 Binary files a/cat/mouse/green/Hand B.png and b/cat/mouse/green/Hand B.png differ diff --git a/cat/mouse/green/Hand C.png b/cat/mouse/green/Hand C.png index 13d7381..619ee8c 100644 Binary files a/cat/mouse/green/Hand C.png and b/cat/mouse/green/Hand C.png differ diff --git a/cat/mouse/green/Hand D.png b/cat/mouse/green/Hand D.png index 23da165..b7eee4d 100644 Binary files a/cat/mouse/green/Hand D.png and b/cat/mouse/green/Hand D.png differ diff --git a/cat/mouse/green/Hand E.png b/cat/mouse/green/Hand E.png index f88a586..20ef7d8 100644 Binary files a/cat/mouse/green/Hand E.png and b/cat/mouse/green/Hand E.png differ diff --git a/cat/mouse/green/Hand F.png b/cat/mouse/green/Hand F.png index 16c05a9..c767919 100644 Binary files a/cat/mouse/green/Hand F.png and b/cat/mouse/green/Hand F.png differ diff --git a/cat/mouse/green/Hand G.png b/cat/mouse/green/Hand G.png index 37a39e3..ce2f590 100644 Binary files a/cat/mouse/green/Hand G.png and b/cat/mouse/green/Hand G.png differ diff --git a/cat/mouse/green/Hand H.png b/cat/mouse/green/Hand H.png index 5f72d88..e2e1ac3 100644 Binary files a/cat/mouse/green/Hand H.png and b/cat/mouse/green/Hand H.png differ diff --git a/cat/mouse/green/Hand I.png b/cat/mouse/green/Hand I.png index ffb91a8..45a269b 100644 Binary files a/cat/mouse/green/Hand I.png and b/cat/mouse/green/Hand I.png differ diff --git a/cat/mouse/green/Hand IA.png b/cat/mouse/green/Hand IA.png index 48c4ad5..3534349 100644 Binary files a/cat/mouse/green/Hand IA.png and b/cat/mouse/green/Hand IA.png differ diff --git a/cat/mouse/green/Hand IB.png b/cat/mouse/green/Hand IB.png index acee7a2..0b13257 100644 Binary files a/cat/mouse/green/Hand IB.png and b/cat/mouse/green/Hand IB.png differ diff --git a/cat/mouse/green/Hand IC.png b/cat/mouse/green/Hand IC.png index b4118c4..51f8a84 100644 Binary files a/cat/mouse/green/Hand IC.png and b/cat/mouse/green/Hand IC.png differ diff --git a/cat/mouse/green/Hand ID.png b/cat/mouse/green/Hand ID.png index 4d1772f..dc42176 100644 Binary files a/cat/mouse/green/Hand ID.png and b/cat/mouse/green/Hand ID.png differ diff --git a/cat/mouse/standard/Hand A.png b/cat/mouse/standard/Hand A.png index cc702eb..5c49ca4 100644 Binary files a/cat/mouse/standard/Hand A.png and b/cat/mouse/standard/Hand A.png differ diff --git a/cat/mouse/standard/Hand B.png b/cat/mouse/standard/Hand B.png index 38198d8..7777654 100644 Binary files a/cat/mouse/standard/Hand B.png and b/cat/mouse/standard/Hand B.png differ diff --git a/cat/mouse/standard/Hand C.png b/cat/mouse/standard/Hand C.png index d113bb7..c98b6a8 100644 Binary files a/cat/mouse/standard/Hand C.png and b/cat/mouse/standard/Hand C.png differ diff --git a/cat/mouse/standard/Hand D.png b/cat/mouse/standard/Hand D.png index 89d8e85..9c832fb 100644 Binary files a/cat/mouse/standard/Hand D.png and b/cat/mouse/standard/Hand D.png differ diff --git a/cat/mouse/standard/Hand E.png b/cat/mouse/standard/Hand E.png index 0f99f94..b3d35c3 100644 Binary files a/cat/mouse/standard/Hand E.png and b/cat/mouse/standard/Hand E.png differ diff --git a/cat/mouse/standard/Hand F.png b/cat/mouse/standard/Hand F.png index 1bc681b..88eb787 100644 Binary files a/cat/mouse/standard/Hand F.png and b/cat/mouse/standard/Hand F.png differ diff --git a/cat/mouse/standard/Hand G.png b/cat/mouse/standard/Hand G.png index 548c480..8aadc59 100644 Binary files a/cat/mouse/standard/Hand G.png and b/cat/mouse/standard/Hand G.png differ diff --git a/cat/mouse/standard/Hand H.png b/cat/mouse/standard/Hand H.png index b532621..0205dc9 100644 Binary files a/cat/mouse/standard/Hand H.png and b/cat/mouse/standard/Hand H.png differ diff --git a/cat/mouse/standard/Hand I.png b/cat/mouse/standard/Hand I.png index aabc218..dcce676 100644 Binary files a/cat/mouse/standard/Hand I.png and b/cat/mouse/standard/Hand I.png differ diff --git a/cat/mouse/standard/Hand IA.png b/cat/mouse/standard/Hand IA.png index 9555ec4..b4d37ff 100644 Binary files a/cat/mouse/standard/Hand IA.png and b/cat/mouse/standard/Hand IA.png differ diff --git a/cat/mouse/standard/Hand IB.png b/cat/mouse/standard/Hand IB.png index 778f585..79e8539 100644 Binary files a/cat/mouse/standard/Hand IB.png and b/cat/mouse/standard/Hand IB.png differ diff --git a/cat/mouse/standard/Hand IC.png b/cat/mouse/standard/Hand IC.png index 98370a4..d100745 100644 Binary files a/cat/mouse/standard/Hand IC.png and b/cat/mouse/standard/Hand IC.png differ diff --git a/cat/mouse/standard/Hand ID.png b/cat/mouse/standard/Hand ID.png index c99dd38..8a2a131 100644 Binary files a/cat/mouse/standard/Hand ID.png and b/cat/mouse/standard/Hand ID.png differ diff --git a/cat/tablet/green/Hand A.png b/cat/tablet/green/Hand A.png index 27a5434..f40f3c8 100644 Binary files a/cat/tablet/green/Hand A.png and b/cat/tablet/green/Hand A.png differ diff --git a/cat/tablet/green/Hand B.png b/cat/tablet/green/Hand B.png index f858848..1ebc6df 100644 Binary files a/cat/tablet/green/Hand B.png and b/cat/tablet/green/Hand B.png differ diff --git a/cat/tablet/green/Hand C.png b/cat/tablet/green/Hand C.png index f4bb1ae..788c14b 100644 Binary files a/cat/tablet/green/Hand C.png and b/cat/tablet/green/Hand C.png differ diff --git a/cat/tablet/green/Hand D.png b/cat/tablet/green/Hand D.png index cfc992e..3cabbd5 100644 Binary files a/cat/tablet/green/Hand D.png and b/cat/tablet/green/Hand D.png differ diff --git a/cat/tablet/green/Hand E.png b/cat/tablet/green/Hand E.png index 5baadc3..b0b7157 100644 Binary files a/cat/tablet/green/Hand E.png and b/cat/tablet/green/Hand E.png differ diff --git a/cat/tablet/green/Hand F.png b/cat/tablet/green/Hand F.png index 42f65e1..c59f474 100644 Binary files a/cat/tablet/green/Hand F.png and b/cat/tablet/green/Hand F.png differ diff --git a/cat/tablet/green/Hand G.png b/cat/tablet/green/Hand G.png index ff7b65c..7dea9ab 100644 Binary files a/cat/tablet/green/Hand G.png and b/cat/tablet/green/Hand G.png differ diff --git a/cat/tablet/green/Hand H.png b/cat/tablet/green/Hand H.png index 14d806a..d217807 100644 Binary files a/cat/tablet/green/Hand H.png and b/cat/tablet/green/Hand H.png differ diff --git a/cat/tablet/green/Hand I.png b/cat/tablet/green/Hand I.png index 4f93051..e42e30e 100644 Binary files a/cat/tablet/green/Hand I.png and b/cat/tablet/green/Hand I.png differ diff --git a/cat/tablet/green/Hand IA.png b/cat/tablet/green/Hand IA.png index f2c017a..68b97d9 100644 Binary files a/cat/tablet/green/Hand IA.png and b/cat/tablet/green/Hand IA.png differ diff --git a/cat/tablet/green/Hand IB.png b/cat/tablet/green/Hand IB.png index 1c94c99..68d37c9 100644 Binary files a/cat/tablet/green/Hand IB.png and b/cat/tablet/green/Hand IB.png differ diff --git a/cat/tablet/green/Hand IC.png b/cat/tablet/green/Hand IC.png index 880f9c4..1bc7d41 100644 Binary files a/cat/tablet/green/Hand IC.png and b/cat/tablet/green/Hand IC.png differ diff --git a/cat/tablet/green/Hand ID.png b/cat/tablet/green/Hand ID.png index 6f5b903..8aadd0c 100644 Binary files a/cat/tablet/green/Hand ID.png and b/cat/tablet/green/Hand ID.png differ diff --git a/cat/tablet/standard/Hand A.png b/cat/tablet/standard/Hand A.png index e8f3345..234de70 100644 Binary files a/cat/tablet/standard/Hand A.png and b/cat/tablet/standard/Hand A.png differ diff --git a/cat/tablet/standard/Hand B.png b/cat/tablet/standard/Hand B.png index 343e275..555160e 100644 Binary files a/cat/tablet/standard/Hand B.png and b/cat/tablet/standard/Hand B.png differ diff --git a/cat/tablet/standard/Hand C.png b/cat/tablet/standard/Hand C.png index 72208b1..dab62a4 100644 Binary files a/cat/tablet/standard/Hand C.png and b/cat/tablet/standard/Hand C.png differ diff --git a/cat/tablet/standard/Hand D.png b/cat/tablet/standard/Hand D.png index 91eea68..3791d73 100644 Binary files a/cat/tablet/standard/Hand D.png and b/cat/tablet/standard/Hand D.png differ diff --git a/cat/tablet/standard/Hand E.png b/cat/tablet/standard/Hand E.png index b002ab7..508f0a6 100644 Binary files a/cat/tablet/standard/Hand E.png and b/cat/tablet/standard/Hand E.png differ diff --git a/cat/tablet/standard/Hand F.png b/cat/tablet/standard/Hand F.png index 57dfcf0..a0d9cb4 100644 Binary files a/cat/tablet/standard/Hand F.png and b/cat/tablet/standard/Hand F.png differ diff --git a/cat/tablet/standard/Hand G.png b/cat/tablet/standard/Hand G.png index 0749c4a..6528602 100644 Binary files a/cat/tablet/standard/Hand G.png and b/cat/tablet/standard/Hand G.png differ diff --git a/cat/tablet/standard/Hand H.png b/cat/tablet/standard/Hand H.png index c0296fe..0820d5f 100644 Binary files a/cat/tablet/standard/Hand H.png and b/cat/tablet/standard/Hand H.png differ diff --git a/cat/tablet/standard/Hand I.png b/cat/tablet/standard/Hand I.png index ddfa4ca..9d28e90 100644 Binary files a/cat/tablet/standard/Hand I.png and b/cat/tablet/standard/Hand I.png differ diff --git a/cat/tablet/standard/Hand IA.png b/cat/tablet/standard/Hand IA.png index 16e98ca..1ad5607 100644 Binary files a/cat/tablet/standard/Hand IA.png and b/cat/tablet/standard/Hand IA.png differ diff --git a/cat/tablet/standard/Hand IB.png b/cat/tablet/standard/Hand IB.png index 6cca550..5909874 100644 Binary files a/cat/tablet/standard/Hand IB.png and b/cat/tablet/standard/Hand IB.png differ diff --git a/cat/tablet/standard/Hand IC.png b/cat/tablet/standard/Hand IC.png index 95056b1..b1068e1 100644 Binary files a/cat/tablet/standard/Hand IC.png and b/cat/tablet/standard/Hand IC.png differ diff --git a/cat/tablet/standard/Hand ID.png b/cat/tablet/standard/Hand ID.png index 6426422..eaa43de 100644 Binary files a/cat/tablet/standard/Hand ID.png and b/cat/tablet/standard/Hand ID.png differ diff --git a/osu!cat.py b/osu!cat.py index 7f9e8ec..75b94e8 100644 --- a/osu!cat.py +++ b/osu!cat.py @@ -2,10 +2,11 @@ import PIL.ImageTk import PIL.Image from keyboard import is_pressed -from win32gui import GetCursorPos from math import sqrt from time import sleep -from sys import exit +from sys import exit, platform +if platform == 'win32': + from win32gui import GetCursorPos version = 'v1.2.0' @@ -179,7 +180,10 @@ def iterate(): k1_p = is_pressed(k1) k2_p = is_pressed(k2) - x, y = GetCursorPos() + if platform == 'win32': + x, y = GetCursorPos() + else: + x, y = root.winfo_pointerxy() f = find_frame(x, y, f) base_img = cursor_images[f]