Merge remote-tracking branch 'origin/DoorDev' into DoorDev

2020-03-02 19:58:42 -07:00
parent c2e22a6223 34774eb2d5
commit 62caf015c0
53 changed files with 4186 additions and 1981 deletions
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -165,7 +165,7 @@ def vanilla_key_logic(world, player):
            world.key_logic[player][builder.name] = key_layout.key_logic
            log_key_logic(builder.name, key_layout.key_logic)
            last_key = None
-    if world.shuffle[player] == 'vanilla':
+    if world.shuffle[player] == 'vanilla' and world.accessibility[player] == 'items':
        validate_vanilla_key_logic(world, player)