Merged in DR v0.4.0.8

2021-07-07 19:45:14 -05:00
parent d110555691 ffcc78f95c
commit 02d3b46ae4
18 changed files with 273 additions and 66 deletions
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -1482,14 +1482,12 @@ def link_entrances(world, player):
        blacksmith_hut = blacksmith_doors.pop()
        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
        doors.remove(blacksmith_hut)
-        exit_pool.remove(blacksmith_hut)

        # place dam and pyramid fairy, have limited options
        random.shuffle(bomb_shop_doors)
        bomb_shop = bomb_shop_doors.pop()
        connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
        doors.remove(bomb_shop)
-        exit_pool.remove(bomb_shop)

        # handle remaining caves
        for cave in caves: