Skip to content

Fix Terran mech armor research ID issues #232

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

Merged
BurnySc2 merged 6 commits into from
Nov 5, 2026
Merged

Fix Terran mech armor research ID issues #232

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40f8987
Fix Terran mech armor research ID issues
SamOgon-one Dec 20, 2025
05b7ab1
Fix hardcoded upgrade IDs for Terran armor research
SamOgon-one Dec 20, 2025
1693ece
Update unit.py
SamOgon-one Nov 5, 2026
b9c4a4c
Implement upgrade research ability ID overrides
SamOgon-one Nov 5, 2026
aa61317
Refactor research_ability to return AbilityData or None
SamOgon-one Nov 5, 2026
806121c
Add workaround for incorrect ability IDs in game data
SamOgon-one Nov 5, 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
17 changes: 17 additions & 0 deletions sc2/game_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from sc2.data import Attribute, Race
from sc2.ids.ability_id import AbilityId
from sc2.ids.upgrade_id import UpgradeId
from sc2.ids.unit_typeid import UnitTypeId
from sc2.unit_command import UnitCommand

Expand Down Expand Up @@ -279,6 +280,14 @@ def morph_cost(self) -> Cost | None:
)


# Workaround for Blizzard protobuf returning wrong ability IDs (ARMORYRESEARCHSWARM_...)
UPGRADE_RESEARCH_OVERRIDES: dict[UpgradeId, AbilityId] = {
UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL1: AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL1,
UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL2: AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL2,
UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL3: AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL3,
}


class UpgradeData:
def __init__(self, game_data: GameData, proto) -> None:
"""
Expand All @@ -295,8 +304,16 @@ def __repr__(self) -> str:
def name(self) -> str:
return self._proto.name

@property
def id(self) -> UpgradeId:
return UpgradeId(self._proto.upgrade_id)

@property
def research_ability(self) -> AbilityData | None:
# Check if the upgrade has a known protobuf ability ID bug
if self.id in UPGRADE_RESEARCH_OVERRIDES:
ability_id = UPGRADE_RESEARCH_OVERRIDES[self.id].value
return self._game_data.abilities.get(ability_id)
if self._proto.ability_id == 0:
return None
if self._proto.ability_id not in self._game_data.abilities:
Expand Down
Loading