From d10ddb17b6304e384bd92ea0d02bd0747ac9ee90 Mon Sep 17 00:00:00 2001 From: Alchav <59858495+Alchav@users.noreply.github.com> Date: Tue, 28 Dec 2021 12:54:42 -0500 Subject: [PATCH] Let make_dungeon set up items, then replace --- worlds/alttp/Dungeons.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/worlds/alttp/Dungeons.py b/worlds/alttp/Dungeons.py index 2b1789c3..4b0814d3 100644 --- a/worlds/alttp/Dungeons.py +++ b/worlds/alttp/Dungeons.py @@ -3,23 +3,13 @@ from worlds.alttp.Bosses import BossFactory from Fill import fill_restrictive from worlds.alttp.Items import ItemFactory from worlds.alttp.Regions import lookup_boss_drops -from worlds.alttp.Options import smallkey_shuffle, bigkey_shuffle, compass_shuffle, map_shuffle +from worlds.alttp.Options import smallkey_shuffle def create_dungeons(world, player): def make_dungeon(name, default_boss, dungeon_regions, big_key, small_keys, dungeon_items): - if world.bigkey_shuffle[player] == bigkey_shuffle.option_start_with: - big_key = None - if world.smallkey_shuffle[player] == smallkey_shuffle.option_universal or world.smallkey_shuffle[player] == smallkey_shuffle.option_start_with: - small_keys = [] - for dungeonitem in dungeon_items: - if dungeonitem.type == 'Map' and world.map_shuffle[player] == map_shuffle.option_start_with: - dungeon_items.remove(dungeonitem) - for dungeonitem in dungeon_items: - if dungeonitem.type == 'Compass' and world.compass_shuffle[player] == compass_shuffle.option_start_with: - dungeon_items.remove(dungeonitem) dungeon = Dungeon(name, dungeon_regions, big_key, - small_keys, + [] if world.smallkey_shuffle[player] == smallkey_shuffle.option_universal else small_keys, dungeon_items, player) for item in dungeon.all_items: item.dungeon = dungeon