Skip to content

Commit 7edff5a

Browse files
author
dysonreturns
committed
Repairs ObserverAI by removing deprecated field usage and assigning random Race for player_id 0(zero)
1 parent a640683 commit 7edff5a

2 files changed

Lines changed: 9 additions & 25 deletions

File tree

sc2/bot_ai_internal.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,10 +476,16 @@ def _prepare_start(
476476
self.realtime: bool = realtime
477477
self.base_build: int = base_build
478478

479-
self.race: Race = Race(self.game_info.player_races[self.player_id])
479+
if self.player_id > 0:
480+
self.race: Race = Race(self.game_info.player_races[self.player_id])
480481

481-
if len(self.game_info.player_races) == 2:
482-
self.enemy_race: Race = Race(self.game_info.player_races[3 - self.player_id])
482+
if len(self.game_info.player_races) == 2:
483+
self.enemy_race: Race = Race(self.game_info.player_races[3 - self.player_id])
484+
else:
485+
# Observer
486+
self.race: Race = Race.Random
487+
488+
self._distances_override_functions(self.distance_calculation_method)
483489

484490
self._distances_override_functions(self.distance_calculation_method)
485491

sc2/observer_ai.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,14 @@
66

77
from __future__ import annotations
88

9-
from typing import TYPE_CHECKING
10-
119
from sc2.bot_ai_internal import BotAIInternal
1210
from sc2.data import Alert, Result
13-
from sc2.game_data import GameData
1411
from sc2.ids.ability_id import AbilityId
1512
from sc2.ids.upgrade_id import UpgradeId
1613
from sc2.position import Point2
1714
from sc2.unit import Unit
1815
from sc2.units import Units
1916

20-
if TYPE_CHECKING:
21-
from sc2.client import Client
22-
from sc2.game_info import GameInfo
23-
2417

2518
class ObserverAI(BotAIInternal):
2619
"""Base class for bots."""
@@ -36,21 +29,6 @@ def time_formatted(self) -> str:
3629
t = self.time
3730
return f"{int(t // 60):02}:{int(t % 60):02}"
3831

39-
@property
40-
def game_info(self) -> GameInfo:
41-
"""See game_info.py"""
42-
return self._game_info
43-
44-
@property
45-
def game_data(self) -> GameData:
46-
"""See game_data.py"""
47-
return self._game_data
48-
49-
@property
50-
def client(self) -> Client:
51-
"""See client.py"""
52-
return self._client
53-
5432
def alert(self, alert_code: Alert) -> bool:
5533
"""
5634
Check if alert is triggered in the current step.

0 commit comments

Comments
 (0)