rustplus 6.0.7__tar.gz → 6.0.8__tar.gz

{rustplus-6.0.7/rustplus.egg-info → rustplus-6.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.7
+Version: 6.0.8
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n

{rustplus-6.0.7 → rustplus-6.0.8}/rustplus/__init__.py

@@ -14,5 +14,5 @@ from .structs import RustError, RustMarker, Vector
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "6.0.7"
+__version__ = "6.0.8"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

{rustplus-6.0.7 → rustplus-6.0.8}/rustplus/rust_api.py

@@ -333,7 +333,7 @@ class RustSocket:
             for marker in map_markers:
                 if add_events:
                     if marker.type in [2, 4, 5, 6, 8]:
-                        icon = convert_marker(str(marker.type), marker.rotation)
+                        icon = convert_marker(int(marker.type), marker.rotation)
                         if marker.type == 6:
                             x, y = marker.x, marker.y
                             y = min(max(y, 0), map_size)

{rustplus-6.0.7 → rustplus-6.0.8}/rustplus/utils/utils.py

@@ -144,31 +144,31 @@ async def avatar_processing(
     return border_image
 
 
-def convert_marker(name, angle) -> Image.Image:
+def convert_marker(marker_type: int, angle) -> Image.Image:
     name_to_file = {
-        "2": "explosion.png",
-        "4": "chinook.png",
-        "5": "cargo.png",
-        "6": "crate.png",
-        "8": "patrol.png",
+        2: "explosion.png",
+        4: "chinook.png",
+        5: "cargo.png",
+        6: "crate.png",
+        8: "patrol.png",
     }
 
-    with resources.path(ICONS_PATH, name_to_file[name]) as path:
+    with resources.path(ICONS_PATH, name_to_file[marker_type]) as path:
         icon = Image.open(path).convert("RGBA")
 
-    if name == "6":
+    if marker_type == 6:
         icon = icon.resize((85, 85))
-    elif name == "2":
+    elif marker_type == 2:
         icon = icon.resize((96, 96))
-    elif name in ["4", "8"]:
+    elif marker_type == 4 or marker_type == 8:
         blades_file = "chinook_blades.png"
-        blades_size = (100, 100) if name == "4" else (200, 200)
+        blades_size = (100, 100) if marker_type == 4 else (200, 200)
 
         with resources.path(ICONS_PATH, blades_file) as path:
             blades = Image.open(path).convert("RGBA")
         blades = blades.resize(blades_size)
 
-        if name == "4":
+        if marker_type == 4:
             icon.paste(blades, (64 - 50, 96 - 50), blades)
             icon.paste(blades, (64 - 50, 32 - 50), blades)
         else:

{rustplus-6.0.7 → rustplus-6.0.8/rustplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.7
+Version: 6.0.8
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n