Improve Z logic for Sky Shield

EnvyDragon · Nov 25, 2024 · 7911e1d · 7911e1d
1 parent 9dd49d6
commit 7911e1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/worlds/sc2/locations.py b/worlds/sc2/locations.py
@@ -4658,35 +4658,35 @@ def get_locations(world: Optional['SC2World']) -> Tuple[LocationData, ...]:
                                    and logic.terran_competent_anti_air(state)
                            )),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 11200, LocationType.VICTORY,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Mid EMP Scrambler", SC2_RACESWAP_LOC_ID_OFFSET + 11201, LocationType.VANILLA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Southeast EMP Scrambler", SC2_RACESWAP_LOC_ID_OFFSET + 11202, LocationType.VANILLA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "North EMP Scrambler", SC2_RACESWAP_LOC_ID_OFFSET + 11203, LocationType.VANILLA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Mid Stabilizer", SC2_RACESWAP_LOC_ID_OFFSET + 11204, LocationType.EXTRA),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Southwest Stabilizer", SC2_RACESWAP_LOC_ID_OFFSET + 11205, LocationType.EXTRA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Northwest Stabilizer", SC2_RACESWAP_LOC_ID_OFFSET + 11206, LocationType.EXTRA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Northeast Stabilizer", SC2_RACESWAP_LOC_ID_OFFSET + 11207, LocationType.EXTRA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "Southeast Stabilizer", SC2_RACESWAP_LOC_ID_OFFSET + 11208, LocationType.EXTRA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "West Raynor Base", SC2_RACESWAP_LOC_ID_OFFSET + 11209, LocationType.EXTRA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
         make_location_data(SC2Mission.SKY_SHIELD_Z.mission_name, "East Raynor Base", SC2_RACESWAP_LOC_ID_OFFSET + 11210, LocationType.EXTRA,
-                           logic.zerg_common_unit_competent_aa
+                           logic.zerg_competent_comp_competent_aa
                            ),
     ]
 

diff --git a/worlds/sc2/mission_tables.py b/worlds/sc2/mission_tables.py
@@ -289,7 +289,7 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str,
     THE_SPEAR_OF_ADUN_T = 192, "The Spear of Adun (Terran)", SC2Campaign.LOTV, "Aiur", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_the_spear_of_adun", MissionFlag.Terran|MissionFlag.VsPZ|MissionFlag.RaceSwap
     THE_SPEAR_OF_ADUN_Z = 193, "The Spear of Adun (Zerg)", SC2Campaign.LOTV, "Aiur", SC2Race.ZERG, MissionPools.MEDIUM, "ap_the_spear_of_adun", MissionFlag.Zerg|MissionFlag.VsPZ|MissionFlag.RaceSwap
     SKY_SHIELD_T = 194, "Sky Shield (Terran)", SC2Campaign.LOTV, "Korhal", SC2Race.TERRAN, MissionPools.EASY, "ap_sky_shield", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.AiTerranAlly|MissionFlag.RaceSwap
-    SKY_SHIELD_Z = 195, "Sky Shield (Zerg)", SC2Campaign.LOTV, "Korhal", SC2Race.ZERG, MissionPools.EASY, "ap_sky_shield", MissionFlag.Zerg|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.AiTerranAlly|MissionFlag.RaceSwap
+    SKY_SHIELD_Z = 195, "Sky Shield (Zerg)", SC2Campaign.LOTV, "Korhal", SC2Race.ZERG, MissionPools.MEDIUM, "ap_sky_shield", MissionFlag.Zerg|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.AiTerranAlly|MissionFlag.RaceSwap
     # 196/197 - Brothers in Arms
     # 198/199 - Amon's Reach
     # 200/201 - Last Stand