Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago into oot

2021-11-24 17:57:06 -06:00
parent 428177bdca 5a03c0edd6
commit 6641b13511
57 changed files with 976 additions and 1602 deletions
--- a/worlds/oot/init.py
+++ b/worlds/oot/init.py
@@ -147,7 +147,7 @@ class OOTWorld(World):
        # Incompatible option handling
        # ER and glitched logic are not compatible; glitched takes priority
        if self.logic_rules == 'glitched':
-            self.shuffle_interior_entrances = False
+            self.shuffle_interior_entrances = 'off'
            self.shuffle_grotto_entrances = False
            self.shuffle_dungeon_entrances = False
            self.shuffle_overworld_entrances = False