U se SC2Mission to handle excluded_items

worlds/sc2wol/MissionTables.py

@@ -1,4 +1,4 @@
-from typing import NamedTuple, Dict, List
+from typing import NamedTuple, Dict, List, Set
 from enum import IntEnum, Enum
 
 
@@ -340,7 +340,7 @@ def get_campaign_missions(campaign: SC2Campaign) -> List[SC2Mission]:
     return [mission for mission in SC2Mission if mission.campaign == campaign]
 
 
-def get_campaign_difficulty(campaign: SC2Campaign, excluded_missions: list[str] = None) -> MissionPools:
+def get_campaign_difficulty(campaign: SC2Campaign, excluded_missions: Set[SC2Mission] = None) -> MissionPools:
     """
 
     :param campaign:
@@ -349,14 +349,12 @@ def get_campaign_difficulty(campaign: SC2Campaign, excluded_missions: list[str]
     """
     if excluded_missions is None:
         excluded_missions = []
-    mission_names = set([mission.mission_name for mission in get_campaign_missions(campaign)])
     excluded_mission_set = set(excluded_missions)
-    included_mission_names = mission_names.difference(excluded_mission_set)
-    included_missions = [lookup_name_to_mission[mission_name] for mission_name in included_mission_names]
+    included_missions = set(get_campaign_missions(campaign)).difference(excluded_mission_set)
     return max([mission.pool for mission in included_missions])
 
 
-def get_campaign_goal_priority(campaign: SC2Campaign, excluded_missions: List[str] | frozenset[str] = None) -> SC2CampaignGoalPriority:
+def get_campaign_goal_priority(campaign: SC2Campaign, excluded_missions: Set[SC2Mission] | frozenset[str] = None) -> SC2CampaignGoalPriority:
     """
     Gets a modified campaign goal priority.
     If all the campaign's goal missions are excluded, it's ineligible to have the goal

worlds/sc2wol/PoolFilter.py

@@ -3,7 +3,7 @@
 from .Items import get_full_item_list, spider_mine_sources, second_pass_placeable_items
 from .MissionTables import mission_orders, MissionInfo, MissionPools, get_campaign_missions, \
     get_campaign_goal_priority, campaign_final_mission_locations, campaign_alt_final_mission_locations, \
-    get_no_build_missions, SC2Campaign, SC2Race, SC2CampaignGoalPriority, SC2Mission
+    get_no_build_missions, SC2Campaign, SC2Race, SC2CampaignGoalPriority, SC2Mission, lookup_name_to_mission
 from .Options import get_option_value, MissionOrder, \
     get_enabled_campaigns, get_disabled_campaigns
 from .LogicMixin import SC2WoLLogic
@@ -30,7 +30,8 @@ def filter_missions(multiworld: MultiWorld, player: int) -> Dict[MissionPools, L
     shuffle_no_build = get_option_value(multiworld, player, "shuffle_no_build")
     enabled_campaigns = get_enabled_campaigns(multiworld, player)
     disabled_campaigns = get_disabled_campaigns(multiworld, player)
-    excluded_missions = get_option_value(multiworld, player, "excluded_missions")
+    excluded_mission_names = get_option_value(multiworld, player, "excluded_missions")
+    excluded_missions: Set[SC2Mission] = set([lookup_name_to_mission[name] for name in excluded_mission_names])
     mission_pools: Dict[MissionPools, List[SC2Mission]] = {}
     for mission in SC2Mission:
         if not mission_pools.get(mission.pool):
@@ -52,30 +53,30 @@ def filter_missions(multiworld: MultiWorld, player: int) -> Dict[MissionPools, L
         return mission_pools
     # Omitting No-Build missions if not shuffling no-build
     if not shuffle_no_build:
-        excluded_missions = excluded_missions.union([mission.mission_name for mission in get_no_build_missions()])
+        excluded_missions = excluded_missions.union(get_no_build_missions())
     # Omitting missions not in enabled campaigns
     for campaign in disabled_campaigns:
-        excluded_missions = excluded_missions.union([mission.mission_name for mission in get_campaign_missions(campaign)])
+        excluded_missions = excluded_missions.union(get_campaign_missions(campaign))
 
     # Finding the goal map
     goal_priorities = {campaign: get_campaign_goal_priority(campaign, excluded_missions) for campaign in enabled_campaigns}
     goal_level = max(goal_priorities.values())
     candidate_campaigns = [campaign for campaign, goal_priority in goal_priorities.items() if goal_priority == goal_level]
     goal_campaign = multiworld.random.choice(candidate_campaigns)
     primary_goal = campaign_final_mission_locations[goal_campaign]
-    if primary_goal is None or primary_goal.mission.mission_name in excluded_missions:
+    if primary_goal is None or primary_goal.mission in excluded_missions:
         # No primary goal or its mission is excluded
         candidate_missions = list(campaign_alt_final_mission_locations[goal_campaign].keys())
-        candidate_missions = [mission for mission in candidate_missions if mission.mission_name not in excluded_missions]
+        candidate_missions = [mission for mission in candidate_missions if mission not in excluded_missions]
         if len(candidate_missions) == 0:
-            raise Exception("There are no valid goal missions.  Please exclude fewer missions.")
+            raise Exception("There are no valid goal missions. Please exclude fewer missions.")
         goal_mission = multiworld.random.choice(candidate_missions).mission_name
     else:
         goal_mission = primary_goal.mission
 
     # Excluding missions
     for difficulty, mission_pool in mission_pools.items():
-        mission_pools[difficulty] = [mission for mission in mission_pool if mission.name not in excluded_missions]
+        mission_pools[difficulty] = [mission for mission in mission_pool if mission not in excluded_missions]
     mission_pools[MissionPools.FINAL] = [goal_mission]
 
     # Mission pool changes on Build-Only