Skip to content

Commit

Permalink
Merge pull request #352 from MatthewMarinets/mm/broodling_upgrade
Browse files Browse the repository at this point in the history
sc2: Adding zerg broodling packing upgrade
  • Loading branch information
Ziktofel authored Nov 25, 2024
2 parents 0097b67 + d6f6e66 commit a044950
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions worlds/sc2/item/item_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -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.",
Expand All @@ -818,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.",
Expand Down
3 changes: 2 additions & 1 deletion worlds/sc2/item/item_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand All @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion worlds/sc2/item/item_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit a044950

Please sign in to comment.