From 3173a5d378ce9d7db7a694d24ec2ec7d4dda45b1 Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Sun, 29 Sep 2024 18:42:32 +0200 Subject: [PATCH] Add Aegis Guard --- worlds/sc2/item_descriptions.py | 1 + worlds/sc2/item_groups.py | 6 ++++-- worlds/sc2/item_names.py | 1 + worlds/sc2/items.py | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/worlds/sc2/item_descriptions.py b/worlds/sc2/item_descriptions.py index bb048221b1e9..cd618f3057f4 100644 --- a/worlds/sc2/item_descriptions.py +++ b/worlds/sc2/item_descriptions.py @@ -160,6 +160,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: """), item_names.SHOCK_DIVISION: "Royal Guard heavy tank. Long-range artillery in Siege Mode.", item_names.BLACKHAMMER: "Royal Guard heavy assault mech.", + item_names.AEGIS_GUARD: "Royal Guard heavy assault infantry.", item_names.PROGRESSIVE_TERRAN_INFANTRY_WEAPON: GENERIC_UPGRADE_TEMPLATE.format("damage", TERRAN, "infantry"), item_names.PROGRESSIVE_TERRAN_INFANTRY_ARMOR: GENERIC_UPGRADE_TEMPLATE.format("armor", TERRAN, "infantry"), item_names.PROGRESSIVE_TERRAN_VEHICLE_WEAPON: GENERIC_UPGRADE_TEMPLATE.format("damage", TERRAN, "vehicles"), diff --git a/worlds/sc2/item_groups.py b/worlds/sc2/item_groups.py index 7ab5022db25f..37634265089c 100644 --- a/worlds/sc2/item_groups.py +++ b/worlds/sc2/item_groups.py @@ -189,7 +189,7 @@ def get_all_group_names(cls) -> typing.Set[str]: ] item_name_groups[ItemGroupNames.BARRACKS_UNITS] = barracks_units = [ item_names.MARINE, item_names.MEDIC, item_names.FIREBAT, item_names.MARAUDER, - item_names.REAPER, item_names.GHOST, item_names.SPECTRE, item_names.HERC, + item_names.REAPER, item_names.GHOST, item_names.SPECTRE, item_names.HERC, item_names.AEGIS_GUARD, ] item_name_groups[ItemGroupNames.FACTORY_UNITS] = factory_units = [ item_names.HELLION, item_names.VULTURE, item_names.GOLIATH, item_names.DIAMONDBACK, @@ -376,7 +376,9 @@ def get_all_group_names(cls) -> typing.Set[str]: if item_data.type in (items.TerranItemType.Progressive, items.TerranItemType.Progressive_2) ] item_name_groups[ItemGroupNames.MENGSK_UNITS] = [ - item_names.PRIDE_OF_AUGUSTRGRAD, item_names.SKY_FURY, item_names.SHOCK_DIVISION, item_names.BLACKHAMMER, + item_names.AEGIS_GUARD, + item_names.SHOCK_DIVISION, item_names.BLACKHAMMER, + item_names.PRIDE_OF_AUGUSTRGRAD, item_names.SKY_FURY, ] item_name_groups[ItemGroupNames.WOL_ITEMS] = vanilla_wol_items = ( wol_units diff --git a/worlds/sc2/item_names.py b/worlds/sc2/item_names.py index 1f382fb66101..a5a838586e2b 100644 --- a/worlds/sc2/item_names.py +++ b/worlds/sc2/item_names.py @@ -40,6 +40,7 @@ SKY_FURY = "Sky Fury" SHOCK_DIVISION = "Shock Division" BLACKHAMMER = "Blackhammer" +AEGIS_GUARD = "Aegis Guard" # Terran Buildings BUNKER = "Bunker" diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py index 5d98d476cdbc..bda37911aea0 100644 --- a/worlds/sc2/items.py +++ b/worlds/sc2/items.py @@ -226,6 +226,8 @@ def get_full_item_list(): item_names.BLACKHAMMER: ItemData(53 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Unit_2, 1, SC2Race.TERRAN, classification=ItemClassification.progression, origin={"ext"}), + item_names.AEGIS_GUARD: + ItemData(54 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Unit_2, 2, SC2Race.TERRAN), # Some other items are moved to Upgrade group because of the way how the bot message is parsed item_names.PROGRESSIVE_TERRAN_INFANTRY_WEAPON: ItemData(100 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Upgrade, 0, SC2Race.TERRAN, quantity=WEAPON_ARMOR_UPGRADE_MAX_LEVEL),