Merge pull request #364 from MatthewMarinets/mm/pygalisk_description_…

…update sc2: Pygalisk description logic updates
Ziktofel · Dec 6, 2024 · 4907db0 · 4907db0
2 parents cad90fd + 03859da
commit 4907db0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/worlds/sc2/item/item_descriptions.py b/worlds/sc2/item/item_descriptions.py
@@ -595,7 +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.PYGALISK: "Miniature melee attacker.",
     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.",

diff --git a/worlds/sc2/item/item_groups.py b/worlds/sc2/item/item_groups.py
@@ -437,12 +437,13 @@ def get_all_group_names(cls) -> typing.Set[str]:
     item_names.SWARM_HOST, item_names.INFESTOR, item_names.ULTRALISK, item_names.ZERGLING_BANELING_ASPECT,
     item_names.HYDRALISK_LURKER_ASPECT, item_names.HYDRALISK_IMPALER_ASPECT, item_names.ULTRALISK_TYRANNOZOR_ASPECT,
     item_names.ROACH_RAVAGER_ASPECT, item_names.DEFILER, item_names.ROACH_PRIMAL_IGNITER_ASPECT,
+    item_names.PYGALISK,
     item_names.INFESTED_MARINE, item_names.INFESTED_BUNKER, item_names.INFESTED_DIAMONDBACK,
     item_names.INFESTED_SIEGE_TANK,
 ]
 zerg_melee_wa = [
     item_names.ZERGLING, item_names.ABERRATION, item_names.ULTRALISK, item_names.ZERGLING_BANELING_ASPECT,
-    item_names.ULTRALISK_TYRANNOZOR_ASPECT, item_names.INFESTED_BUNKER,
+    item_names.ULTRALISK_TYRANNOZOR_ASPECT, item_names.INFESTED_BUNKER, item_names.PYGALISK,
 ]
 zerg_ranged_wa = [
     item_names.SWARM_QUEEN, item_names.ROACH, item_names.HYDRALISK, item_names.SWARM_HOST,

diff --git a/worlds/sc2/item/item_tables.py b/worlds/sc2/item/item_tables.py
@@ -2053,6 +2053,7 @@ def get_item_table():
         item_names.CYCLONE
     }),
     SC2Race.ZERG: basic_units[SC2Race.ZERG].union({
+        item_names.PYGALISK,
         item_names.INFESTOR,
         item_names.ABERRATION,
     }),

diff --git a/worlds/sc2/rules.py b/worlds/sc2/rules.py
@@ -1090,7 +1090,7 @@ def spread_creep(self, state: CollectionState) -> bool:
 
     def zerg_mineral_dump(self, state: CollectionState) -> bool:
         return (
-                state.has_any({item_names.ZERGLING, item_names.INFESTED_BUNKER}, self.player)
+                state.has_any({item_names.ZERGLING, item_names.PYGALISK, item_names.INFESTED_BUNKER}, self.player)
                 or state.has_all({item_names.SWARM_QUEEN, item_names.SWARM_QUEEN_RESOURCE_EFFICIENCY}, self.player)
                 or (
                         self.advanced_tactics