Skip to content

Commit e90d229

Browse files
committed
Remove duplicate and improve error messages
1 parent e569193 commit e90d229

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

sc2/bot_ai.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ def calculate_cost(self, item_id: UnitTypeId | UpgradeId | AbilityId) -> Cost:
494494
# Cost of morphs is automatically correctly calculated by 'calculate_ability_cost'
495495
creation_ability = unit_data.creation_ability
496496
if creation_ability is None:
497-
logger.error(f"Unknown item_id for calculate_cost: {item_id}")
497+
logger.error(f"Unknown creation_ability in calculate_cost for item_id: {item_id}")
498498
return Cost(0, 0)
499499
return self.game_data.calculate_ability_cost(creation_ability.exact_id)
500500

@@ -633,7 +633,7 @@ async def can_place_single(self, building: AbilityId | UnitTypeId, position: Poi
633633
if isinstance(building, UnitTypeId):
634634
creation_ability = self.game_data.units[building.value].creation_ability
635635
if creation_ability is None:
636-
logger.error(f"Unknown building for can_place_single: {building}")
636+
logger.error(f"Unknown creation_ability in can_place_single for building: {building}")
637637
return False
638638
creation_ability_id = creation_ability.id
639639
return (await self.client._query_building_placement_fast(creation_ability_id, [position]))[0]
@@ -896,11 +896,7 @@ def already_pending(self, unit_type: UpgradeId | UnitTypeId) -> float:
896896

897897
creation_ability = self.game_data.units[unit_type.value].creation_ability
898898
if creation_ability is None:
899-
return 0
900-
901-
creation_ability = self.game_data.units[unit_type.value].creation_ability
902-
if creation_ability is None:
903-
logger.error(f"Unknown unit_type for already_pending: {unit_type}")
899+
logger.error(f"Unknown creation_ability in already_pending for unit_type: {unit_type}")
904900
return 0
905901
ability_id = creation_ability.exact_id
906902
return self._abilities_count_and_build_progress[0][ability_id]
@@ -911,7 +907,7 @@ def worker_en_route_to_build(self, unit_type: UnitTypeId) -> float:
911907
:param unit_type:"""
912908
creation_ability = self.game_data.units[unit_type.value].creation_ability
913909
if creation_ability is None:
914-
logger.error(f"Unknown unit_type for worker_en_route_to_build: {unit_type}")
910+
logger.error(f"Unknown creation_ability in worker_en_route_to_build for unit_type: {unit_type}")
915911
return 0
916912
ability = creation_ability.exact_id
917913
return self._worker_orders[ability]

0 commit comments

Comments
 (0)