Merge branch 'sc2-next' into dadig

EnvyDragon · Nov 29, 2024 · 71578a5 · 71578a5
2 parents 50ec35d + 1d2a23b
commit 71578a5
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 4 deletions.
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.",
@@ -707,6 +711,10 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
     item_names.ABERRATION_PROTECTIVE_COVER: "Aberrations grant damage reduction to allied units directly beneath them.",
     item_names.ABERRATION_BANELING_INCUBATION: "Aberrations spawn 2 Banelings upon death.",
     item_names.ABERRATION_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(item_names.ABERRATION),
+    item_names.ABERRATION_PROGRESSIVE_BANELING_LAUNCH: inspect.cleandoc("""
+        Level 1: Allows Aberrations to periodically throw generated Banelings at air targets.
+        Level 2: Can store up to 3 Banelings. Can consume Banelings to recharge faster. Thrown Banelings benefit from Baneling upgrades. 
+    """),
     item_names.CORRUPTOR_MONSTROUS_RESILIENCE: "Corruptors gain +100 life.",
     item_names.CORRUPTOR_CONSTRUCT_REGENERATION: "Corruptors gain increased life regeneration.",
     item_names.CORRUPTOR_SCOURGE_INCUBATION: "Corruptors spawn 2 Scourge upon death (3 with Swarm Scourge).",

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)"
@@ -486,6 +490,7 @@
 ABERRATION_BANELING_INCUBATION                    = "Baneling Incubation (Aberration)"
 ABERRATION_PROTECTIVE_COVER                       = "Protective Cover (Aberration)"
 ABERRATION_RESOURCE_EFFICIENCY                    = "Resource Efficiency (Aberration)"
+ABERRATION_PROGRESSIVE_BANELING_LAUNCH            = "Progressive Baneling Launch (Aberration)"
 CORRUPTOR_MONSTROUS_RESILIENCE                    = "Monstrous Resilience (Corruptor)"
 CORRUPTOR_CONSTRUCT_REGENERATION                  = "Construct Regeneration (Corruptor)"
 CORRUPTOR_SCOURGE_INCUBATION                      = "Scourge Incubation (Corruptor)"

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),
@@ -1549,6 +1552,14 @@ def get_full_item_list():
     item_names.INFESTED_LIBERATOR_DEFENDER_MODE:
         ItemData(380 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_5, 8, SC2Race.ZERG, parent_item=item_names.INFESTED_LIBERATOR,
                  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),

diff --git a/worlds/sc2/locations.py b/worlds/sc2/locations.py
@@ -2922,6 +2922,97 @@ def get_locations(world: Optional['SC2World']) -> Tuple[LocationData, ...]:
                 and logic.protoss_common_unit(state)
                 and (logic.protoss_competent_comp(state) or state.has(item_names.OBSERVER, player)))
         ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 1900, LocationType.VICTORY,
+            lambda state: (
+                logic.zerg_basic_kerriganless_anti_air(state)
+                and (logic.zerg_versatile_air(state)
+                    or state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+                    and logic.zerg_common_unit(state)))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "1st Data Core", SC2_RACESWAP_LOC_ID_OFFSET + 1901, LocationType.VANILLA),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "2nd Data Core", SC2_RACESWAP_LOC_ID_OFFSET + 1902, LocationType.VANILLA,
+            lambda state: (
+                logic.zerg_versatile_air(state)
+                or state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+                    and logic.zerg_common_unit(state))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "South Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 1903, LocationType.EXTRA,
+            lambda state: state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "Wall Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 1904, LocationType.EXTRA,
+            lambda state: state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "Mid Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 1905, LocationType.EXTRA,
+            lambda state: state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "Nydus Roof Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 1906, LocationType.EXTRA,
+            lambda state: state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "Alive Inside Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 1907, LocationType.EXTRA,
+            lambda state: state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "Brutalisk", SC2_RACESWAP_LOC_ID_OFFSET + 1908, LocationType.VANILLA,
+            lambda state: (
+                logic.zerg_basic_kerriganless_anti_air(state)
+                and (logic.zerg_versatile_air(state)
+                    or state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+                    and logic.zerg_common_unit(state)))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_Z.mission_name, "3rd Data Core", SC2_RACESWAP_LOC_ID_OFFSET + 1909, LocationType.VANILLA,
+            lambda state: (
+                logic.zerg_basic_kerriganless_anti_air(state)
+                and (logic.zerg_versatile_air(state)
+                    or state.has_any({item_names.YGGDRASIL, item_names.OVERLORD_VENTRAL_SACS, item_names.NYDUS_WORM}, player)
+                    and logic.zerg_common_unit(state)))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 2000, LocationType.VICTORY,
+            lambda state: (
+                logic.protoss_basic_anti_air(state)
+                and (logic.protoss_fleet(state)
+                    or state.has(item_names.WARP_PRISM, player)
+                    and logic.protoss_common_unit(state)))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "1st Data Core", SC2_RACESWAP_LOC_ID_OFFSET + 2001, LocationType.VANILLA),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "2nd Data Core", SC2_RACESWAP_LOC_ID_OFFSET + 2002, LocationType.VANILLA,
+            lambda state: (
+                logic.protoss_fleet(state)
+                or (state.has(item_names.WARP_PRISM, player)
+                    and logic.protoss_common_unit(state)))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "South Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 2003, LocationType.EXTRA,
+            lambda state: state.has(item_names.WARP_PRISM, player)
+                           and (adv_tactics or state.has(item_names.PROGRESSIVE_WARP_RELOCATE, player))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "Wall Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 2004, LocationType.EXTRA,
+            lambda state: state.has(item_names.WARP_PRISM, player)
+                           and (adv_tactics or state.has(item_names.PROGRESSIVE_WARP_RELOCATE, player))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "Mid Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 2005, LocationType.EXTRA,
+            lambda state: state.has(item_names.WARP_PRISM, player)
+                           and (adv_tactics or state.has(item_names.PROGRESSIVE_WARP_RELOCATE, player))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "Nydus Roof Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 2006, LocationType.EXTRA,
+            lambda state: state.has(item_names.WARP_PRISM, player)
+                           and (adv_tactics or state.has(item_names.PROGRESSIVE_WARP_RELOCATE, player))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "Alive Inside Rescue", SC2_RACESWAP_LOC_ID_OFFSET + 2007, LocationType.EXTRA,
+            lambda state: state.has(item_names.WARP_PRISM, player)
+                           and (adv_tactics or state.has(item_names.PROGRESSIVE_WARP_RELOCATE, player))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "Brutalisk", SC2_RACESWAP_LOC_ID_OFFSET + 2008, LocationType.VANILLA,
+            lambda state: (
+                logic.protoss_basic_anti_air(state)
+                and (logic.protoss_fleet(state)
+                    or state.has(item_names.WARP_PRISM, player)
+                    and logic.protoss_common_unit(state)))
+        ),
+        make_location_data(SC2Mission.THE_MOEBIUS_FACTOR_P.mission_name, "3rd Data Core", SC2_RACESWAP_LOC_ID_OFFSET + 2009, LocationType.VANILLA,
+            lambda state: (
+                logic.protoss_basic_anti_air(state)
+                and (logic.protoss_fleet(state)
+                    or state.has(item_names.WARP_PRISM, player)
+                    and logic.protoss_common_unit(state)))
+        ),
         make_location_data(SC2Mission.SUPERNOVA_Z.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 2100, LocationType.VICTORY,
             lambda state: (
                 logic.zerg_competent_comp_competent_aa(state)
@@ -4979,6 +5070,30 @@ def get_locations(world: Optional['SC2World']) -> Tuple[LocationData, ...]:
         make_location_data(SC2Mission.LAST_STAND_Z.mission_name, "1.5 Billion Zerg", SC2_RACESWAP_LOC_ID_OFFSET + 11805, LocationType.VANILLA,
                            logic.zerg_last_stand_requirement
                            ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_T.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 11900, LocationType.VICTORY,
+                           logic.terran_beats_protoss_deathball
+                           ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_T.mission_name, "South Solarite", SC2_RACESWAP_LOC_ID_OFFSET + 11901, LocationType.VANILLA,
+                           logic.terran_beats_protoss_deathball
+                           ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_T.mission_name, "North Solarite", SC2_RACESWAP_LOC_ID_OFFSET + 11902, LocationType.VANILLA,
+                           logic.terran_beats_protoss_deathball
+                           ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_T.mission_name, "Northwest Solarite", SC2_RACESWAP_LOC_ID_OFFSET + 11903, LocationType.VANILLA,
+                           logic.terran_beats_protoss_deathball
+                           ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_Z.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 12000, LocationType.VICTORY,
+                           logic.zerg_competent_comp_competent_aa
+                           ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_Z.mission_name, "South Solarite", SC2_RACESWAP_LOC_ID_OFFSET + 12001, LocationType.VANILLA,
+                           logic.zerg_competent_comp_competent_aa
+                           ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_Z.mission_name, "North Solarite", SC2_RACESWAP_LOC_ID_OFFSET + 12002, LocationType.VANILLA,
+                           logic.zerg_competent_comp_competent_aa
+                           ),
+        make_location_data(SC2Mission.FORBIDDEN_WEAPON_Z.mission_name, "Northwest Solarite", SC2_RACESWAP_LOC_ID_OFFSET + 12003, LocationType.VANILLA,
+                           logic.zerg_competent_comp_competent_aa
+                           ),
     ]
 
     beat_events = []