WIP

Author: Debilski

pelita/game.py

@@ -355,7 +355,7 @@ def setup_game(team_specs, *, layout_dict: Layout, max_rounds=300, rng=None,
         'food': food,
 
         #: Food ages per team. Dict of (int, int) to int
-        'food_age': ({}, {}),
+        'food_age': [{}, {}],
 
         ### Round/turn information
         #: Phase
@@ -381,10 +381,10 @@ def setup_game(team_specs, *, layout_dict: Layout, max_rounds=300, rng=None,
         'score': [0, 0],
 
         #: Fatal errors
-        'fatal_errors': ([], []),
+        'fatal_errors': [[], []],
 
         #: Number of timeouts for a team
-        'timeouts': ({}, {}),
+        'timeouts': [{}, {}],
 
         ### Configuration
         #: Maximum number of rounds, int
@@ -411,10 +411,10 @@ def setup_game(team_specs, *, layout_dict: Layout, max_rounds=300, rng=None,
         ### Informative
 
         #: Name of the teams. Tuple of str
-        'team_names': team_names,
+        'team_names': list(team_names),
 
         #: Additional team info. Tuple of str|None
-        'team_infos': team_infos,
+        'team_infos': list(team_infos),
 
         #: Time each team needed, list of float
         'team_time': [0.0, 0.0],

pelita/spec.py

@@ -17,26 +17,26 @@ class Layout(TypedDict):
 class GameState(TypedDict):
     walls: set[Pos]
     shape: Shape
-    food: tuple[set[Pos], set[Pos]]
-    food_age: tuple[FoodAges, FoodAges]
+    food: list[set[Pos]]
+    food_age: list[FoodAges]
     game_phase: Literal["INIT", "RUNNING", "FAILURE", "FINISHED"]
     turn: None|int
     round: None|int
     gameover: bool
     whowins: None|int
     bots: list[Pos]
     score: list[int]
-    fatal_errors: tuple[list[Any], list[Any]]
-    timeouts: tuple[Any, Any]
+    timeouts: list[Any]
+    fatal_errors: list[list[Any]]
     max_rounds: int
     timeout_length: int
     initial_timeout: int
     noise_radius: int
     sight_distance: int
     max_food_age: float|int
     shadow_distance: int
-    team_names: tuple[None|str, None|str]
-    team_infos: tuple[None|str, None|str]
+    team_names: list[None|str]
+    team_infos: list[None|str]
     team_time: list[float]
     deaths: list[int]
     kills: list[int]

test/test_game.py

@@ -1010,7 +1010,6 @@ def move(b, s):
 def test_non_existing_file():
     l = maze_generator.generate_maze()
     res = run_game(["blah", "nothing"], max_rounds=1, layout_dict=l)
-    print(res['fatal_errors'])
 
     # We might only catch only one of the errors
     assert len(res['fatal_errors'][0]) > 0 or len(res['fatal_errors'][1]) > 0