zhmiscellany 5.7.4__py3-none-any.whl → 5.7.7__py3-none-any.whl

zhmiscellany/_misc_supportfuncs.py

@@ -130,8 +130,8 @@ def move_mouse(x: int, y: int, relative=False):
         normalized_y = int(y * (65535 / SCREEN_HEIGHT))
     else:
         if calibrated:
-            normalized_x = x * calibration_multiplier_x
-            normalized_y = y * calibration_multiplier_y
+            normalized_x = math.ceil(x * calibration_multiplier_x)
+            normalized_y = math.ceil(y * calibration_multiplier_y)
         else:
             normalized_x = x
             normalized_y = y

zhmiscellany/discord.py

@@ -290,7 +290,7 @@ def ids_to_message_url(channel_id, message_id, guild_id=None):
     if guild_id:
         return f'https://discord.com/channels/{guild_id}/{channel_id}/{message_id}'
     else:
-        return f'https://discord.com/channels/{channel_id}/{message_id}'
+        return f'https://discord.com/channels/@me/{channel_id}/{message_id}'
 
 
 def message_url_to_ids(message_url):

zhmiscellany/macro.py

@@ -19,8 +19,6 @@ get_mouse_xy = get_mouse_xy
 def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_click=False, shift=False, ctrl=False, act_start=True, act_end=True, click_end_duration=None, double_click=False, animation_time=None, animation_fps=60, animation_easing=True, relative=False, ensure_movement=True, pre_click_duration=None, pre_click_wiggle=False, click=True):
     if not click:
         act_start=False;act_end=False
-    if relative:
-        ensure_movement = False
     if right_click and middle_click:
         raise Exception('Both right click and middle click were set to true. Make sure just one is set to true at a time, or neither.')
     if type(x) != tuple and type(x) != list:
@@ -116,8 +114,8 @@ def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_c
         else:
             cx = x
             cy = y
-        if ensure_movement:
-            limit = 2**5
+        limit = 2 ** 5
+        if ensure_movement and (not relative):
             move_mouse(cx, cy, relative=relative)
             for i in range(limit):
                 if get_mouse_xy() != (x, y):
@@ -125,8 +123,18 @@ def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_c
                 else:
                     break
         else:
-            if not (animation_time and relative):
+            if not relative:
                 move_mouse(cx, cy, relative=relative)
+            else:
+                if not (animation_time and relative):
+                    targ = tuple(a + b for a, b in zip(get_mouse_xy(), (cx, cy)))
+                    move_mouse(cx, cy, relative=relative)
+                    for i in range(limit):
+                        cur_pos = get_mouse_xy()
+                        if cur_pos != targ:
+                            move_mouse(max(-1, min(1, (targ[0]-cur_pos[0]))), max(-1, min(1, (targ[1]-cur_pos[1]))), relative=relative)
+                        else:
+                            break
 
     if pre_click_duration:
         if pre_click_wiggle:

{zhmiscellany-5.7.4.dist-info → zhmiscellany-5.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zhmiscellany
-Version: 5.7.4
+Version: 5.7.7
 Summary: A collection of useful/interesting python libraries made by zh.
 Home-page: https://discord.gg/ThBBAuueVJ
 Author: zh

{zhmiscellany-5.7.4.dist-info → zhmiscellany-5.7.7.dist-info}/RECORD

@@ -1,18 +1,18 @@
 zhmiscellany/__init__.py,sha256=Oh3gAJRWq2aUEgkolmQyiZOQ3iey5OC4NA2XaTHuVv4,1139
 zhmiscellany/_discord_supportfuncs.py,sha256=RotSpurqFtL5q6v_ST1e2Y_1qJMaHp1CDsF5i-gR4ec,6524
 zhmiscellany/_fileio_supportfuncs.py,sha256=OIboEBVahqbpG1wbtrhAjoFV-oPylFVmOENOByawaX0,365
-zhmiscellany/_misc_supportfuncs.py,sha256=DLu1QIt7PUulqgeMwi7RVh1Nu4xcsQs2wz8WxHogGNk,6708
+zhmiscellany/_misc_supportfuncs.py,sha256=UvD7aFofx-0XlLKS01j81K2afHGtt8usb9-UdNCQCa4,6730
 zhmiscellany/_processing_supportfuncs.py,sha256=aZKWIfJW_lVaQs_EyGGBhmoMc6btA38X2hY6A3kTxN8,10341
 zhmiscellany/_py_resources.py,sha256=HqJs5aRLymLZ2J5Io8g6bY58pGWhN9b8vCktC2DW4KQ,229009
 zhmiscellany/_resource_files_lookup.py,sha256=hsgPW0dngokgqWrAVAv5rUo-eobzJPjvWHt4xrOG5l0,856
 zhmiscellany/cpp.py,sha256=XEUEoIKCDCdY5VgwNWE5oXrGjtsmGdz_MnaVwQmi2dk,179
 zhmiscellany/dict.py,sha256=0BZJ5eK-MurAHYV1OPa0jdGTr-QEWos7ZM0npb-tN9I,81
-zhmiscellany/discord.py,sha256=9Fvl9h99VT6z5jUS9_bdRSh0tvxS6p37rm4lxbLKpfw,19334
+zhmiscellany/discord.py,sha256=bq4fBBIykQrwBKWeJ_Ia5ZtMjP9RfRheOa7fyWZBNjo,19338
 zhmiscellany/fileio.py,sha256=KmRnWWZJWBc5Or3_mKcRY2ehE_Fuk870iS-imtyERyg,18169
 zhmiscellany/gui.py,sha256=VgT5j5UIr-wWyL2P1qCHSNL7RrvZWDlm0TX00JGWmKo,7404
 zhmiscellany/image.py,sha256=qUjxiYpc2VVZp2vwr1vN36O2PVQ7YlMKzhegQ1u4c0M,8198
 zhmiscellany/list.py,sha256=S8Z85bLJEP9lk2JkGpzUcG6kpRB7a-NWDIHMPiF5bKo,1473
-zhmiscellany/macro.py,sha256=a1m4G8OFUM1EKsjzPpcZIPH3ldTq5_UiTHJ9KGl_y7o,16354
+zhmiscellany/macro.py,sha256=cerHp2YZGGDr-d7r__PV346TNOiW_GY9NecDwx678Pw,16857
 zhmiscellany/math.py,sha256=btOQTe_GvqP0A7Zz84tmN_c8j1NGe_mKnhmAt40lhLU,2482
 zhmiscellany/misc.py,sha256=BsTbRWlXI5LZBG7Bl2MgLzHESyCMJnr_KNZAf2wY_H4,29689
 zhmiscellany/netio.py,sha256=GTamo5cJn4P6u8V_kgZ9kL8qeMUE7OQAmYkmj9Sp_GA,2236
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=PxO4aykFzC60xbTQuc66KzZYIxiW0KPebXZbncD2HcU,3795
 zhmiscellany/processing.py,sha256=srwlV8FZ--svF5e6rZZxhIs_6ZjOAwq2OcQEf6T2Le8,10410
 zhmiscellany/rust.py,sha256=znN6DYNoa_p-braTuDZKvUnXX8reWLFu_dG4fv2vLR0,442
 zhmiscellany/string.py,sha256=xyqE6V5YF2nieZDcg5ZrXTIrH2D9oDRbZ5vQGz8rPys,4787
-zhmiscellany-5.7.4.dist-info/METADATA,sha256=L8JT8SrpptwnuFnJxjiM5IG_w_C1DhDzntxVdQFjHcQ,42153
-zhmiscellany-5.7.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zhmiscellany-5.7.4.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-5.7.4.dist-info/RECORD,,
+zhmiscellany-5.7.7.dist-info/METADATA,sha256=61XESPrNDcVsG98yoISKgXWqHGqEADRIf240JhRzAMI,42153
+zhmiscellany-5.7.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+zhmiscellany-5.7.7.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-5.7.7.dist-info/RECORD,,