Skip to content

Commit

Permalink
Add Planetfall race swaps
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Nov 14, 2024
1 parent 04240f4 commit cc593d6
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 3 deletions.
78 changes: 78 additions & 0 deletions worlds/sc2/locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4122,6 +4122,84 @@ def get_locations(world: Optional['SC2World']) -> Tuple[LocationData, ...]:
make_location_data(SC2Mission.PHANTOMS_OF_THE_VOID_P.mission_name, "Northwest Temple", SC2_RACESWAP_LOC_ID_OFFSET + 8809, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 9300, LocationType.VICTORY,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "East Gate", SC2_RACESWAP_LOC_ID_OFFSET + 9301, LocationType.VANILLA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "Northwest Gate", SC2_RACESWAP_LOC_ID_OFFSET + 9302, LocationType.VANILLA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "North Gate", SC2_RACESWAP_LOC_ID_OFFSET + 9303, LocationType.VANILLA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "1 Laser Drill Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9304, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "2 Laser Drills Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9305, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "3 Laser Drills Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9306, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "4 Laser Drills Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9307, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "5 Laser Drills Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9308, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "Sons of Korhal", SC2_RACESWAP_LOC_ID_OFFSET + 9309, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "Night Wolves", SC2_RACESWAP_LOC_ID_OFFSET + 9310, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "West Expansion", SC2_RACESWAP_LOC_ID_OFFSET + 9311, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_T.mission_name, "Mid Expansion", SC2_RACESWAP_LOC_ID_OFFSET + 9312, LocationType.EXTRA,
logic.terran_beats_protoss_deathball
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 9400, LocationType.VICTORY,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "East Gate", SC2_RACESWAP_LOC_ID_OFFSET + 9401, LocationType.VANILLA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "Northwest Gate", SC2_RACESWAP_LOC_ID_OFFSET + 9402, LocationType.VANILLA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "North Gate", SC2_RACESWAP_LOC_ID_OFFSET + 9403, LocationType.VANILLA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "1 Particle Cannon Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9404, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "2 Particle Cannons Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9405, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "3 Particle Cannons Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9406, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "4 Particle Cannons Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9407, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "5 Particle Cannons Deployed", SC2_RACESWAP_LOC_ID_OFFSET + 9408, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "Sons of Korhal", SC2_RACESWAP_LOC_ID_OFFSET + 9409, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "Night Wolves", SC2_RACESWAP_LOC_ID_OFFSET + 9410, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "West Expansion", SC2_RACESWAP_LOC_ID_OFFSET + 9411, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.PLANETFALL_P.mission_name, "Mid Expansion", SC2_RACESWAP_LOC_ID_OFFSET + 9412, LocationType.EXTRA,
logic.protoss_competent_comp
),
]

beat_events = []
Expand Down
5 changes: 3 additions & 2 deletions worlds/sc2/mission_tables.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str,
PHANTOMS_OF_THE_VOID = 44, "Phantoms of the Void (Zerg)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.HARD, "ap_phantoms_of_the_void", MissionFlag.Zerg|MissionFlag.Countdown|MissionFlag.VsProtoss|MissionFlag.HasRaceSwap
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", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.HARD, "ap_planetfall", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.AutoScroller|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
THE_RECKONING = 49, "The Reckoning", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.VERY_HARD, "ap_the_reckoning", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.VsTerran|MissionFlag.AiTerranAlly

Expand Down Expand Up @@ -270,7 +270,8 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str,
PHANTOMS_OF_THE_VOID_P = 171, "Phantoms of the Void (Protoss)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.PROTOSS, MissionPools.HARD, "ap_phantoms_of_the_void", MissionFlag.Protoss|MissionFlag.Countdown|MissionFlag.VsProtoss|MissionFlag.RaceSwap
# 172/173 - With Friends Like These
# 174/175 - Conviction
# 176/177 - Planetfall
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
# 180/181 - The Reckoning

Expand Down
2 changes: 1 addition & 1 deletion worlds/sc2/options.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class MaximumCampaignSize(Range):
"""
display_name = "Maximum Campaign Size"
range_start = 1
range_end = 137
range_end = 139
default = 83


Expand Down

0 comments on commit cc593d6

Please sign in to comment.