1 files changed, 3 insertions, 6 deletions

@@ -42,12 +42,6 @@ def lingo_can_use_level_2_location(state: CollectionState, world: "LingoWorld"):
                 counted_panels += panel_count
         if counted_panels >= world.options.level_2_requirement.value - 1:
             return True
-    # THE MASTER has to be handled separately, because it has special access rules.
-    if state.can_reach("Orange Tower Seventh Floor", "Region", world.player)\
-            and lingo_can_use_mastery_location(state, world):
-        counted_panels += 1
-    if counted_panels >= world.options.level_2_requirement.value - 1:
-        return True
     return False
 
 
@@ -65,6 +59,9 @@ def _lingo_can_satisfy_requirements(state: CollectionState, access: AccessRequir
             if not state.has(color.capitalize(), world.player):
                 return False
 
+    if access.the_master and not lingo_can_use_mastery_location(state, world):
+        return False
+
     return True