From e28fec5a53221dc2b68b88cb121968f3465d9c16 Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Fri, 15 Nov 2024 17:55:19 +0100 Subject: [PATCH] Add Death From Above race swaps --- worlds/sc2/locations.py | 32 ++++++++++++++++++++++++++++++++ worlds/sc2/mission_tables.py | 5 +++-- worlds/sc2/options.py | 2 +- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/worlds/sc2/locations.py b/worlds/sc2/locations.py index 6c884d008edd..63f1aa2eacc9 100644 --- a/worlds/sc2/locations.py +++ b/worlds/sc2/locations.py @@ -4200,6 +4200,38 @@ def get_locations(world: Optional['SC2World']) -> Tuple[LocationData, ...]: make_location_data(SC2Mission.PLANETFALL_P.mission_name, "Mid Expansion", SC2_RACESWAP_LOC_ID_OFFSET + 9412, LocationType.EXTRA, logic.protoss_competent_comp ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_T.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 9500, LocationType.VICTORY, + logic.terran_beats_protoss_deathball + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_T.mission_name, "First Power Link", SC2_RACESWAP_LOC_ID_OFFSET + 9501, LocationType.VANILLA), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_T.mission_name, "Second Power Link", SC2_RACESWAP_LOC_ID_OFFSET + 9502, LocationType.VANILLA, + logic.terran_beats_protoss_deathball + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_T.mission_name, "Third Power Link", SC2_RACESWAP_LOC_ID_OFFSET + 9503, LocationType.VANILLA, + logic.terran_beats_protoss_deathball + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_T.mission_name, "Expansion Command Center", SC2_RACESWAP_LOC_ID_OFFSET + 9504, LocationType.EXTRA, + logic.terran_beats_protoss_deathball + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_T.mission_name, "Main Path Command Center", SC2_RACESWAP_LOC_ID_OFFSET + 9505, LocationType.EXTRA, + logic.terran_beats_protoss_deathball + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_P.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 9600, LocationType.VICTORY, + logic.protoss_competent_comp + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_P.mission_name, "First Power Link", SC2_RACESWAP_LOC_ID_OFFSET + 9601, LocationType.VANILLA), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_P.mission_name, "Second Power Link", SC2_RACESWAP_LOC_ID_OFFSET + 9602, LocationType.VANILLA, + logic.protoss_competent_comp + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_P.mission_name, "Third Power Link", SC2_RACESWAP_LOC_ID_OFFSET + 9603, LocationType.VANILLA, + logic.protoss_competent_comp + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_P.mission_name, "Expansion Command Center", SC2_RACESWAP_LOC_ID_OFFSET + 9604, LocationType.EXTRA, + logic.protoss_competent_comp + ), + make_location_data(SC2Mission.DEATH_FROM_ABOVE_P.mission_name, "Main Path Command Center", SC2_RACESWAP_LOC_ID_OFFSET + 9605, LocationType.EXTRA, + logic.protoss_competent_comp + ), ] beat_events = [] diff --git a/worlds/sc2/mission_tables.py b/worlds/sc2/mission_tables.py index c67b7dfd9b6d..216ffce00b55 100644 --- a/worlds/sc2/mission_tables.py +++ b/worlds/sc2/mission_tables.py @@ -151,7 +151,7 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str, WITH_FRIENDS_LIKE_THESE = 45, "With Friends Like These", SC2Campaign.HOTS, "Dominion Space", SC2Race.ANY, MissionPools.STARTER, "ap_with_friends_like_these", MissionFlag.Terran|MissionFlag.NoBuild|MissionFlag.VsTerran CONVICTION = 46, "Conviction", SC2Campaign.HOTS, "Dominion Space", SC2Race.ANY, MissionPools.MEDIUM, "ap_conviction", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.NoBuild|MissionFlag.VsTerran PLANETFALL = 47, "Planetfall (Zerg)", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.HARD, "ap_planetfall", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.HasRaceSwap - DEATH_FROM_ABOVE = 48, "Death From Above", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.HARD, "ap_death_from_above", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.VsTerran + DEATH_FROM_ABOVE = 48, "Death From Above (Zerg)", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.HARD, "ap_death_from_above", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.VsTerran|MissionFlag.HasRaceSwap THE_RECKONING = 49, "The Reckoning", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.VERY_HARD, "ap_the_reckoning", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.VsTerran|MissionFlag.AiTerranAlly # Prologue @@ -272,7 +272,8 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str, # 174/175 - Conviction PLANETFALL_T = 176, "Planetfall (Terran)", SC2Campaign.HOTS, "Korhal", SC2Race.TERRAN, MissionPools.HARD, "ap_planetfall", MissionFlag.Terran|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.RaceSwap PLANETFALL_P = 177, "Planetfall (Protoss)", SC2Campaign.HOTS, "Korhal", SC2Race.PROTOSS, MissionPools.HARD, "ap_planetfall", MissionFlag.Protoss|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.RaceSwap - # 178/179 - Death From Above + DEATH_FROM_ABOVE_T = 178, "Death From Above (Terran)", SC2Campaign.HOTS, "Korhal", SC2Race.TERRAN, MissionPools.HARD, "ap_death_from_above", MissionFlag.Terran|MissionFlag.VsTerran|MissionFlag.RaceSwap + DEATH_FROM_ABOVE_P = 179, "Death From Above (Protoss)", SC2Campaign.HOTS, "Korhal", SC2Race.PROTOSS, MissionPools.HARD, "ap_death_from_above", MissionFlag.Protoss|MissionFlag.VsTerran|MissionFlag.RaceSwap # 180/181 - The Reckoning diff --git a/worlds/sc2/options.py b/worlds/sc2/options.py index b4a4670f7fe6..82540bb73b6c 100644 --- a/worlds/sc2/options.py +++ b/worlds/sc2/options.py @@ -152,7 +152,7 @@ class MaximumCampaignSize(Range): """ display_name = "Maximum Campaign Size" range_start = 1 - range_end = 139 + range_end = 141 default = 83