From 4d6257f872a727f435f7d385b256bd00b3dab1b4 Mon Sep 17 00:00:00 2001 From: LLCoolDave Date: Sat, 20 May 2017 14:05:15 +0200 Subject: [PATCH] Dungeons: Place TRock keys first as it's the only dungeon that has requirements about reachability of one of its entrances, which may lead to circular issues if that entrance is blocked through a dungeon that hasn't had its keys placed yet. --- Dungeons.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dungeons.py b/Dungeons.py index da8b145d..8d6ff715 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -23,7 +23,7 @@ def fill_dungeons(world): # this key is in a fixed location (for now) world.push_item(world.get_location('[dungeon - D3 - B1] Skull Woods - South of Big Chest'), SWSmallKey(), False) - for dungeon_regions, big_key, small_keys, dungeon_items in [ES, EP, DP, ToH, AT, PoD, TT, SW, SP, IP, MM, TR, GT]: + for dungeon_regions, big_key, small_keys, dungeon_items in [TR, ES, EP, DP, ToH, AT, PoD, TT, SW, SP, IP, MM, GT]: # this is what we need to fill dungeon_locations = [location for location in world.get_unfilled_locations() if location.parent_region.name in dungeon_regions] random.shuffle(dungeon_locations) @@ -61,7 +61,7 @@ def fill_dungeons(world): all_state._clear_cache() # next place dungeon items - if True: # optional in future + if world.place_dungeon_items: for dungeon_item in dungeon_items: di_location = dungeon_locations.pop() world.push_item(di_location, dungeon_item, False)