From af30d8b7cdb39371246333bb80d0a3d3399b10ac Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 24 Jul 2021 01:42:00 +0200 Subject: [PATCH] ensure Hyrule Castle Small Key locality in standard + small key shuffle --- Fill.py | 3 ++- Generate.py | 2 +- Main.py | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Fill.py b/Fill.py index c78d319f..18d43a4f 100644 --- a/Fill.py +++ b/Fill.py @@ -355,7 +355,8 @@ def balance_multiworld_progression(world: MultiWorld): if world.has_beaten_game(state): break elif not sphere_locations: - raise RuntimeError('Not all required items reachable. Something went terribly wrong here.') + logging.warning("Progression Balancing ran out of paths.") + break def swap_location_item(location_1: Location, location_2: Location, check_locked=True): diff --git a/Generate.py b/Generate.py index 9f34bb81..35f3b7e9 100644 --- a/Generate.py +++ b/Generate.py @@ -212,7 +212,7 @@ def main(args=None, callback=ERmain): logging.debug(f"No player settings defined for option '{option}'") if args.outputpath: os.makedirs(args.outputpath, exist_ok=True) - with open(os.path.join(args.outputpath if args.outputpath else ".", f"mystery_result_{seed}.yaml"), "wt") as f: + with open(os.path.join(args.outputpath if args.outputpath else ".", f"generate_{seed_name}.yaml"), "wt") as f: yaml.dump(important, f) callback(erargs, seed) diff --git a/Main.py b/Main.py index 89c1d839..0c0ec043 100644 --- a/Main.py +++ b/Main.py @@ -180,7 +180,9 @@ def main(args, seed=None): if not world.keyshuffle[player]: world.non_local_items[player] -= item_name_groups['Small Keys'] - + # This could probably use a more elegant solution. + elif world.keyshuffle[player] == True and world.mode[player] == "Standard": + world.local_items[player].add("Small Key (Hyrule Castle)") if not world.bigkeyshuffle[player]: world.non_local_items[player] -= item_name_groups['Big Keys']