monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OoT: Fix region_has_shortcuts crash when boss shuffle is on (#1325)

This commit is contained in:
espeon65536 2022-12-13 00:34:17 -06:00 committed by GitHub
parent 51c6be047f
commit 47f1fcf382
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/oot/Hints.py
View File

@ -365,9 +365,9 @@ class HintArea(Enum):
return parent_region.alt_hint
return parent_region.hint
spot_queue.extend(list(filter(lambda ent: ent not in already_checked, parent_region.entrances)))
spot_queue.extend(filter(lambda ent: ent not in already_checked, parent_region.entrances))
raise HintAreaNotFound('No hint area could be found for %s [World %d]' % (spot, spot.world.player))
raise HintAreaNotFound('No hint area could be found for %s [World %d]' % (spot, spot.player))
@classmethod
def for_dungeon(cls, dungeon_name: str):

13
worlds/oot/__init__.py
View File

@ -11,7 +11,8 @@ logger = logging.getLogger("Ocarina of Time")
from .Location import OOTLocation, LocationFactory, location_name_to_id
from .Entrance import OOTEntrance
from .EntranceShuffle import shuffle_random_entrances, entrance_shuffle_table, EntranceShuffleError
from .Hints import HintArea
from .HintList import getRequiredHints
from .Hints import HintArea, HintAreaNotFound, hint_dist_keys, get_hint_area, buildWorldGossipHints
from .Items import OOTItem, item_table, oot_data_to_ap_id, oot_is_item_of_type
from .ItemPool import generate_itempool, get_junk_item, get_junk_pool
from .Regions import OOTRegion, TimeOfDay
@ -26,8 +27,6 @@ from .Rom import Rom
from .Patches import OoTContainer, patch_rom
from .N64Patch import create_patch_file
from .Cosmetics import patch_cosmetics
from .Hints import hint_dist_keys, get_hint_area, buildWorldGossipHints
from .HintList import getRequiredHints
from Utils import get_options
from BaseClasses import MultiWorld, CollectionState, RegionType, Tutorial, LocationProgressType
@ -1146,9 +1145,11 @@ class OOTWorld(World):
# Helper functions
def region_has_shortcuts(self, regionname):
region = self.get_region(regionname)
if not region.dungeon:
region = region.entrances[0].parent_region
return region.dungeon.name in self.dungeon_shortcuts
try:
dungeon_name = HintArea.at(region).dungeon_name
return dungeon_name in self.dungeon_shortcuts
except HintAreaNotFound:
return False
def get_shufflable_entrances(self, type=None, only_primary=False):
return [entrance for entrance in self.multiworld.get_entrances() if (entrance.player == self.player and