From 326262203f0c106eb0fc03ede1f243bf0bf2c415 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 10 Jun 2020 06:17:10 +0200 Subject: [PATCH] remove pinball key if keyshuffle --- Dungeons.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Dungeons.py b/Dungeons.py index 9da540bd..55b20c87 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -47,7 +47,7 @@ def fill_dungeons(world): all_state_base = world.get_all_state() for player in range(1, world.players + 1): - if not world.retro[player] and world.logic == "noglitches": + if not world.retro[player] and world.logic == "noglitches" and not world.keyshuffle[player]: pinball_room = world.get_location('Skull Woods - Pinball Room', player) world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False) pinball_room.event = True @@ -124,14 +124,12 @@ def fill_dungeons_restrictive(world, shuffled_locations): all_state_base = world.get_all_state() for player in range(1, world.players + 1): - pinball_room = world.get_location('Skull Woods - Pinball Room', player) - if world.retro[player]: - world.push_item(pinball_room, ItemFactory('Small Key (Universal)', player), False) - else: + if not world.retro[player] and world.logic == "noglitches" and not world.keyshuffle[player]: + pinball_room = world.get_location('Skull Woods - Pinball Room', player) world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False) - pinball_room.event = True - pinball_room.locked = True - shuffled_locations.remove(pinball_room) + pinball_room.event = True + pinball_room.locked = True + shuffled_locations.remove(pinball_room) # with shuffled dungeon items they are distributed as part of the normal item pool for item in world.get_items():