Skip to content

refactor: optimize is_detector by using raw int set #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SamOgon-one wants to merge 2 commits into from
Closed

refactor: optimize is_detector by using raw int set #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89f1d41
refactor: optimize is_detector by using raw int set
SamOgon-one Nov 6, 2026
d984f44
Refactor DETECTOR_TYPE_IDS assignment
SamOgon-one Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sc2/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@
UnitTypeId.OVERSEERSIEGEMODE,
UnitTypeId.SPORECRAWLER,
}
DETECTOR_TYPE_IDS: frozenset[int] = frozenset(u.value for u in list(IS_DETECTOR))
PHOTONCANNON_TYPE_ID: int = UnitTypeId.PHOTONCANNON.value
SPEED_UPGRADE_DICT: dict[UnitTypeId, UpgradeId] = {
# Terran
UnitTypeId.MEDIVAC: UpgradeId.MEDIVACRAPIDDEPLOYMENT,
Expand Down
13 changes: 9 additions & 4 deletions sc2/unit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from sc2.constants import (
CAN_BE_ATTACKED,
DAMAGE_BONUS_PER_UPGRADE,
DETECTOR_TYPE_IDS,
IS_ARMORED,
IS_ATTACKING,
IS_BIOLOGICAL,
Expand All @@ -20,7 +21,6 @@
IS_CLOAKED,
IS_COLLECTING,
IS_CONSTRUCTING_SCV,
IS_DETECTOR,
IS_ENEMY,
IS_GATHERING,
IS_LIGHT,
Expand All @@ -37,6 +37,7 @@
IS_VISIBLE,
OFF_CREEP_SPEED_INCREASE_DICT,
OFF_CREEP_SPEED_UPGRADE_DICT,
PHOTONCANNON_TYPE_ID,
SPEED_ALTERING_BUFFS,
SPEED_INCREASE_DICT,
SPEED_INCREASE_ON_CREEP_DICT,
Expand All @@ -48,7 +49,6 @@
UNIT_BATTLECRUISER,
UNIT_COLOSSUS,
UNIT_ORACLE,
UNIT_PHOTONCANNON,
transforming,
)
from sc2.data import Attribute, CloakState, Race, Target, race_gas, warpgate_abilities
Expand Down Expand Up @@ -921,11 +921,16 @@ def detect_range(self) -> float:
"""Returns the detection distance of the unit."""
return self._proto.detect_range

@cached_property
@property
def is_detector(self) -> bool:
"""Checks if the unit is a detector. Has to be completed
in order to detect and Photoncannons also need to be powered."""
return self.is_ready and (self.type_id in IS_DETECTOR or self.type_id == UNIT_PHOTONCANNON and self.is_powered)
unit_type = self._proto.unit_type
if unit_type in DETECTOR_TYPE_IDS:
return self.is_ready
if unit_type == PHOTONCANNON_TYPE_ID:
return self.is_ready and self.is_powered
return False

@property
def radar_range(self) -> float:
Expand Down
Loading