From fd6e1b3046a1132b5dfc231c52e919455dc3b14a Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Wed, 27 Apr 2022 21:43:16 -0500 Subject: [PATCH] OoT: fix bad interaction between dungeon_items: overworld and songs: dungeon --- worlds/oot/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py index dbc1167b..1a5f1be4 100644 --- a/worlds/oot/__init__.py +++ b/worlds/oot/__init__.py @@ -651,8 +651,9 @@ class OOTWorld(World): {'GanonBossKey': 4, 'BossKey': 3, 'SmallKey': 2, 'FortressSmallKey': 1}.get(item.type, 0)) non_dungeon_locations = [loc for loc in self.get_locations() if not loc.item and loc not in any_dungeon_locations - and loc.type != 'Shop' and ( - loc.type != 'Song' or self.shuffle_song_items != 'song')] + and loc.type != 'Shop' and + (loc.type != 'Song' or self.shuffle_song_items != 'song') and + (loc.name not in dungeon_song_locations or self.shuffle_song_items != 'dungeon')] self.world.random.shuffle(non_dungeon_locations) fill_restrictive(self.world, self.world.get_all_state(False), non_dungeon_locations, itempools['overworld'], True, True)