Update typing

Author: tmaegel

make_spritesheet.py

@@ -11,7 +11,7 @@
 SPRITE_SIZE = 512
 
 
-def load_spritesheet_from_filelist(files_path: str) -> list[pg.Surface]:
+def load_spritesheet_from_filelist(files_path: str) -> list[pg.surface.Surface]:
     sprite_table = []
     if not os.path.isdir(files_path):
         print(f"Directory {files_path} doesnt exists.")

make_tileset.py

@@ -9,7 +9,9 @@
 from pysurvive.utils import load_image
 
 
-def load_tile_from_filelist(files_path: str, tile_size: int) -> list[pg.Surface]:
+def load_tile_from_filelist(
+    files_path: str, tile_size: int
+) -> list[pg.surface.Surface]:
     tile_table = []
     if not os.path.isdir(files_path):
         print(f"Directory {files_path} doesnt exists.")

pysurvive/game/core.py

@@ -14,7 +14,7 @@ class Screen:
 
     _screen = None
 
-    def __new__(cls, rect: pg.Rect = None):
+    def __new__(cls, rect: pg.rect.Rect = None):
         if cls._screen is None:
             cls._screen = super().__new__(cls)
             if rect:

pysurvive/game/loop.py

@@ -1,7 +1,14 @@
 #!/usr/bin/env python
 # coding=utf-8
 import pygame as pg
-from pygame.locals import K_ESCAPE, KEYDOWN, MOUSEBUTTONDOWN, MOUSEBUTTONUP, QUIT
+from pygame.locals import (
+    K_ESCAPE,
+    KEYDOWN,
+    MOUSEBUTTONDOWN,
+    MOUSEBUTTONUP,
+    MOUSEMOTION,
+    QUIT,
+)
 
 from pysurvive.config import FPS, GRAY_LIGHT2, MAP_DIR, RED_LIGHT
 from pysurvive.game.core import Camera, Screen
@@ -29,14 +36,16 @@ def __init__(self) -> None:
         pg.display.set_caption("pysurvive")
         pg.transform.set_smoothscale_backend("SSE")
         # Turn off the mouse cursor.
-        pg.mouse.set_visible(0)
+        pg.mouse.set_visible(True)
         # Limit the number of allowed pygame events.
-        pg.event.set_allowed([QUIT, KEYDOWN, K_ESCAPE, MOUSEBUTTONDOWN, MOUSEBUTTONUP])
+        # pg.event.set_allowed(
+        #     [QUIT, KEYDOWN, K_ESCAPE, MOUSEBUTTONDOWN, MOUSEBUTTONUP, MOUSEMOTION]
+        # )
 
         self.fps_font = pg.font.SysFont("Arial", 14)
 
         # Absolute (start) position of the player (camera) in game world.
-        self.camera = Camera(0, 0)
+        self.camera = Camera(300, 300)
 
         # Prepare the shadow surface / screen.
         # self.screen_shadow = pg.Surface(self.screen.size)

pysurvive/map/objects.py

@@ -8,7 +8,7 @@
 
 class MapObject(pg.sprite.Sprite):
     def __init__(
-        self, _x: int, _y: int, _image: pg.Surface, rotation: bool = False
+        self, _x: int, _y: int, _image: pg.surface.Surface, rotation: bool = False
     ) -> None:
         super().__init__()
         self.image = _image
@@ -20,7 +20,7 @@ def __init__(
         self.rect.x = self.x
         self.rect.y = self.y
 
-    def init_rotation(self, angle: int) -> pg.Surface:
+    def init_rotation(self, angle: int) -> pg.surface.Surface:
         """Return rotated surfaces based on the original one."""
         return pg.transform.rotate(
             self.image,

pysurvive/map/tileset.py

@@ -67,20 +67,22 @@ def get_tile_index(self, tile_id: int) -> int:
         """Returns the tile index of the table by id."""
         return tile_id - self.first_gid
 
-    def get_tile(self, tile_id: int) -> pg.Surface:
+    def get_tile(self, tile_id: int) -> pg.surface.Surface:
         """Returns the tile (image) by id."""
         return self.table[tile_id - self.first_gid]
 
     @staticmethod
-    def _load(tileset_file: str, tile_width: int, tile_height: int) -> list[pg.Surface]:
+    def _load(
+        tileset_file: str, tile_width: int, tile_height: int
+    ) -> list[pg.surface.Surface]:
         """
         Load a tileset from single file and split it into a table.
         The tileset consists of several tiles arranged in a row.
         """
         logger.info("Loading tileset from file %s.", tileset_file)
         image, _ = load_image(tileset_file, alpha=True)
         image_width, image_height = image.get_size()
-        tile_table: list[pg.Surface] = []
+        tile_table: list[pg.surface.Surface] = []
         for tile_x in range(0, image_width // tile_width):
             rect = (
                 tile_x * tile_width,

pysurvive/utils.py

@@ -18,7 +18,7 @@ def play(self) -> None:
 
 def load_image(
     filename: str, alpha: bool = False, colorkey: tuple[int, int, int] = None
-) -> tuple[pg.Surface, pg.Rect]:
+) -> tuple[pg.surface.Surface, pg.rect.Rect]:
     """
     Load an image from disk.
 

tests/test_screen.py

@@ -10,7 +10,7 @@
 class TestScreen:
     @pytest.fixture()
     def singleton(self):
-        def _wrapper(rect: pg.Rect = None):
+        def _wrapper(rect: pg.rect.Rect = None):
             return Screen(rect)
 
         return _wrapper