Those ain't gonna work

NewSoupVi · Dec 31, 2023 · 2fcff32 · 2fcff32
1 parent c32c9da
commit 2fcff32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
@@ -135,14 +135,14 @@ def generate_early(self):
         interacts_with_multiworld = (
                 self.options.shuffle_symbols or
                 self.options.shuffle_doors or
-                self.options.shuffle_lasers == "anywhere"
+                self.options.shuffle_lasers == 2
         )
 
         has_progression = (
                 interacts_with_multiworld
-                or self.options.shuffle_lasers == "local"
+                or self.options.shuffle_lasers == 1
                 or self.options.shuffle_boat
-                or self.options.early_caves == "add_to_pool"
+                or self.options.early_caves == 1
         )
 
         if not has_progression and self.multiworld.players == 1:

diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
@@ -378,7 +378,7 @@ def make_options_adjustments(self, world: "WitnessWorld"):
         if lasers:
             adjustment_linesets_in_order.append(get_laser_shuffle())
 
-        if world.options.shuffle_EPs == "obelisk_sides":
+        if world.options.shuffle_EPs == 2:
             ep_gen = ((ep_hex, ep_obj) for (ep_hex, ep_obj) in self.REFERENCE_LOGIC.ENTITIES_BY_HEX.items()
                       if ep_obj["entityType"] == "EP")