From b08365fe5e50e660678e0f0b79fb7a411051f2eb Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 24 Nov 2024 23:20:31 -0800 Subject: [PATCH 1/2] sc2: Adding zerg broodling packing upgrade --- worlds/sc2/item/item_descriptions.py | 3 ++- worlds/sc2/item/item_names.py | 3 ++- worlds/sc2/item/item_tables.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/worlds/sc2/item/item_descriptions.py b/worlds/sc2/item/item_descriptions.py index 42e76b2b43ee..aaf85573fb70 100644 --- a/worlds/sc2/item/item_descriptions.py +++ b/worlds/sc2/item/item_descriptions.py @@ -759,6 +759,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.HIVE_CLUSTER_MATURATION: "Lairs are replaced with Hives, and Hatcheries can now upgrade directly to Hives at the Lair's original cost.", item_names.MACROSCOPIC_RECUPERATION: "Zerg structures regenerate health rapidly while on creep and out of combat. Does not apply to uprooted structures, or structures with the Mechanical tag.", item_names.BIOMECHANICAL_STOCKPILING: "Infested Factories and Starports can store 3 additional unit charges.", + item_names.BROODLING_PACKING: "Zerg buildings release twice as many broodlings on death. Zerg defensive structures release 4 broodlings on death.", item_names.ZERGLING_RAPTOR_STRAIN: "Allows Zerglings to jump up and down cliffs and leap onto enemies. Also increases Zergling attack damage by 2.", item_names.ZERGLING_SWARMLING_STRAIN: "Zerglings will spawn instantly and with an extra Zergling per egg at no additional cost.", item_names.ROACH_VILE_STRAIN: "Roach attacks will slow the movement and attack speed of enemies.", @@ -796,7 +797,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.KERRIGAN_SPAWN_LEVIATHAN: "Kerrigan summons a mightly flying Leviathan with timed life. Deals massive damage and has energy-based abilities.", item_names.KERRIGAN_DROP_PODS: "Kerrigan drops Primal Zerg forces with timed life to the battlefield.", item_names.KERRIGAN_PRIMAL_FORM: "Kerrigan takes on her Primal Zerg form and gains greatly increased energy regeneration.", - item_names.KERRIGAN_ASSIMIlATION_AURA: "Causes all nearby enemies to drop resources when killed.", + item_names.KERRIGAN_ASSIMILATION_AURA: "Causes all nearby enemies to drop resources when killed.", item_names.KERRIGAN_IMMOBILIZATION_WAVE: "Deals 100 damage to enemies around a large area and stuns them for 10 seconds.", item_names.KERRIGAN_LEVELS_10: "Gives Kerrigan +10 Levels.", item_names.KERRIGAN_LEVELS_9: "Gives Kerrigan +9 Levels.", diff --git a/worlds/sc2/item/item_names.py b/worlds/sc2/item/item_names.py index dab90b2e1275..6baa9b2dd75e 100644 --- a/worlds/sc2/item/item_names.py +++ b/worlds/sc2/item/item_names.py @@ -585,7 +585,7 @@ KERRIGAN_APOCALYPSE = "Apocalypse (Kerrigan Ability)" KERRIGAN_SPAWN_LEVIATHAN = "Spawn Leviathan (Kerrigan Ability)" KERRIGAN_DROP_PODS = "Drop-Pods (Kerrigan Ability)" -KERRIGAN_ASSIMIlATION_AURA = "Assimilation Aura (Kerrigan Ability)" +KERRIGAN_ASSIMILATION_AURA = "Assimilation Aura (Kerrigan Ability)" KERRIGAN_IMMOBILIZATION_WAVE = "Immobilization Wave (Kerrigan Ability)" KERRIGAN_PRIMAL_FORM = "Primal Form (Kerrigan)" @@ -600,6 +600,7 @@ HIVE_CLUSTER_MATURATION = "Hive Cluster Maturation (Zerg)" MACROSCOPIC_RECUPERATION = "Macroscopic Recuperation (Zerg)" BIOMECHANICAL_STOCKPILING = "Bio-Mechanical Stockpiling (Zerg)" +BROODLING_PACKING = "Broodling Packing (Zerg)" # Kerrigan Levels KERRIGAN_LEVELS_1 = "1 Kerrigan Level" diff --git a/worlds/sc2/item/item_tables.py b/worlds/sc2/item/item_tables.py index debed7662b88..9505a3000f84 100644 --- a/worlds/sc2/item/item_tables.py +++ b/worlds/sc2/item/item_tables.py @@ -1570,7 +1570,7 @@ def get_full_item_list(): item_names.KERRIGAN_DROP_PODS: ItemData(420 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 14, SC2Race.ZERG, classification=ItemClassification.progression), # Handled separately from other abilities item_names.KERRIGAN_PRIMAL_FORM: ItemData(421 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Primal_Form, 0, SC2Race.ZERG), - item_names.KERRIGAN_ASSIMIlATION_AURA: ItemData(422 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 15, SC2Race.ZERG), + item_names.KERRIGAN_ASSIMILATION_AURA: ItemData(422 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 15, SC2Race.ZERG), item_names.KERRIGAN_IMMOBILIZATION_WAVE: ItemData(423 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 16, SC2Race.ZERG), item_names.KERRIGAN_LEVELS_10: ItemData(500 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Level, 10, SC2Race.ZERG, quantity=0, classification=ItemClassification.progression), @@ -1608,6 +1608,7 @@ def get_full_item_list(): item_names.HIVE_CLUSTER_MATURATION: ItemData(706 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 12, SC2Race.ZERG), item_names.MACROSCOPIC_RECUPERATION: ItemData(707 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 13, SC2Race.ZERG), item_names.BIOMECHANICAL_STOCKPILING: ItemData(708 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 14, SC2Race.ZERG), + item_names.BROODLING_PACKING: ItemData(709 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Evolution_Pit, 15, SC2Race.ZERG), # Morphs item_names.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT: ItemData(800 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Morph, 6, SC2Race.ZERG, classification=ItemClassification.progression), From d6f6e66aca824ba4c0ed2b52e5a06067c2ffaa5e Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 24 Nov 2024 23:31:32 -0800 Subject: [PATCH 2/2] sc2: Updating yggdrasil description to include mention of unit transportation --- worlds/sc2/item/item_descriptions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/sc2/item/item_descriptions.py b/worlds/sc2/item/item_descriptions.py index aaf85573fb70..bbb62d1027eb 100644 --- a/worlds/sc2/item/item_descriptions.py +++ b/worlds/sc2/item/item_descriptions.py @@ -819,7 +819,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description: item_names.DEVOURING_ONES: "Mercenary Zerglings.", item_names.TORRASQUE_MERC: "Torrasque Mercenary.", item_names.HUNTERLING: "Hunterling Mercenary.", - item_names.YGGDRASIL: "Mercenary Overlord that has the ability to transport buildings.", + item_names.YGGDRASIL: "Mercenary Overlord that has the ability to transport buildings and ground units.", item_names.OVERLORD_VENTRAL_SACS: "Overlords gain the ability to transport ground units.", item_names.OVERLORD_GENERATE_CREEP: "Overlords gain the ability to generate creep while standing still.", item_names.OVERLORD_ANTENNAE: "Increases Overlord sight range.",