Fix circular imports

seekers.py

@@ -39,7 +39,7 @@ def main():
 
     args = parser.parse_args()
 
-    if args.nogrpc and not args.ai_files:
+    if args.no_grpc and not args.ai_files:
         raise ValueError("At least one AI file must be provided if gRPC is disabled.")
 
     config = Config.from_filepath(args.config)
@@ -53,14 +53,14 @@ def main():
 
     logging.basicConfig(level=args.loglevel, style="{", format=f"[{{name}}] {{levelname}}: {{message}}",
                         stream=sys.stdout)
-    address = args.address if not args.nogrpc else False
+    address = args.address if not args.no_grpc else False
 
     seekers_game = SeekersGame(
         local_ai_locations=args.ai_files,
         config=config,
         grpc_address=address,
         debug=args.debug,
-        dont_kill=args.nokill
+        dont_kill=args.no_kill
     )
     seekers_game.listen()
     seekers_game.start()

seekers/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
 
 from .colors import Color
+from .vector import Vector
 from .game import *

seekers/debug_drawing.py

@@ -3,7 +3,7 @@
 import typing
 from contextvars import ContextVar
 
-from .vector import Vector
+from seekers.vector import Vector
 from .draw import GameRenderer
 
 

seekers/draw.py

@@ -4,11 +4,14 @@
 
 import pygame
 
-from seekers import *
 from .colors import *
-from player import Player
-from .seekers_types import Config
-from .player import LocalPlayer, GrpcClientPlayer
+from seekers.vector import Vector
+from seekers.game.seeker import Seeker
+from seekers.game.goal import Goal
+from seekers.game.world import World
+from seekers.game.camp import Camp
+from seekers.game.player import Player, LocalPlayer, GrpcClientPlayer
+from seekers.game.config import Config
 
 
 class Animation(abc.ABC):

seekers/game/__init__.py

@@ -1,9 +1,9 @@
-from .vector import Vector
 from .config import Config
+from .physical import Physical
 from .camp import Camp
 from .seeker import Seeker, Magnet
 from .goal import Goal
+from .world import World
 
-from .camp import Camp
 from .player import Player
 from .game import SeekersGame

seekers/game/camp.py

@@ -1,13 +1,12 @@
 import dataclasses
 
-from .vector import Vector
-from .player import Player
+from seekers.vector import Vector
 
 
 @dataclasses.dataclass
 class Camp:
     id: str
-    owner: Player
+    owner: "Player"
     position: Vector
     width: float
     height: float

seekers/game/game.py

@@ -9,12 +9,14 @@
 import typing
 import pygame
 
-from seekers import *
-from seekers.seekers_types import Config, get_id
-from seekers.player import LocalPlayer
+from .game_logic import tick
+from .config import Config, get_id
+from .seeker import Seeker
+from .goal import Goal
+from .world import World
+from .player import Player, LocalPlayer
 from seekers import colors
 from seekers import draw
-from seekers.game import game_logic
 
 
 class GameFullError(Exception): ...
@@ -127,7 +129,7 @@ def mainloop(self):
                     player.poll_ai(self.config.global_wait_for_players, self.world, self.goals, self.players,
                                    self.ticks, self.debug)
 
-                game_logic.tick(self.players.values(), self.camps, self.goals, self.animations, self.world)
+                tick(self.players.values(), self.camps, self.goals, self.animations, self.world)
 
                 self.ticks += 1
 

seekers/game/game_logic.py

@@ -4,7 +4,7 @@
 from .camp import Camp
 from .goal import Goal
 from .world import World
-from .vector import Vector
+from seekers.vector import Vector
 from .seeker import Seeker
 from .physical import Physical
 from seekers.draw import ScoreAnimation, Animation

seekers/game/goal.py

@@ -1,5 +1,5 @@
 from .physical import Physical
-from .vector import Vector
+from seekers.vector import Vector
 from .config import Config
 from .camp import Camp
 

seekers/game/physical.py

@@ -1,4 +1,4 @@
-from .vector import Vector
+from seekers.vector import Vector
 from .world import World
 
 

seekers/game/player.py

@@ -9,7 +9,7 @@
 
 from seekers.game.world import World
 from seekers.colors import Color
-from .vector import Vector
+from seekers.vector import Vector
 from .camp import Camp
 from .seeker import Seeker, Magnet
 from .goal import Goal

seekers/game/seeker.py

@@ -1,10 +1,9 @@
 import math
 
-from seekers.seekers_types import Config
-from .vector import Vector
+from .config import Config
+from seekers.vector import Vector
 from .physical import Physical
-from .player import Player
-from seekers.game.world import World
+from .world import World
 
 
 class Magnet:
@@ -36,7 +35,7 @@ def disable(self):
 
 
 class Seeker(Physical):
-    def __init__(self, owner: Player, disabled_time: float, magnet_slowdown: float, base_thrust: float, *args,
+    def __init__(self, owner, disabled_time: float, magnet_slowdown: float, base_thrust: float, *args,
                  **kwargs):
         Physical.__init__(self, *args, **kwargs)
 
@@ -50,7 +49,7 @@ def __init__(self, owner: Player, disabled_time: float, magnet_slowdown: float,
         self.base_thrust = base_thrust
 
     @classmethod
-    def from_config(cls, owner: Player, id_: str, position: Vector, config: Config):
+    def from_config(cls, owner, id_: str, position: Vector, config: Config):
         return cls(
             owner=owner,
             disabled_time=config.seeker_disabled_time,

seekers/game/world.py

@@ -2,10 +2,7 @@
 import random
 import typing
 
-from .vector import Vector
-from .goal import Goal
-from .seeker import Seeker
-from .player import Player
+from seekers.vector import Vector
 from .camp import Camp
 from .config import Config, get_id
 
@@ -60,19 +57,19 @@ def index_of_nearest(self, pos: Vector, positions: list) -> int:
                 j = i + 1
         return j
 
-    def nearest_goal(self, pos: Vector, goals: list) -> Goal:
+    def nearest_goal(self, pos: Vector, goals: list):
         i = self.index_of_nearest(pos, [g.position for g in goals])
         return goals[i]
 
-    def nearest_seeker(self, pos: Vector, seekers: list) -> Seeker:
+    def nearest_seeker(self, pos: Vector, seekers: list):
         i = self.index_of_nearest(pos, [s.position for s in seekers])
         return seekers[i]
 
     def random_position(self) -> Vector:
         return Vector(random.uniform(0, self.width),
                       random.uniform(0, self.height))
 
-    def generate_camps(self, players: typing.Collection[Player], config: Config) -> list["Camp"]:
+    def generate_camps(self, players: typing.Collection, config: Config) -> list["Camp"]:
         delta = self.height / len(players)
 
         if config.camp_height > delta: