Merge pull request #216 from dysonreturns/observer-fixes

Returns ObserverAI to working order

Author: BurnySc2

examples/watch_replay.py

@@ -40,4 +40,4 @@ async def on_step(self, iteration: int):
     assert (
         replay_path.is_file()
     ), "Run worker_rush.py in the same folder first to generate a replay. Then run watch_replay.py again."
-    run_replay(my_observer_ai, replay_path=replay_path)
+    run_replay(my_observer_ai, replay_path=str(replay_path))

sc2/bot_ai_internal.py

@@ -476,9 +476,10 @@ def _prepare_start(
         self.realtime: bool = realtime
         self.base_build: int = base_build
 
-        self.race: Race = Race(self.game_info.player_races[self.player_id])
-
-        if len(self.game_info.player_races) == 2:
+        # Get the player's race. As observer, get Race.NoRace=0
+        self.race: Race = Race(self.game_info.player_races.get(self.player_id, 0))
+        # Get the enemy's race only if we are not observer (replay) and the game has 2 players
+        if self.player_id > 0 and len(self.game_info.player_races) == 2:
             self.enemy_race: Race = Race(self.game_info.player_races[3 - self.player_id])
 
         self._distances_override_functions(self.distance_calculation_method)

sc2/game_info.py

@@ -10,7 +10,7 @@
 import numpy as np
 
 from sc2.pixel_map import PixelMap
-from sc2.player import Player, Race
+from sc2.player import Player
 from sc2.position import Point2, Rect, Size
 
 
@@ -237,7 +237,7 @@ def __init__(self, proto) -> None:
         self.map_ramps: list[Ramp] = None  # Filled later by BotAI._prepare_first_step
         # pyre-ignore[8]
         self.vision_blockers: frozenset[Point2] = None  # Filled later by BotAI._prepare_first_step
-        self.player_races: dict[int, Race] = {
+        self.player_races: dict[int, int] = {
             p.player_id: p.race_actual or p.race_requested for p in self._proto.player_info
         }
         self.start_locations: list[Point2] = [

sc2/observer_ai.py

@@ -6,21 +6,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from sc2.bot_ai_internal import BotAIInternal
 from sc2.data import Alert, Result
-from sc2.game_data import GameData
 from sc2.ids.ability_id import AbilityId
 from sc2.ids.upgrade_id import UpgradeId
 from sc2.position import Point2
 from sc2.unit import Unit
 from sc2.units import Units
 
-if TYPE_CHECKING:
-    from sc2.client import Client
-    from sc2.game_info import GameInfo
-
 
 class ObserverAI(BotAIInternal):
     """Base class for bots."""
@@ -36,21 +29,6 @@ def time_formatted(self) -> str:
         t = self.time
         return f"{int(t // 60):02}:{int(t % 60):02}"
 
-    @property
-    def game_info(self) -> GameInfo:
-        """See game_info.py"""
-        return self._game_info
-
-    @property
-    def game_data(self) -> GameData:
-        """See game_data.py"""
-        return self._game_data
-
-    @property
-    def client(self) -> Client:
-        """See client.py"""
-        return self._client
-
     def alert(self, alert_code: Alert) -> bool:
         """
         Check if alert is triggered in the current step.