From 6fdc7d9f289c4269e71961052e11b59798a437d0 Mon Sep 17 00:00:00 2001 From: SirChuckOfTheChuckles Date: Sun, 17 Nov 2024 21:31:41 -0500 Subject: [PATCH] Omega To Echidna --- worlds/sc2/item/item_descriptions.py | 12 ++++++------ worlds/sc2/item/item_groups.py | 2 +- worlds/sc2/item/item_names.py | 10 +++++----- worlds/sc2/item/item_tables.py | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/worlds/sc2/item/item_descriptions.py b/worlds/sc2/item/item_descriptions.py index 4e8220fdd510..adb8103fcba5 100644 --- a/worlds/sc2/item/item_descriptions.py +++ b/worlds/sc2/item/item_descriptions.py @@ -30,7 +30,7 @@ DISPLAY_NAME_BROOD_LORD = "Brood Lord" DISPLAY_NAME_CLOAKED_ASSASSIN = "Dark Templar, Avenger, and Blood Hunter" -DISPLAY_NAME_WORMS = "Nydus Worm and Omega Worm" +DISPLAY_NAME_WORMS = "Nydus Worm and Echidna Worm" GENERIC_KEY_DESC = "Unlocks a part of the mission order." @@ -725,11 +725,11 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.TYRANNOZOR_BARRAGE_OF_SPIKES: "Unleash a Barrage of Spikes, dealing 100 damage to enemy ground and air units around the Tyrannozor.", item_names.TYRANNOZOR_IMPALING_STRIKE: "Ultralisk and Tyrannozor melee attacks have a 20% chance to stun for 2 seconds.", item_names.TYRANNOZOR_HEALING_ADAPTATION: "Ultralisks and Tyrannozors regenerate life quickly when out of combat.", - item_names.NYDUS_WORM_OMEGA_WORM_SUBTERRANEAN_SCALES: f"Increases {DISPLAY_NAME_WORMS} maximum health by 250 and armor by 1.", - item_names.NYDUS_WORM_OMEGA_WORM_JORMUNGANDR_STRAIN: f"Removes emerge time for {DISPLAY_NAME_WORMS}, and allows them to be salvaged, returning the cost spent on them.", + item_names.NYDUS_WORM_ECHIDNA_WORM_SUBTERRANEAN_SCALES: f"Increases {DISPLAY_NAME_WORMS} maximum health by 250 and armor by 1.", + item_names.NYDUS_WORM_ECHIDNA_WORM_JORMUNGANDR_STRAIN: f"Removes emerge time for {DISPLAY_NAME_WORMS}, and allows them to be salvaged, returning the cost spent on them.", item_names.NYDUS_WORM_RAVENOUS_APPETITE: "Allows Nydus Worms to unload and load units nearly instantly.", - item_names.NYDUS_WORM_OMEGA_WORM_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(DISPLAY_NAME_WORMS), - item_names.OMEGA_WORM_OUROBOROS_STRAIN: "Allows Omega Worms to train a limited assortment of combat units (Zerglings, Roachs, Hydralisks, and Aberrations) at a reduced time and cost.", + item_names.NYDUS_WORM_ECHIDNA_WORM_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(DISPLAY_NAME_WORMS), + item_names.ECHIDNA_WORM_OUROBOROS_STRAIN: "Allows Echidna Worms to train a limited assortment of combat units (Zerglings, Roachs, Hydralisks, and Aberrations) at a reduced time and cost.", item_names.INFESTED_SIEGE_TANK_PROGRESSIVE_AUTOMATED_MITOSIS: inspect.cleandoc(""" Level 1: Infested Siege Tanks generate 1 Volatile Biomass every 30 seconds. Level 2: Infested Siege Tanks generate 1 Volatile Biomass every 10 seconds. @@ -828,7 +828,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.ROACH_RAVAGER_ASPECT: "Ranged artillery. Can use Corrosive Bile. Can attack ground units. Morphed from the Roach.", item_names.ROACH_PRIMAL_IGNITER_ASPECT: "Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed. Can attack ground units. Morphed by merging two Roaches.", item_names.NYDUS_WORM: "Long-range transport network. Nydus Worms and Nydus Networks can load friendly ground units to be unloaded to any other Nydus structure on the map.", - item_names.OMEGA_WORM: "Long-range deployable base. Unable to load and unload units, but can generate Creep and Creep Tumors. Can also serve as a dropoff point for resources and can create Drones.", + item_names.ECHIDNA_WORM: "Long-range deployable base. Unable to load and unload units, but can generate Creep and Creep Tumors. Can also serve as a dropoff point for resources and can create Drones.", item_names.ULTRALISK_TYRANNOZOR_ASPECT: "Heavy assault beast. Has a ground-area attack, and powerful anti-air attack. Morphed by merging two Ultralisks.", item_names.OBSERVER: "Flying spy. Cloak renders the unit invisible to enemies without detection.", item_names.CENTURION: "Powerful melee warrior. Has the Shadow Charge and Darkcoil abilities.", diff --git a/worlds/sc2/item/item_groups.py b/worlds/sc2/item/item_groups.py index 2adf9b87db7c..1e87b58f4e52 100644 --- a/worlds/sc2/item/item_groups.py +++ b/worlds/sc2/item/item_groups.py @@ -423,7 +423,7 @@ def get_all_group_names(cls) -> typing.Set[str]: item_names.SPORE_CRAWLER, item_names.INFESTED_BUNKER, item_names.NYDUS_WORM, - item_names.OMEGA_WORM] + item_names.ECHIDNA_WORM] item_name_groups[ItemGroupNames.ZERG_UNITS] = zerg_units = [ item_name for item_name, item_data in item_tables.item_table.items() if item_data.type in ( diff --git a/worlds/sc2/item/item_names.py b/worlds/sc2/item/item_names.py index 82a29db35218..3cd8b48a7c1f 100644 --- a/worlds/sc2/item/item_names.py +++ b/worlds/sc2/item/item_names.py @@ -379,7 +379,7 @@ INFESTED_BUNKER = "Infested Bunker" INFESTED_MISSILE_TURRET = "Infested Missile Turret" NYDUS_WORM = "Nydus Worm" -OMEGA_WORM = "Omega Worm" +ECHIDNA_WORM = "Echidna Worm" # Zerg Weapon / Armor Upgrades ZERG_UPGRADE_PREFIX = "Progressive Zerg" @@ -507,11 +507,11 @@ TYRANNOZOR_TYRANTS_PROTECTION = "Tyrant's Protection (Tyrannozor)" TYRANNOZOR_HEALING_ADAPTATION = "Healing Adaptation (Ultralisk/Tyrannozor)" TYRANNOZOR_IMPALING_STRIKE = "Impaling Strike (Ultralisk/Tyrannozor)" -NYDUS_WORM_OMEGA_WORM_SUBTERRANEAN_SCALES = "Subterranean Scales (Nydus Worm/Omega Worm)" -NYDUS_WORM_OMEGA_WORM_JORMUNGANDR_STRAIN = "Jormungandr Strain (Nydus Worm/Omega Worm)" -NYDUS_WORM_OMEGA_WORM_RESOURCE_EFFICIENCY = "Resource Efficiency (Nydus Worm/Omega Worm)" +NYDUS_WORM_ECHIDNA_WORM_SUBTERRANEAN_SCALES = "Subterranean Scales (Nydus Worm/Echidna Worm)" +NYDUS_WORM_ECHIDNA_WORM_JORMUNGANDR_STRAIN = "Jormungandr Strain (Nydus Worm/Echidna Worm)" +NYDUS_WORM_ECHIDNA_WORM_RESOURCE_EFFICIENCY = "Resource Efficiency (Nydus Worm/Echidna Worm)" NYDUS_WORM_RAVENOUS_APPETITE = "Ravenous Appetite (Nydus Worm)" -OMEGA_WORM_OUROBOROS_STRAIN = "Ouroboros Strain (Omega Worm)" +ECHIDNA_WORM_OUROBOROS_STRAIN = "Ouroboros Strain (Echidna Worm)" INFESTED_SIEGE_TANK_PROGRESSIVE_AUTOMATED_MITOSIS = "Progressive Automated Mitosis (Infested Siege Tank)" INFESTED_SIEGE_TANK_ACIDIC_ENZYMES = "Acidic Enzymes (Infested Siege Tank)" INFESTED_SIEGE_TANK_DEEP_TUNNEL = "Deep Tunnel (Infested Siege Tank)" diff --git a/worlds/sc2/item/item_tables.py b/worlds/sc2/item/item_tables.py index 69e3dbdcf11c..7628a98c4662 100644 --- a/worlds/sc2/item/item_tables.py +++ b/worlds/sc2/item/item_tables.py @@ -1177,7 +1177,7 @@ def get_full_item_list(): item_names.NYDUS_WORM: ItemData(18 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Unit, 17, SC2Race.ZERG, classification=ItemClassification.progression), - item_names.OMEGA_WORM: + item_names.ECHIDNA_WORM: ItemData(19 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Unit, 18, SC2Race.ZERG, classification=ItemClassification.useful), item_names.INFESTED_SIEGE_TANK: @@ -1485,14 +1485,14 @@ def get_full_item_list(): ItemData(352 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 10, SC2Race.ZERG, parent_item=item_names.ULTRALISK_TYRANNOZOR_ASPECT), item_names.TYRANNOZOR_HEALING_ADAPTATION: ItemData(353 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 11, SC2Race.ZERG, parent_item=item_names.ULTRALISK_TYRANNOZOR_ASPECT), - item_names.NYDUS_WORM_OMEGA_WORM_SUBTERRANEAN_SCALES: + item_names.NYDUS_WORM_ECHIDNA_WORM_SUBTERRANEAN_SCALES: ItemData(354 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 12, SC2Race.ZERG, classification=ItemClassification.filler), - item_names.NYDUS_WORM_OMEGA_WORM_JORMUNGANDR_STRAIN: + item_names.NYDUS_WORM_ECHIDNA_WORM_JORMUNGANDR_STRAIN: ItemData(355 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 13, SC2Race.ZERG, classification=ItemClassification.useful), - item_names.NYDUS_WORM_OMEGA_WORM_RESOURCE_EFFICIENCY: + item_names.NYDUS_WORM_ECHIDNA_WORM_RESOURCE_EFFICIENCY: ItemData(356 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 14, SC2Race.ZERG, classification=ItemClassification.useful), - item_names.OMEGA_WORM_OUROBOROS_STRAIN: - ItemData(357 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 15, SC2Race.ZERG, parent_item=item_names.OMEGA_WORM, classification=ItemClassification.useful), + item_names.ECHIDNA_WORM_OUROBOROS_STRAIN: + ItemData(357 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 15, SC2Race.ZERG, parent_item=item_names.ECHIDNA_WORM, classification=ItemClassification.useful), item_names.NYDUS_WORM_RAVENOUS_APPETITE: ItemData(358 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_4, 16, SC2Race.ZERG, parent_item=item_names.NYDUS_WORM, classification=ItemClassification.useful), item_names.INFESTED_SIEGE_TANK_PROGRESSIVE_AUTOMATED_MITOSIS: