From 138003912c09a07c673e57e637edadf7abbc7113 Mon Sep 17 00:00:00 2001
From: compiling <8335770+compiling@users.noreply.github.com>
Date: Mon, 20 Jan 2020 23:57:01 +1100
Subject: [PATCH] Add all entrances as required paths (may be required for
 inaccessible regions).

---
 DoorShuffle.py      | 21 ++++++++-------------
 DungeonGenerator.py |  1 -
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/DoorShuffle.py b/DoorShuffle.py
index 915645ff..b6f2069f 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -1125,29 +1125,24 @@ def change_door_to_small_key(d, world, player):
 
 def determine_required_paths(world, player):
     paths = {
-        'Hyrule Castle': [],
+        'Hyrule Castle': ['Hyrule Castle Lobby', 'Hyrule Castle West Lobby', 'Hyrule Castle East Lobby'],
         'Eastern Palace': ['Eastern Boss'],
-        'Desert Palace': ['Desert Boss'],
+        'Desert Palace': ['Desert Main Lobby', 'Desert East Lobby', 'Desert West Lobby', 'Desert Boss'],
         'Tower of Hera': ['Hera Boss'],
         'Agahnims Tower': ['Tower Agahnim 1'],
         'Palace of Darkness': ['PoD Boss'],
         'Swamp Palace': ['Swamp Boss'],
-        'Skull Woods': ['Skull Boss'],
+        'Skull Woods': ['Skull 1 Lobby', 'Skull 2 East Lobby', 'Skull 2 West Lobby', 'Skull Boss'],
         'Thieves Town': ['Thieves Boss', ('Thieves Blind\'s Cell', 'Thieves Boss')],
         'Ice Palace': ['Ice Boss'],
         'Misery Mire': ['Mire Boss'],
-        'Turtle Rock': ['TR Boss'],
+        'Turtle Rock': ['TR Main Lobby', 'TR Lazy Eyes', 'TR Big Chest Entrance', 'TR Eye Bridge', 'TR Boss'],
         'Ganons Tower': ['GT Agahnim 2']
         }
-    if world.shuffle[player] == 'vanilla':
-        paths['Skull Woods'].insert(0, 'Skull 2 West Lobby')
-        paths['Turtle Rock'].insert(0, 'TR Eye Bridge')
-        paths['Turtle Rock'].insert(0, 'TR Big Chest Entrance')
-        paths['Turtle Rock'].insert(0, 'TR Lazy Eyes')
-        if world.mode[player] == 'standard':
-            paths['Hyrule Castle'].append('Hyrule Dungeon Cellblock')
-            # noinspection PyTypeChecker
-            paths['Hyrule Castle'].append(('Hyrule Dungeon Cellblock', 'Sanctuary'))
+    if world.mode[player] == 'standard':
+        paths['Hyrule Castle'].append('Hyrule Dungeon Cellblock')
+        # noinspection PyTypeChecker
+        paths['Hyrule Castle'].append(('Hyrule Dungeon Cellblock', 'Sanctuary'))
     if world.doorShuffle[player] in ['basic']:
         paths['Thieves Town'].append('Thieves Attic Window')
     return paths
diff --git a/DungeonGenerator.py b/DungeonGenerator.py
index e39d8629..1cedf455 100644
--- a/DungeonGenerator.py
+++ b/DungeonGenerator.py
@@ -52,7 +52,6 @@ def generate_dungeon(name, available_sectors, entrance_region_names, split_dunge
     itr = 0
     finished = False
     # flag if standard and this is hyrule castle
-    # std_flag = world.mode[player] == 'standard' and bk_special  # todo: multi
     std_flag = world.mode[player] == 'standard' and bk_special
     while not finished:
         # what are my choices?