Merge pull request Ziktofel#311 from MatthewMarinets/mm/make_reckonin…

…g_very_hard sc2: Making The Reckoning a Very Hard mission, putting it in the final mission pool
EnvyDragon · Sep 21, 2024 · d603228 · d603228
2 parents 85a947c + 97154ba
commit d603228
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/worlds/sc2/mission_tables.py b/worlds/sc2/mission_tables.py
@@ -152,7 +152,7 @@ def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str,
     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
     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.HARD, "ap_the_reckoning", MissionFlag.Zerg|MissionFlag.Kerrigan|MissionFlag.VsTerran|MissionFlag.AiTerranAlly
+    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
     DARK_WHISPERS = 50, "Dark Whispers", SC2Campaign.PROLOGUE, "_1", SC2Race.PROTOSS, MissionPools.EASY, "ap_dark_whispers", MissionFlag.Protoss|MissionFlag.Countdown|MissionFlag.VsTZ
@@ -358,7 +358,7 @@ class SC2CampaignGoal(NamedTuple):
 campaign_final_mission_locations: Dict[SC2Campaign, Optional[SC2CampaignGoal]] = {
     SC2Campaign.WOL: SC2CampaignGoal(SC2Mission.ALL_IN, "All-In: Victory"),
     SC2Campaign.PROPHECY: SC2CampaignGoal(SC2Mission.IN_UTTER_DARKNESS, "In Utter Darkness: Kills"),
-    SC2Campaign.HOTS: None,
+    SC2Campaign.HOTS: SC2CampaignGoal(SC2Mission.THE_RECKONING, "The Reckoning: Victory"),
     SC2Campaign.PROLOGUE: SC2CampaignGoal(SC2Mission.EVIL_AWOKEN, "Evil Awoken: Victory"),
     SC2Campaign.LOTV: SC2CampaignGoal(SC2Mission.SALVATION, "Salvation: Victory"),
     SC2Campaign.EPILOGUE: None,
@@ -375,7 +375,6 @@ class SC2CampaignGoal(NamedTuple):
     },
     SC2Campaign.PROPHECY: None,
     SC2Campaign.HOTS: {
-        SC2Mission.THE_RECKONING: "The Reckoning: Victory",
         SC2Mission.THE_CRUCIBLE: "The Crucible: Victory",
         SC2Mission.HAND_OF_DARKNESS: "Hand of Darkness: Victory",
         SC2Mission.PHANTOMS_OF_THE_VOID: "Phantoms of the Void: Victory",

diff --git a/worlds/sc2/options.py b/worlds/sc2/options.py
@@ -811,7 +811,7 @@ class ExcludedMissions(Sc2MissionSet):
 
 class ExcludeVeryHardMissions(Choice):
     """
-    Excludes Very Hard missions outside of Epilogue campaign (All-In, Salvation, and all Epilogue missions are considered Very Hard).
+    Excludes Very Hard missions outside of Epilogue campaign (All-In, The Reckoning, Salvation, and all Epilogue missions are considered Very Hard).
     Doesn't apply to "Vanilla" mission order.
 
     Default: Not excluded for mission orders "Vanilla Shuffled" or "Grid" with Maximum Campaign Size >= 20,