alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Fixed issue with OWG+ placing old man outside DM

Browse Source
This commit is contained in:
codemann8
2025-01-02 22:53:34 -06:00
parent 8ebbff3e7d
commit d479789274
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OverworldShuffle.py
View File

@@ -1479,7 +1479,7 @@ def build_sectors(world, player):
return sectors return sectors
def build_accessible_region_list(world, start_region, player, build_copy_world=False, cross_world=False, region_rules=True, ignore_ledges = False): def build_accessible_region_list(world, start_region, player, build_copy_world=False, cross_world=False, region_rules=True, ignore_ledges=False, restrictive_follower=False):
from BaseClasses import CollectionState from BaseClasses import CollectionState
from Main import copy_world_premature from Main import copy_world_premature
from Items import ItemFactory from Items import ItemFactory
@@ -1500,9 +1500,11 @@ def build_accessible_region_list(world, start_region, player, build_copy_world=F
if flutespot.connected_region and flutespot.connected_region.name not in explored_regions: if flutespot.connected_region and flutespot.connected_region.name not in explored_regions:
explore_region(flutespot.connected_region.name, flutespot.connected_region) explore_region(flutespot.connected_region.name, flutespot.connected_region)
elif exit.connected_region.name not in explored_regions \ elif exit.connected_region.name not in explored_regions \
and (exit.connected_region.type == region.type and (exit.connected_region.type == region.type or exit.name in OWExitTypes['OWEdge']
or exit.name in OWExitTypes['OWEdge'] or (cross_world and exit.name in (OWExitTypes['Portal'] + OWExitTypes['Mirror']))) \ or (cross_world and exit.name in (OWExitTypes['Portal'] + OWExitTypes['Mirror']))) \
and (not region_rules or exit.access_rule(blank_state)) and (not ignore_ledges or exit.name not in (OWExitTypes['Ledge'] + OWExitTypes['OWG'])): and (not region_rules or exit.access_rule(blank_state)) \
and (not restrictive_follower or exit.spot_type != 'OWG') \
and (not ignore_ledges or exit.name not in (OWExitTypes['Ledge'] + OWExitTypes['OWG'])):
explore_region(exit.connected_region.name, exit.connected_region) explore_region(exit.connected_region.name, exit.connected_region)
if build_copy_world: if build_copy_world:

6
source/overworld/EntranceShuffle2.py
View File

@@ -405,7 +405,7 @@ def do_old_man_cave_exit(entrances, exits, avail, cross_world):
region_name = 'West Death Mountain (Top)' region_name = 'West Death Mountain (Top)'
else: else:
region_name = 'West Dark Death Mountain (Top)' region_name = 'West Dark Death Mountain (Top)'
om_cave_options = list(get_accessible_entrances(region_name, avail, [], cross_world, True, True, True)) om_cave_options = list(get_accessible_entrances(region_name, avail, [], cross_world, True, True, True, True))
om_cave_options = [e for e in om_cave_options if e in entrances and e != 'Old Man House (Bottom)'] om_cave_options = [e for e in om_cave_options if e in entrances and e != 'Old Man House (Bottom)']
if avail.swapped: if avail.swapped:
om_cave_options = [e for e in om_cave_options if e not in Forbidden_Swap_Entrances] om_cave_options = [e for e in om_cave_options if e not in Forbidden_Swap_Entrances]
@@ -863,7 +863,7 @@ def get_nearby_entrances(avail, start_region):
return candidates return candidates
def get_accessible_entrances(start_region, avail, assumed_inventory=[], cross_world=False, region_rules=True, exit_rules=True, include_one_ways=False): def get_accessible_entrances(start_region, avail, assumed_inventory=[], cross_world=False, region_rules=True, exit_rules=True, include_one_ways=False, restrictive_follower=False):
from Main import copy_world_premature from Main import copy_world_premature
from BaseClasses import CollectionState from BaseClasses import CollectionState
from Items import ItemFactory from Items import ItemFactory
@@ -881,7 +881,7 @@ def get_accessible_entrances(start_region, avail, assumed_inventory=[], cross_wo
for item in assumed_inventory: for item in assumed_inventory:
blank_state.collect(ItemFactory(item, avail.player), True) blank_state.collect(ItemFactory(item, avail.player), True)
explored_regions = list(build_accessible_region_list(base_world, start_region, avail.player, False, cross_world, region_rules, False)) explored_regions = list(build_accessible_region_list(base_world, start_region, avail.player, False, cross_world, region_rules, False, restrictive_follower))
if include_one_ways: if include_one_ways:
new_regions = list() new_regions = list()