From af488e653e8b777724dfc4735666bde5c37cbe3d Mon Sep 17 00:00:00 2001 From: compiling <8335770+compiling@users.noreply.github.com> Date: Sun, 8 Nov 2020 12:00:19 +1100 Subject: [PATCH] Allow key drop pots to be shuffled anywhere if they contain general items --- PotShuffle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PotShuffle.py b/PotShuffle.py index 66602eb6..1b24edf7 100644 --- a/PotShuffle.py +++ b/PotShuffle.py @@ -295,7 +295,7 @@ def shuffle_pots(world, player): elif old_pot.item == PotItem.Switch: available_pots = (pot for pot in new_pots if (pot.room == old_pot.room or pot.room in movable_switch_rooms[old_pot.room]) and not (pot.flags & PotFlags.NoSwitch)) elif old_pot.item == PotItem.Key: - if world.doorShuffle[player] == 'vanilla' and not world.retro[player] and world.logic != 'nologic': + if world.doorShuffle[player] == 'vanilla' and not world.retro[player] and not world.keydropshuffle[player] and world.logic != 'nologic': available_pots = (pot for pot in new_pots if pot.room not in invalid_key_rooms) else: available_pots = new_pots