From fb13785abc87fc6cb9b1c209be6e37dfdfd5d927 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 6 Feb 2023 13:46:25 -0700 Subject: [PATCH] Minor standard generation fix Minor ER + Partitioned fix --- DoorShuffle.py | 4 ++-- Doors.py | 1 + Main.py | 2 +- RELEASENOTES.md | 6 ++++++ source/overworld/EntranceShuffle2.py | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 4fa84b78..e4d4a7be 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -476,14 +476,14 @@ def choose_portals(world, player): info.required_passage = {x: y for x, y in info.required_passage.items() if len(y) > 0} for target_region, possible_portals in info.required_passage.items(): candidates = find_portal_candidates(master_door_list, dungeon, custom, allowed, need_passage=True, - bk_shuffle=bk_shuffle, rupee_bow=rupee_bow_flag) + bk_shuffle=bk_shuffle, standard=std_flag, rupee_bow=rupee_bow_flag) choice, portal = assign_portal(candidates, possible_portals, custom, world, player) portal.destination = True clean_up_portal_assignment(portal_assignment, dungeon, portal, master_door_list, outstanding_portals) dead_end_choices = info.total - 1 - len(portal_assignment[dungeon]) for i in range(0, dead_end_choices): candidates = find_portal_candidates(master_door_list, dungeon, custom, allowed, dead_end_allowed=True, - bk_shuffle=bk_shuffle, rupee_bow=rupee_bow_flag) + bk_shuffle=bk_shuffle, standard=std_flag, rupee_bow=rupee_bow_flag) possible_portals = outstanding_portals if not info.sole_entrance else [x for x in outstanding_portals if x != info.sole_entrance] choice, portal = assign_portal(candidates, possible_portals, custom, world, player) if choice.deadEnd: diff --git a/Doors.py b/Doors.py index 110ca5c9..edc51ac0 100644 --- a/Doors.py +++ b/Doors.py @@ -1521,6 +1521,7 @@ def create_doors(world, player): world.get_door("GT Bob\'s Room SE", player).passage = False world.get_door('Desert Tiles 2 SE', player).bk_shuffle_req = True # key-drop note: allows this to be a portal world.get_door('Swamp Lobby S', player).standard_restricted = True + world.get_door('Sanctuary S', player).standard_restricted = True world.get_door('PoD Mimics 2 SW', player).rupee_bow_restricted = True # bow statue # enemizer logic could get rid of the following restriction world.get_door('PoD Pit Room S', player).rupee_bow_restricted = True # so mimics 1 shouldn't be required diff --git a/Main.py b/Main.py index a412220e..02b7d032 100644 --- a/Main.py +++ b/Main.py @@ -34,7 +34,7 @@ from source.overworld.EntranceShuffle2 import link_entrances_new from source.tools.BPS import create_bps_from_data from source.classes.CustomSettings import CustomSettings -__version__ = '1.2.0.6-u' +__version__ = '1.2.0.7-u' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3ee20968..597cdc2f 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -108,6 +108,12 @@ These are now independent of retro mode and have three options: None, Random, an * Bonk Fairy (Dark) # Bug Fixes and Notes +* 1.2.0.7-u + * Fix for some misery mire key logic + * Minor standard generation fix + * Fix for inactive flute start + * Settingsfile for multiworld generation support + * Fix for duped HC/AT Maps/Compasses * 1.2.0.6-u * Fix for light cone in Escape when entering from Dark World post-zelda * Fix for light cone in Escape when lighting a torch with fire rod diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index e6c5a13a..a364530c 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -632,7 +632,7 @@ def do_fixed_shuffle(avail, entrance_list): rules = Restrictions() rules.size = size if ('Hyrule Castle Entrance (South)' in entrances and - avail.world.doorShuffle[avail.player] in ['basic', 'crossed']): + avail.world.doorShuffle[avail.player] != 'vanilla'): rules.must_exit_to_lw = True if 'Inverted Ganons Tower' in entrances and not avail.world.shuffle_ganon: rules.fixed = True