Skip to content

Commit

Permalink
Add Hand of Darkness Race Swaps
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Nov 11, 2024
1 parent 3a9498a commit 8c8798d
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 3 deletions.
60 changes: 60 additions & 0 deletions worlds/sc2/locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4010,6 +4010,66 @@ def get_locations(world: Optional['SC2World']) -> Tuple[LocationData, ...]:
logic.protoss_competent_comp(state)
and (adv_tactics or logic.protoss_infested_garrison_claimer(state)))
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 8500, LocationType.VICTORY,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "North Brutalisk", SC2_RACESWAP_LOC_ID_OFFSET + 8501, LocationType.VANILLA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "South Brutalisk", SC2_RACESWAP_LOC_ID_OFFSET + 8502, LocationType.VANILLA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Kill 1 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8503, LocationType.EXTRA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Kill 2 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8504, LocationType.EXTRA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Kill 3 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8505, LocationType.EXTRA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Kill 4 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8506, LocationType.EXTRA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Kill 5 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8507, LocationType.EXTRA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Kill 6 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8508, LocationType.EXTRA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_T.mission_name, "Kill 7 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8509, LocationType.EXTRA,
logic.terran_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Victory", SC2_RACESWAP_LOC_ID_OFFSET + 8600, LocationType.VICTORY,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "North Brutalisk", SC2_RACESWAP_LOC_ID_OFFSET + 8601, LocationType.VANILLA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "South Brutalisk", SC2_RACESWAP_LOC_ID_OFFSET + 8602, LocationType.VANILLA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Kill 1 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8603, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Kill 2 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8604, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Kill 3 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8605, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Kill 4 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8606, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Kill 5 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8607, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Kill 6 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8608, LocationType.EXTRA,
logic.protoss_competent_comp
),
make_location_data(SC2Mission.HAND_OF_DARKNESS_P.mission_name, "Kill 7 Hybrid", SC2_RACESWAP_LOC_ID_OFFSET + 8609, 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 @@ -146,7 +146,7 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str,
THE_CRUCIBLE = 40, "The Crucible (Zerg)", SC2Campaign.HOTS, "Zerus", SC2Race.ZERG, MissionPools.MEDIUM, "ap_the_crucible", MissionFlag.Zerg|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
SUPREME = 41, "Supreme", SC2Campaign.HOTS, "Zerus", SC2Race.ANY, MissionPools.MEDIUM, "ap_supreme", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.NoBuild|MissionFlag.VsZerg
INFESTED = 42, "Infested (Zerg)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.MEDIUM, "ap_infested", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
HAND_OF_DARKNESS = 43, "Hand of Darkness", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.HARD, "ap_hand_of_darkness", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.Countdown|MissionFlag.VsTerran
HAND_OF_DARKNESS = 43, "Hand of Darkness (Zerg)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.HARD, "ap_hand_of_darkness", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
PHANTOMS_OF_THE_VOID = 44, "Phantoms of the Void", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.HARD, "ap_phantoms_of_the_void", MissionFlag.Zerg|MissionFlag.Countdown|MissionFlag.VsProtoss
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
Expand Down Expand Up @@ -264,7 +264,8 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str,
# 164/165 - Supreme
INFESTED_T = 166, "Infested (Terran)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_infested", MissionFlag.Terran|MissionFlag.VsTerran|MissionFlag.RaceSwap
INFESTED_P = 167, "Infested (Protoss)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_infested", MissionFlag.Protoss|MissionFlag.VsTerran|MissionFlag.RaceSwap
# 168/169 - Hand of Darkness
HAND_OF_DARKNESS_T = 168, "Hand of Darkness (Terran)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.TERRAN, MissionPools.HARD, "ap_hand_of_darkness", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.RaceSwap
HAND_OF_DARKNESS_P = 169, "Hand of Darkness (Protoss)", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.PROTOSS, MissionPools.HARD, "ap_hand_of_darkness", MissionFlag.Protoss|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.RaceSwap
# 170/171 - Phantoms of the Void
# 172/173 - With Friends Like These
# 174/175 - Conviction
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 = 133
range_end = 135
default = 83


Expand Down

0 comments on commit 8c8798d

Please sign in to comment.