Skip to content

Commit

Permalink
These missions require Story Levels too to be starters
Browse files Browse the repository at this point in the history
  • Loading branch information
Ziktofel committed Feb 3, 2024
1 parent d705574 commit a1de7d8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions worlds/sc2/PoolFilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from .Options import get_option_value, MissionOrder, \
get_enabled_campaigns, get_disabled_campaigns, RequiredTactics, kerrigan_unit_available, GrantStoryTech, \
TakeOverAIAllies, SpearOfAdunPresence, SpearOfAdunAutonomouslyCastAbilityPresence, campaign_depending_orders, \
ShuffleCampaigns, get_excluded_missions, ExcludeVeryHardMissions, ShuffleNoBuild, ExtraLocations
ShuffleCampaigns, get_excluded_missions, ExcludeVeryHardMissions, ShuffleNoBuild, ExtraLocations, GrantStoryLevels
from . import ItemNames

# Items with associated upgrades
Expand Down Expand Up @@ -40,6 +40,7 @@ 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)
grant_story_tech = get_option_value(multiworld, player, "grant_story_tech") == GrantStoryTech.option_true
grant_story_levels = get_option_value(multiworld, player, "grant_story_levels") != GrantStoryLevels.option_disabled
extra_locations = get_option_value(multiworld, player, "extra_locations")
excluded_missions: Set[SC2Mission] = get_excluded_missions(multiworld, player)
mission_pools: Dict[MissionPools, List[SC2Mission]] = {}
Expand Down Expand Up @@ -149,7 +150,7 @@ def move_mission(mission: SC2Mission, current_pool, new_pool):
move_mission(SC2Mission.TEMPLAR_S_RETURN, MissionPools.EASY, MissionPools.STARTER)
move_mission(SC2Mission.THE_ESCAPE, MissionPools.MEDIUM, MissionPools.STARTER)
move_mission(SC2Mission.IN_THE_ENEMY_S_SHADOW, MissionPools.MEDIUM, MissionPools.STARTER)
if grant_story_tech or kerriganless:
if (grant_story_tech and grant_story_levels) or kerriganless:
# The player has, all the stuff he needs, provided under these settings
move_mission(SC2Mission.SUPREME, MissionPools.MEDIUM, MissionPools.STARTER)
move_mission(SC2Mission.THE_INFINITE_CYCLE, MissionPools.HARD, MissionPools.STARTER)
Expand Down

0 comments on commit a1de7d8

Please sign in to comment.