diff --git a/BaseClasses.py b/BaseClasses.py index cbef228d..e8d31f28 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1749,10 +1749,13 @@ class Entrance(object): self.temp_path = [] def can_reach(self, state): - # Destination Pickup OW Only No Ledges Can S&Q Allow Mirror - multi_step_locations = { 'Pyramid Crack': ('Big Bomb', True, True, False, True), - 'Missing Smith': ('Frog', True, False, True, True), - 'Middle Aged Man': ('Dark Blacksmith Ruins', True, False, True, True) } + # Destination Pickup OW Only No Ledges Can S&Q Allow Mirror + multi_step_locations = { 'Pyramid Crack': ('Big Bomb', True, True, False, True), + 'Missing Smith': ('Frog', True, False, True, True), + 'Middle Aged Man': ('Dark Blacksmith Ruins', True, False, True, True), + 'Old Man Drop Off': ('Lost Old Man', True, False, False, False), + #'Revealing Light': ('Suspicious Maiden', False, False, False, False) } + } if self.name in multi_step_locations: if self not in state.path: @@ -2956,7 +2959,7 @@ class Spoiler(object): self.shops = [] self.bosses = OrderedDict() - self.suppress_spoiler_locations = ['Big Bomb', 'Dark Blacksmith Ruins', 'Frog', 'Middle Aged Man'] + self.suppress_spoiler_locations = ['Big Bomb', 'Frog', 'Dark Blacksmith Ruins', 'Middle Aged Man', 'Lost Old Man', 'Old Man Drop Off'] def set_overworld(self, entrance, exit, direction, player): if self.world.players == 1: diff --git a/CHANGELOG.md b/CHANGELOG.md index bfb1bf50..7e03485c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.2.11.3 +- Fixed error during multiworld generation +- Added proper Old Man pathing to the logic and spoiler playthru +- Removed the delay in spawning sprites when bonking items out of bonk locations +- Removed useless hints in Lite/Lean ER that are already categorically assumed +- Added GT and Links House entrance hints when either are shuffled in the pool + ## 0.2.11.2 - Implemented proper Districting with Mixed OWR, affecting Hints and District modes - Suppressed item locations in spoiler log that are junk or logical @@ -21,13 +28,13 @@ - Various logic corrections, including the DR Bumper Cave fix for pottery logic ## 0.2.10.1 -- Merged DR v1.0.1.3 +- \~Merged v1.0.1.3~ - Fixed Zelda despawn in TT Prison - Fixed issue with key door usage in rainstate - Added missing modes to example mystery yaml ## 0.2.10.0 -- Merged DR v1.0.1.1-1.0.1.2 +- \~Merged v1.0.1.1-1.0.1.2~ - Removed text color from hint tiles - Removed Good Bee requirement from Mothula - Some keylogic/generation fixes @@ -56,7 +63,7 @@ - Fixed issue with pre-opened pyramid when not expected ### 0.2.8.0 -- ~Merged DR v1.0.1.0 - Pottery options, BPS support, MSU Resume, Collection Rate Counter~ +- \~Merged DR v1.0.1.0 - Pottery options, BPS support, MSU Resume, Collection Rate Counter~ - Various improvements to increase generation success rate and reduce generation time - Fixed issue with playthru recognizing Aga accessibility - Fixed issue with applying rules correctly to Murahdahla, fixing Murahdahla+Beatable issues @@ -81,7 +88,7 @@ - Added proper branch-specific versioning (ie. Dev branch has '-u' suffixing the version number while Release/Main branch does not) ### 0.2.7.0 -- ~Merged DR v1.0.0.3 - MANY changes, major things listed below~ +- \~Merged DR v1.0.0.3 - MANY changes, major things listed below~ - New Item Fills (Districts/Vanilla/Major Location/Dungeon) - New OW Map Prize Indicators (In ER, map checks can spoil dungeon locations with a user setting) - Forbidden Boss Items (Exclude certain dungeon items from dropping on bosses) @@ -132,7 +139,7 @@ - Fixed issue with incorrect Mirror bonking - Fixed issue with old man follower death to Pyramid - Fixed Hera boss music not playing when boss not defeated -- ~Merged DR v0.5.1.7 - TT boss trap door fix/Applied Glitched flag~ +- \~Merged DR v0.5.1.7 - TT boss trap door fix/Applied Glitched flag~ ### 0.2.4.0 - Added Guaranteed OWR Reachability @@ -158,7 +165,7 @@ - Fake flipper damage fix improved to skip the long delay after the scroll - Fixed missing Blue Potion in Lake Shop in Inverted - Added legacy OW Crossed option 'None (Allowed)' to support old behavior when invalid option was used in Mystery -- ~Merged DR v0.5.1.6 - Money balancing fix/Boss logic fixes with Bombbag~ +- \~Merged DR v0.5.1.6 - Money balancing fix/Boss logic fixes with Bombbag~ ### 0.2.3.3 - Added OW Layout validation that reduces the cases where some screens are unreachable @@ -200,7 +207,7 @@ - Fixed music track change to Sanc music when Standard mode is delivering Zelda - Fixed SP flooding issue - Fixed issue with Shuffle Ganon in CLI/GUI -- ~Merged DR v0.5.1.5 - Mystery subweights~ +- \~Merged DR v0.5.1.5 - Mystery subweights~ ### 0.2.1.2 - Fixed issue with whirlpools not changing world when in Crossed OW @@ -221,7 +228,7 @@ - Smith deletion on S+Q only occurs if Blacksmith not reachable from starting locations - Spoiler log improvements to prevent spoiling in the beginning 'meta' section - Various minor fixes and improvements -- ~Merged DR v0.5.1.4 - ROM bug fixes/keylogic improvements~ +- \~Merged DR v0.5.1.4 - ROM bug fixes/keylogic improvements~ ### 0.1.9.4 - Hotfix for bad 0.1.9.3 version @@ -234,11 +241,11 @@ ### 0.1.9.2 - Fixed spoiler log and mystery for new Crossed/Mixed structure - Minor preparations and tweaks to ER framework (added global Entrance/Exit pool) -- ~Merged DR v0.5.1.2 - Blind Prison shuffled outside TT/Keylogic Improvements~ +- \~Merged DR v0.5.1.2 - Blind Prison shuffled outside TT/Keylogic Improvements~ ### 0.1.9.1 - Fixed logic issue with leaving IP entrance not requiring flippers -- ~Merged DR v0.5.1.1 - Map Indicator Fix/Boss Shuffle Bias/Shop Hints~ +- \~Merged DR v0.5.1.1 - Map Indicator Fix/Boss Shuffle Bias/Shop Hints~ ### 0.1.9.0 - Expanded Crossed OW to four separate options, see Readme for details @@ -252,7 +259,7 @@ - Fixed issues with Link/Bunny state in Crossed OW - Fixed issue with Standard+Parallel not using vanilla connections for Escape - Fixed issue with Mystery for OW boolean options -- ~Merged DR v0.5.1.0 - Major Keylogic Update~ +- \~Merged DR v0.5.1.0 - Major Keylogic Update~ ### 0.1.8.1 - Fixed issue with activating flute in DW (OW Mixed) @@ -267,12 +274,12 @@ - Added OW Shuffle support for Plando module (needs user testing) - Fixed issue with Sanc start at TR as bunny when it is LW - Fixed issue with Pyramid Hole not getting shuffled -- ~Merged DR v0.5.0.3 - Minor DR fixes~ +- \~Merged DR v0.5.0.3 - Minor DR fixes~ ### 0.1.7.4 - Fixed issue with Mixed OW failing to generate when HC/Pyramid is swapped - Various fixes to improve generation rates for Mixed OW Shuffle -- ~Merged DR v0.5.0.2 - Shuffle SFX~ +- \~Merged DR v0.5.0.2 - Shuffle SFX~ ### 0.1.7.3 - Fixed minor issue with ambient SFX stopping and starting on OW screen load @@ -292,10 +299,10 @@ ### 0.1.7.0 - Expanded new DR bomb logic to all modes (bomb usage in logic only if there is an unlimited supply of bombs available) -- ~Merged DR v0.5.0.1 - Bombbag mode / Enemizer fixes~ +- \~Merged DR v0.5.0.1 - Bombbag mode / Enemizer fixes~ ### 0.1.6.9 -- ~Merged DR v0.4.0.12 - Secure random update / Credits fix~ +- \~Merged DR v0.4.0.12 - Secure random update / Credits fix~ ### 0.1.6.8 - Implemented a smarter Balanced Flute Shuffle algorithm @@ -309,14 +316,14 @@ - Fixed Boss Music when boss room is entered thru straight stairs - Suppressed in-dungeon music changes when DR is enabled - Fixed issue with Pyramid Exit exiting to wrong location in ER -- ~Merged DR v0.4.0.11 - Various DR changes~ +- \~Merged DR v0.4.0.11 - Various DR changes~ ### 0.1.6.6 -- ~Merged DR v0.4.0.9 - P/C Indicator / Credits fix / CLI Hints Fix~ +- \~Merged DR v0.4.0.9 - P/C Indicator / Credits fix / CLI Hints Fix~ ### 0.1.6.5 - Reduced chance of diagonal flute spot in Balanced -- ~Merged DR v0.4.0.8 - Boss Indicator / Psuedo Boots / Quickswap Update / Credits Updates~ +- \~Merged DR v0.4.0.8 - Boss Indicator / Psuedo Boots / Quickswap Update / Credits Updates~ ### 0.1.6.4 - Fixed Frogsmith and Stumpy and restored progression in these locations @@ -355,15 +362,15 @@ ### 0.1.5.0 - Added OW Tile Swap setting - Fixed horizontal VRAM visual loading glitch on megatiles -- ~~Merged DR v0.4.0.7 - Fast Credits / Reduced Flashing / Sprite Author in Credits~~ Didn't fully merge +- ~\~Merged DR v0.4.0.7 - Fast Credits / Reduced Flashing / Sprite Author in Credits~~ Didn't fully merge ### 0.1.4.3 -- ~Merged DR v0.4.0.6 - TT Maiden Attic Hint / DR Entrance Floor Mat Mods / Hard/Expert Item Pool Fix~ +- \~Merged DR v0.4.0.6 - TT Maiden Attic Hint / DR Entrance Floor Mat Mods / Hard/Expert Item Pool Fix~ ### 0.1.4.2 - Modified various OW map terrain specific to OW Shuffle - Changed World check to table-based vs OW ID-based (should have no effect with current modes) -- ~Merged DR v0.4.0.5 - Mystery Boss Shuffle Fix / Swordless+Hard Item Pool Fix / Insanity+Inverted ER Fixes~ +- \~Merged DR v0.4.0.5 - Mystery Boss Shuffle Fix / Swordless+Hard Item Pool Fix / Insanity+Inverted ER Fixes~ ### 0.1.4.1 - Moved Inverted Pyramid Entrance to top of HC Ledge @@ -377,11 +384,11 @@ - Various logic fixes and region prep for Inverted - Fixed muted MSU-1 music in door rando when descending GT Climb stairs - Fixed Standard + Vanilla (thanks compiling) -- ~Merged DR v0.4.0.4 - Shuffle Link's House / Experimental Bunny Start / 10 Bomb Fix~ +- \~Merged DR v0.4.0.4 - Shuffle Link's House / Experimental Bunny Start / 10 Bomb Fix~ ### 0.1.3.0 - Added OWG Logic for OW Shuffle -- ~Merged DR v0.4.0.2 - OWG Framework / YAML~ +- \~Merged DR v0.4.0.2 - OWG Framework / YAML~ ### 0.1.2.2 - Re-purposed OW Shuffle setting to Layout Shuffle @@ -390,7 +397,7 @@ ### 0.1.2.1 - Made possible fix for Standard -- ~Merged DR v0.3.1.10 - Fixed Standard generation~ +- \~Merged DR v0.3.1.10 - Fixed Standard generation~ ### 0.1.2.0 - Added 'Parallel Worlds' toggle option @@ -400,7 +407,7 @@ ### 0.1.1.2 - If Link's current position fits within the incoming gap, Link will not get re-centered to the incoming gap - Added Rule for Pearl required to drop down back of SW -- ~Merged DR v0.3.1.8 - Improved Shopsanity pricing - Fixed Retro generation~ +- \~Merged DR v0.3.1.8 - Improved Shopsanity pricing - Fixed Retro generation~ ### 0.1.1.1 - Fixed camera unlocking issue diff --git a/EntranceShuffle.py b/EntranceShuffle.py index d2e493d6..c7586275 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -289,7 +289,7 @@ def link_entrances(world, player): else: caves.append(tuple(random.sample(['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3))) - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) else: caves.append('Ganons Tower Exit') @@ -362,7 +362,7 @@ def link_entrances(world, player): else: lw_dungeons.append(tuple(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)'))) - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) else: dw_dungeons.append('Ganons Tower Exit') @@ -448,7 +448,7 @@ def link_entrances(world, player): else: Dungeon_Exits.append(tuple(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)'))) - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) else: Dungeon_Exits.append('Ganons Tower Exit') @@ -498,7 +498,7 @@ def link_entrances(world, player): else: caves.append(tuple(random.sample(['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3))) - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) else: caves.append('Ganons Tower Exit') @@ -566,7 +566,7 @@ def link_entrances(world, player): caves.append('Hyrule Castle Secret Entrance Exit') caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')) - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Pyramid Entrance' if not world.is_tile_swapped(0x1b, player) else 'Inverted Pyramid Entrance', 'Pyramid Exit', player) connect_entrance(world, 'Pyramid Hole' if not world.is_tile_swapped(0x1b, player) else 'Inverted Pyramid Hole', 'Pyramid', player) @@ -1036,7 +1036,7 @@ def scramble_holes(world, player): hole_entrances.append(('Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Drop')) hole_targets.append(('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance')) - if world.shuffle_ganon: + if world.shuffle_ganon[player]: hole_entrances.append(('Pyramid Entrance', 'Pyramid Hole') if not world.is_tile_swapped(0x1b, player) else ('Inverted Pyramid Entrance', 'Inverted Pyramid Hole')) hole_targets.append(('Pyramid Exit', 'Pyramid')) @@ -1078,7 +1078,7 @@ def scramble_holes(world, player): hole_targets.append(('Sanctuary Exit', 'Sewer Drop')) # place pyramid hole - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: exit, target = ('Pyramid Exit', 'Pyramid') if not world.is_tile_swapped(0x1b, player): connect_two_way(world, 'Pyramid Entrance', exit, player) @@ -1112,7 +1112,7 @@ def simple_shuffle_dungeons(world, player): dungeon_exits = ['Eastern Palace Exit', 'Tower of Hera Exit', 'Agahnims Tower Exit', 'Thieves Town Exit', 'Skull Woods Final Section Exit', 'Palace of Darkness Exit', 'Ice Palace Exit', 'Misery Mire Exit', 'Swamp Palace Exit'] if not invFlag: - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player) else: dungeon_entrances.append('Ganons Tower') @@ -1121,7 +1121,7 @@ def simple_shuffle_dungeons(world, player): at_door = dungeon_exits.pop() else: dungeon_entrances.append('Ganons Tower') - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: at_door = 'Ganons Tower Exit' else: dungeon_exits.append('Ganons Tower Exit') @@ -1234,7 +1234,7 @@ def full_shuffle_dungeons(world, Dungeon_Exits, player): # must connect front of hyrule castle to do escape connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player) - if not world.shuffle_ganon: + if not world.shuffle_ganon[player]: connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) else: dungeon_exits.append('Ganons Tower Exit') @@ -2317,6 +2317,7 @@ indirect_connections = { #'Blacksmith Area': 'Pyramid Fairy', # Hammerpegs #'Forgotten Forest Area': 'Pyramid Fairy', # Shield Shop #'Desert Area': 'Pyramid Fairy', # Mire Area + 'Old Man Drop Off': 'Old Man S&Q', 'Old Man Cave': 'Old Man S&Q' } # format: diff --git a/ItemList.py b/ItemList.py index 6541f4de..8b18c686 100644 --- a/ItemList.py +++ b/ItemList.py @@ -230,6 +230,12 @@ def generate_itempool(world, player): world.push_item(world.get_location('Agahnim 2', player), ItemFactory('Beat Agahnim 2', player), False) world.get_location('Agahnim 2', player).event = True world.get_location('Agahnim 2', player).locked = True + world.push_item(world.get_location('Lost Old Man', player), ItemFactory('Escort Old Man', player), False) + world.get_location('Lost Old Man', player).event = True + world.get_location('Lost Old Man', player).locked = True + world.push_item(world.get_location('Old Man Drop Off', player), ItemFactory('Return Old Man', player), False) + world.get_location('Old Man Drop Off', player).event = True + world.get_location('Old Man Drop Off', player).locked = True world.push_item(world.get_location('Dark Blacksmith Ruins', player), ItemFactory('Pick Up Purple Chest', player), False) world.get_location('Dark Blacksmith Ruins', player).event = True world.get_location('Dark Blacksmith Ruins', player).locked = True diff --git a/Items.py b/Items.py index 714daa02..f379fb1c 100644 --- a/Items.py +++ b/Items.py @@ -200,6 +200,8 @@ item_table = {'Bow': (True, False, None, 0x0B, 200, 'You have\nchosen the\narche 'Hidden Pits': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), 'Zelda Herself': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), 'Zelda Delivered': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Escort Old Man': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Return Old Man': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), 'Farmable Bombs': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), 'Farmable Rupees': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), } diff --git a/OWEdges.py b/OWEdges.py index 0a7126b6..3f615aaa 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -1024,6 +1024,7 @@ OWTileRegions = bidict({ 'West Death Mountain (Top)': 0x03, 'Spectacle Rock Ledge': 0x03, 'West Death Mountain (Bottom)': 0x03, + 'Old Man Drop Off': 0x03, 'East Death Mountain (Top West)': 0x05, 'East Death Mountain (Top East)': 0x05, @@ -1553,6 +1554,7 @@ OWExitTypes = { ], 'OWTerrain': ['Lost Woods Bush (West)', 'Lost Woods Bush (East)', + 'Old Man Drop Off', 'Spectacle Rock Approach', 'Spectacle Rock Leave', 'DM Hammer Bridge (West)', diff --git a/OverworldShuffle.py b/OverworldShuffle.py index d0aae9ab..1b38485d 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -7,7 +7,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType from OverworldGlitchRules import create_owg_connections from Utils import bidict -version_number = '0.2.11.2' +version_number = '0.2.11.3' # branch indicator is intentionally different across branches version_branch = '' @@ -613,7 +613,7 @@ def shuffle_tiles(world, groups, result_list, do_grouped, player): parity[5] += 1 if 0x1b in group and world.mode[player] != 'standard': parity[5] += 1 - if 0x1b in group and world.shuffle_ganon: + if 0x1b in group and world.shuffle_ganon[player]: parity[5] -= 1 group_parity[group[0]] = parity @@ -1154,6 +1154,7 @@ mandatory_connections = [# Intra-tile OW Connections ('Lost Woods Bush (East)', 'Lost Woods West Area'), #pearl ('West Death Mountain Drop', 'West Death Mountain (Bottom)'), ('Spectacle Rock Drop', 'West Death Mountain (Top)'), + ('Old Man Drop Off', 'Old Man Drop Off'), ('DM Hammer Bridge (West)', 'East Death Mountain (Top East)'), #hammer ('DM Hammer Bridge (East)', 'East Death Mountain (Top West)'), #hammer ('East Death Mountain Spiral Ledge Drop', 'Spiral Cave Ledge'), diff --git a/Regions.py b/Regions.py index cb3eef6d..8f637e3a 100644 --- a/Regions.py +++ b/Regions.py @@ -15,7 +15,8 @@ def create_regions(world, player): create_lw_region(player, 'Lumberjack Area', None, ['Lumberjack Tree Tree', 'Lumberjack Tree Cave', 'Lumberjack House', 'Dark Lumberjack Mirror Spot', 'Lumberjack WN', 'Lumberjack SW']), create_lw_region(player, 'West Death Mountain (Top)', ['Ether Tablet'], ['Spectacle Rock Approach', 'West Death Mountain Drop', 'Tower of Hera', 'West Dark Death Mountain (Top) Mirror Spot', 'West Death Mountain EN']), create_lw_region(player, 'Spectacle Rock Ledge', ['Spectacle Rock'], ['Spectacle Rock Leave', 'Spectacle Rock Drop', 'Bubble Boy Mirror Spot']), - create_lw_region(player, 'West Death Mountain (Bottom)', None, ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'West Dark Death Mountain (Bottom) Mirror Spot', 'West Death Mountain Teleporter', 'West Death Mountain ES']), + create_lw_region(player, 'West Death Mountain (Bottom)', ['Old Man Drop Off'], ['Old Man Drop Off', 'Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'West Dark Death Mountain (Bottom) Mirror Spot', 'West Death Mountain Teleporter', 'West Death Mountain ES']), + create_dw_region(player, 'Old Man Drop Off', ['Old Man'], None), create_lw_region(player, 'East Death Mountain (Top West)', None, ['DM Hammer Bridge (West)', 'East Dark Death Mountain (Top West) Mirror Spot', 'East Death Mountain WN']), create_lw_region(player, 'East Death Mountain (Top East)', None, ['DM Hammer Bridge (East)', 'Floating Island Bridge (East)', 'East Death Mountain Spiral Ledge Drop', 'East Death Mountain Fairy Ledge Drop', 'East Death Mountain Mimic Ledge Drop', 'Paradox Cave (Top)', 'East Dark Death Mountain (Top East) Mirror Spot', 'East Death Mountain EN']), create_lw_region(player, 'Spiral Cave Ledge', None, ['Spiral Ledge Drop', 'Spiral Mimic Bridge (West)', 'Spiral Cave', 'TR Ledge (West) Mirror Spot']), @@ -233,7 +234,7 @@ def create_regions(world, player): create_cave_region(player, 'Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'], ['Lumberjack Tree (top to bottom)']), create_cave_region(player, 'Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']), create_cave_region(player, 'Lumberjack House', 'a boring house'), - create_cave_region(player, 'Old Man Cave', 'a connector', ['Old Man'], ['Old Man Cave Exit (East)']), + create_cave_region(player, 'Old Man Cave', 'a connector', ['Lost Old Man'], ['Old Man Cave Exit (East)']), create_cave_region(player, 'Old Man Cave Ledge', 'a connector', None, ['Old Man Cave Exit (West)', 'Old Man Cave Dropdown']), create_cave_region(player, 'Old Man House', 'a connector', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']), create_cave_region(player, 'Old Man House Back', 'a connector', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']), @@ -1200,7 +1201,7 @@ def adjust_locations(world, player): for l in ['Ganon', 'Agahnim 1', 'Agahnim 2', 'Dark Blacksmith Ruins', 'Middle Aged Man', 'Frog', 'Missing Smith', 'Floodgate', 'Trench 1 Switch', 'Trench 2 Switch', 'Swamp Drain', 'Attic Cracked Floor', 'Suspicious Maiden', 'Revealing Light', 'Big Bomb', 'Pyramid Crack', - 'Ice Block Drop', 'Zelda Pickup', 'Zelda Drop Off', 'Skull Star Tile']: + 'Ice Block Drop', 'Lost Old Man', 'Old Man Drop Off', 'Zelda Pickup', 'Zelda Drop Off', 'Skull Star Tile']: location = world.get_location_unsafe(l, player) if location: location.type = LocationType.Logical @@ -1585,6 +1586,8 @@ location_table = {'Mushroom': (0x180013, 0x186338, False, 'in the woods'), 'Ganon': (None, None, False, 'from me'), 'Agahnim 1': (None, None, False, 'from Ganon\'s wizardry form'), 'Agahnim 2': (None, None, False, 'from Ganon\'s wizardry form'), + 'Lost Old Man': (None, None, False, None), + 'Old Man Drop Off': (None, None, False, None), 'Floodgate': (None, None, False, None), 'Frog': (None, None, False, None), 'Missing Smith': (None, None, False, None), diff --git a/Rules.py b/Rules.py index 20465130..c6c9b195 100644 --- a/Rules.py +++ b/Rules.py @@ -180,7 +180,7 @@ def global_rules(world, player): #for exit in world.get_region('Flute Sky', player).exits: # exit.hide_path = True - set_rule(world.get_entrance('Old Man S&Q', player), lambda state: state.can_reach('Old Man', 'Location', player)) + set_rule(world.get_entrance('Old Man S&Q', player), lambda state: state.has('Return Old Man', player)) set_rule(world.get_entrance('Flute Spot 1', player), lambda state: state.can_flute(player)) set_rule(world.get_entrance('Flute Spot 2', player), lambda state: state.can_flute(player)) @@ -193,6 +193,8 @@ def global_rules(world, player): set_rule(world.get_location('Sunken Treasure', player), lambda state: state.has('Open Floodgate', player)) set_rule(world.get_location('Dark Blacksmith Ruins', player), lambda state: state.has('Return Smith', player)) + set_rule(world.get_location('Old Man', player), lambda state: state.has('Return Old Man', player)) + set_rule(world.get_location('Old Man Drop Off', player), lambda state: state.has('Escort Old Man', player)) set_rule(world.get_location('Middle Aged Man', player), lambda state: state.has('Pick Up Purple Chest', player)) # Can S&Q with chest set_rule(world.get_location('Purple Chest', player), lambda state: state.has('Deliver Purple Chest', player)) # Can S&Q with chest set_rule(world.get_location('Big Bomb', player), lambda state: state.has('Crystal 5', player) and state.has('Crystal 6', player)) @@ -1857,7 +1859,7 @@ def set_bunny_rules(world, player, inverted): 'Hookshot Cave (Middle)', 'Pyramid', 'Spiral Cave (Top)', 'Fairy Ascension Cave (Drop)'] bunny_accessible_locations = ['Link\'s Uncle', 'Sahasrahla', 'Sick Kid', 'Lost Woods Hideout', 'Lumberjack Tree', 'Checkerboard Cave', 'Potion Shop', 'Spectacle Rock Cave', 'Pyramid', - 'Hype Cave - Generous Guy', 'Peg Cave', 'Bumper Cave Ledge', + 'Hype Cave - Generous Guy', 'Peg Cave', 'Bumper Cave Ledge', 'Old Man', 'Frog', 'Missing Smith', 'Dark Blacksmith Ruins', 'Purple Chest', 'Pyramid Crack', 'Big Bomb', 'Spectacle Rock', 'Bombos Tablet', 'Ether Tablet', 'Blacksmith', 'Master Sword Pedestal', 'Bottle Merchant', 'Sunken Treasure', 'Desert Ledge', diff --git a/asm/owrando.asm b/asm/owrando.asm index a046b8da..363d9587 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -632,7 +632,7 @@ OWShuffle: ;offset is (8bytes * OW Slot ID) + (2bytes * direction) asl : rep #$20 : and.w #$00ff : pha : sep #$20 ;2 bytes per direction - lda $8a : tax : lda.l OWTileWorldAssoc,X : eor.l CurrentWorld : beq + + ldx $8a : lda.l OWTileWorldAssoc,X : eor.l CurrentWorld : beq + ; fake world, will treat this OW area as opposite world txa : eor.b #$40 : tax + txa : and #$40 : !add $700 : rep #$30 : and #$00ff : asl #3