The Witness: Expert & Hints (#1072)

worlds/witness/locations.py

@@ -3,7 +3,8 @@ Defines constants for different types of locations in the game
 """
 
 from .Options import is_option_enabled, get_option_value
-from .player_logic import StaticWitnessLogic, WitnessPlayerLogic
+from .player_logic import WitnessPlayerLogic
+from .static_logic import StaticWitnessLogic
 
 
 class StaticWitnessLocations:
@@ -52,8 +53,6 @@ class StaticWitnessLocations:
         "Desert Light Room 3",
         "Desert Pond Room 5",
         "Desert Flood Room 6",
-        "Desert Final Bent 3",
-        "Desert Final Hexagonal",
         "Desert Laser Panel",
 
         "Quarry Mill Lower Row 6",
@@ -247,6 +246,10 @@ class WitnessPlayerLocations:
             StaticWitnessLocations.GENERAL_LOCATIONS
         )
 
+        if get_option_value(world, player, "puzzle_randomization") == 1:
+            self.CHECK_LOCATIONS.remove("Keep Pressure Plates 4")
+            self.CHECK_LOCATIONS.add("Keep Pressure Plates 2")
+
         doors = get_option_value(world, player, "shuffle_doors") >= 2
         earlyutm = is_option_enabled(world, player, "early_secret_area")
         victory = get_option_value(world, player, "victory_condition")