norm fix

diff --git a/src/pacman/ecs/graphics.py b/src/pacman/ecs/graphics.py
index 8bdad796afb2868fd2b4f24cb85fcf8b062bc4cd..a8e5396726666cfe813cd2ea80bccfb522298f9a 100644 (file)
--- a/src/pacman/ecs/graphics.py
+++ b/src/pacman/ecs/graphics.py
@@ -19,10 +19,10 @@ from pacman.ecs.world import (
     RawComponentArg,
     RawComponentHook,
     Resource,
+    System,
     Systems,
     World,
     WorldShouldExit,
-    System,
 )
 
 

diff --git a/src/pacman/ecs/gui.py b/src/pacman/ecs/gui.py
index b0d2f9e2b01fc97d8bc0607b8f75b100305d40ed..6b4f0f83259eaae36c30313c33e3a133102e56a5 100644 (file)
--- a/src/pacman/ecs/gui.py
+++ b/src/pacman/ecs/gui.py
@@ -1,7 +1,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass, field
 from enum import Enum, auto
-from typing import override
+from typing import override, cast
 
 import pygame
 from pygame import Color, Vector2
@@ -142,7 +142,10 @@ def update_computed_text(
     world: World,
 ) -> None:
     for display, compute in elems:
-        display.text = world.run_raw_system(compute.cb, lambda: display.text)
+        display.text = world.run_raw_system(
+            compute.cb,
+            cast(Callable[[], str], lambda display=display: display.text),
+        )
 
 
 def update_text_sprites(

diff --git a/src/pacman/ecs/world.py b/src/pacman/ecs/world.py
index ce88ecdb8d80554627b06daaa919cfd4d8073e54..11c8f116f7aeafd52d4faf3935476683cf71eb38 100644 (file)
--- a/src/pacman/ecs/world.py
+++ b/src/pacman/ecs/world.py
@@ -151,9 +151,11 @@ class Archetype:
                 return kv[ty]
             return map(self._components[ty].__getitem__, positions)
 
-        itr = lambda: range(
-            len(dst._entities) - len(components), len(dst._entities)
-        )
+        def itr() -> range:
+            return range(
+                len(dst._entities) - len(components), len(dst._entities)
+            )
+
         dst._extend(cb)
         self._discard(positions)
 

diff --git a/src/pacman/game/__init__.py b/src/pacman/game/__init__.py
index 2a37803fbe5062fbf5679482f737a2e42c13f2a0..419e5ed8561e7a6014cfbc1a8dab2e6bc1ef17ca 100644 (file)
--- a/src/pacman/game/__init__.py
+++ b/src/pacman/game/__init__.py
@@ -2,14 +2,13 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from enum import Enum, auto
 from random import random, shuffle
-from typing import override
+from typing import override, cast
 
 from mazegenerator import MazeGenerator  # type: ignore[import-untyped]
 from pydantic import BaseModel
 from pygame import K_ESCAPE, Vector2
 from pygame.math import clamp
 
-import pacman
 from pacman.ecs import minimal_plugins
 from pacman.ecs.assets import Assets
 from pacman.ecs.coord import (
@@ -26,7 +25,6 @@ from pacman.ecs.graphics import (
     ShouldRender,
     Sprite2D,
     StopAnimation,
-    WindowEvents,
     WindowPositionned,
     graphics_plugins,
     key_just_pressed,
@@ -838,7 +836,7 @@ def spawn_hud(world: World, fonts: Assets[Font]) -> None:
                 WindowPositionned(Vector2(), Vector2(20, y * 100 + 20)),
                 CoordBundle(depth=-20),
                 ShouldRender(),
-                ComputedText(fn),
+                ComputedText(cast(System[str], fn)),
                 TextDisplay(
                     "",
                     fonts.load("./asset/fonts/JetBrainsMonoNL-Regular.ttf:30"),