[SamOgon-one]

Summary

Fixes an issue where Terran Armories fail to start researching Vehicle and Ship Plating (Levels 1–3) when using unit.research(...).

Problem & Root Cause

In Blizzard's SC2 protobuf game data, the ability_id mapped to Terran mech armor upgrades points to the Heart of the Swarm campaign variant (ARMORYRESEARCHSWARM_... with SWARM in the middle) instead of the standard multiplayer Armory ability:

Upgrade ID	Protobuf Ability ID (Incorrect)
UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL1	AbilityId.ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPPLATINGLEVEL1
UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL2	AbilityId.ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPPLATINGLEVEL2
UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL3	AbilityId.ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPPLATINGLEVEL3

Because multiplayer Armories do not have access to the SWARM ability IDs, issuing research orders with them fails silently or gets rejected by the game engine.

Solution

Added an explicit override mapping that resolves these upgrades to their valid multiplayer ability equivalents:

• TERRANVEHICLEANDSHIPARMORSLEVEL1 ➔ ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL1
• TERRANVEHICLEANDSHIPARMORSLEVEL2 ➔ ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL2
• TERRANVEHICLEANDSHIPARMORSLEVEL3 ➔ ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL3

[chadspratt]

could be less code-repetitive with something like

        creationAbilityID = self.bot.game_data.upgrades[upgrade_type.value].research_ability.exact_id
        if upgrade_type == UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL1:
            creationAbilityID = AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL1
        elif upgrade_type == UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL2:
            creationAbilityID = AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL2
        elif upgrade_type == UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL3:
            creationAbilityID = AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL3

[maxnus]

Thanks for proposing a fix upstream!

I think a dictionary may be more extendable than if-then-else blocks - perhaps something like

ability_id_overrides = {
   UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL1: AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL1,
   UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL2: AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL2,
   UpgradeId.TERRANVEHICLEANDSHIPARMORSLEVEL3: AbilityId.ARMORYRESEARCH_TERRANVEHICLEANDSHIPPLATINGLEVEL3,
}
ability_id = ability_id_override.get(upgrade, self._bot_object.game_data.upgrades[upgrade.value].research_ability.exact_id)
self(ability_id, ...)

?

[SamOgon-one]

A mapping dictionary would be much cleaner.

Moving this override into game_data.py so that game_data.upgrades[upgrade].research_ability is also corrected throughout the library