Merge branch 'mm/pygalisk' into sc2-next

EnvyDragon · Nov 28, 2024 · 7ddc538 · 7ddc538
2 parents 6c08050 + f072a96
commit 7ddc538
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/worlds/sc2/item/item_descriptions.py b/worlds/sc2/item/item_descriptions.py
@@ -595,6 +595,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
     item_names.SWARM_HOST: "Siege unit that attacks by rooting in place and continually spawning Locusts.",
     item_names.INFESTOR: "Support caster that can move while burrowed. Can use the Fungal Growth, Parasitic Domination, and Consumption abilities.",
     item_names.ULTRALISK: "Massive melee attacker. Has an area-damage cleave attack.",
+    item_names.PYGALISK: "Miniature melee attacker. Summoned from the predator nest in large quantities and low cooldown.",
     item_names.SPORE_CRAWLER: "Anti-air defensive structure that can detect cloaked units.",
     item_names.SPINE_CRAWLER: "Anti-ground defensive structure.",
     item_names.CORRUPTOR: "Anti-air flying attacker specializing in taking down enemy capital ships.",
@@ -639,6 +640,9 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
     item_names.ULTRALISK_BURROW_CHARGE: "Allows Ultralisks to burrow and charge at enemy units, knocking back and stunning units when it emerges.",
     item_names.ULTRALISK_TISSUE_ASSIMILATION: "Ultralisks recover health when they deal damage.",
     item_names.ULTRALISK_MONARCH_BLADES: "Ultralisks gain increased splash damage.",
+    item_names.PYGALISK_STIM: _ability_desc("Pygalisks", "Stimpack", f"temporarily increases movement and attack speed at the cost of {STIMPACK_SMALL_COST} health"),
+    item_names.PYGALISK_DUCAL_BLADES: "Pygalisks do splash damage.",
+    item_names.PYGALISK_COMBAT_CARAPACE: "Increases Pygalisk health by +25.",
     item_names.CORRUPTOR_CAUSTIC_SPRAY: "Allows Corruptors to use the Caustic Spray ability, which deals ramping damage to buildings over time.",
     item_names.CORRUPTOR_CORRUPTION: "Allows Corruptors to use the Corruption ability, which causes a target enemy unit to take increased damage.",
     item_names.SCOURGE_VIRULENT_SPORES: "Scourge will deal splash damage.",

diff --git a/worlds/sc2/item/item_names.py b/worlds/sc2/item/item_names.py
@@ -363,6 +363,7 @@
 SWARM_HOST           = "Swarm Host"
 INFESTOR             = "Infestor"
 ULTRALISK            = "Ultralisk"
+PYGALISK             = "Pygalisk"
 CORRUPTOR            = "Corruptor"
 SCOURGE              = "Scourge"
 BROOD_QUEEN          = "Brood Queen"
@@ -436,6 +437,9 @@
 ULTRALISK_CHITINOUS_PLATING                       = "Chitinous Plating (Ultralisk)"
 ULTRALISK_ORGANIC_CARAPACE                        = "Organic Carapace (Ultralisk)"
 ULTRALISK_RESOURCE_EFFICIENCY                     = "Resource Efficiency (Ultralisk)"
+PYGALISK_STIM                                     = "Stimpack (Pygalisk)"
+PYGALISK_DUCAL_BLADES                             = "Ducal Blades (Pygalisk)"
+PYGALISK_COMBAT_CARAPACE                          = "Combat Carapace (Pygalisk)"
 CORRUPTOR_CORRUPTION                              = "Corruption (Corruptor)"
 CORRUPTOR_CAUSTIC_SPRAY                           = "Caustic Spray (Corruptor)"
 SCOURGE_VIRULENT_SPORES                           = "Virulent Spores (Scourge)"

diff --git a/worlds/sc2/item/item_tables.py b/worlds/sc2/item/item_tables.py
@@ -1200,6 +1200,9 @@ def get_full_item_list():
     item_names.INFESTED_MISSILE_TURRET:
         ItemData(24 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Unit, 23, SC2Race.ZERG,
                  classification=ItemClassification.progression),
+    item_names.PYGALISK:
+        ItemData(25 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Unit, 24, SC2Race.ZERG,
+                 classification=ItemClassification.progression),
 
     item_names.PROGRESSIVE_ZERG_MELEE_ATTACK: ItemData(100 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Upgrade, 0, SC2Race.ZERG, classification=ItemClassification.progression, quantity=WEAPON_ARMOR_UPGRADE_MAX_LEVEL),
     item_names.PROGRESSIVE_ZERG_MISSILE_ATTACK: ItemData(101 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Upgrade, 4, SC2Race.ZERG, classification=ItemClassification.progression, quantity=WEAPON_ARMOR_UPGRADE_MAX_LEVEL),
@@ -1551,7 +1554,13 @@ def get_full_item_list():
                  classification=ItemClassification.progression),
     item_names.ABERRATION_PROGRESSIVE_BANELING_LAUNCH:
         ItemData(381 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Progressive, 4, SC2Race.ZERG, parent_item=item_names.ABERRATION, quantity=2),
-
+    item_names.PYGALISK_STIM:
+        ItemData(382 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_5, 9, SC2Race.ZERG, parent_item=item_names.PYGALISK),
+    item_names.PYGALISK_DUCAL_BLADES:
+        ItemData(383 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_5, 10, SC2Race.ZERG, parent_item=item_names.PYGALISK),
+    item_names.PYGALISK_COMBAT_CARAPACE:
+        ItemData(384 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_5, 11, SC2Race.ZERG, parent_item=item_names.PYGALISK),
+
     item_names.KERRIGAN_KINETIC_BLAST: ItemData(400 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 0, SC2Race.ZERG, classification=ItemClassification.progression),
     item_names.KERRIGAN_HEROIC_FORTITUDE: ItemData(401 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 1, SC2Race.ZERG, classification=ItemClassification.progression),
     item_names.KERRIGAN_LEAPING_STRIKE: ItemData(402 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Ability, 2, SC2Race.ZERG, classification=ItemClassification.progression),