Merge pull request #7 from Mathx2/main

Key rule prep for room rando
GodlFire · Oct 1, 2023 · 3693d96 · 3693d96
2 parents 6ff2280 + bd48138
commit 3693d96
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/worlds/shivers/Rules.py b/worlds/shivers/Rules.py
@@ -91,25 +91,32 @@ def get_rules_lookup(player: int):
             "To Office Elevator From Underground Blue Tunnels": lambda state: state.has("Key for Office Elevator", player),
             "To Office Elevator From Office": lambda state: state.has("Key for Office Elevator", player),
             "To Bedroom Elevator From Office": lambda state: state.has("Key for Bedroom Elevator", player) and state.has("Crawling", player),
+            "To Office From Bedroom Elevator": lambda state: state.has("Key for Bedroom Elevator", player) and state.has("Crawling", player),
             "To Three Floor Elevator From Maintenance Tunnels": lambda state: state.has("Key for Three Floor Elevator", player),
             "To Three Floor Elevator From Blue Maze Bottom": lambda state: state.has("Key for Three Floor Elevator", player),
             "To Three Floor Elevator From Blue Maze Top": lambda state: state.has("Key for Three Floor Elevator", player),
             "To Workshop": lambda state: state.has("Key for Workshop", player),
             "To Lobby From Office": lambda state: state.has("Key for Office", player),
             "To Office From Lobby": lambda state: state.has("Key for Office", player),
             "To Library From Lobby": lambda state: state.has("Key for Library Room", player),
-            "To Lobby From Egypt": lambda state: state.has("Key for Egypt Room", player),
+            "To Lobby From Library": lambda state: state.has("Key for Library Room", player),
             "To Prehistoric From Lobby": lambda state: state.has("Key for Prehistoric Room", player),
+            "To Lobby From Prehistoric": lambda state: state.has("Key for Prehistoric Room", player),
             "To Greenhouse": lambda state: state.has("Key for Greenhouse Room", player),
             "To Ocean From Prehistoric": lambda state: state.has("Key for Ocean Room", player),
+            "To Prehistoric From Ocean": lambda state: state.has("Key for Ocean Room", player),
             "To Projector Room": lambda state: state.has("Key for Projector Room", player),
             "To Generator": lambda state: state.has("Key for Generator Room", player),
+            "To Lobby From Egypt": lambda state: state.has("Key for Egypt Room", player),
             "To Egypt From Lobby": lambda state: state.has("Key for Egypt Room", player),
             "To Janitor Closet": lambda state: state.has("Key for Janitor Closet", player),
             "To Tiki From Burial": lambda state: state.has("Key for Tiki Room", player),
+            "To Burial From Tiki": lambda state: state.has("Key for Tiki Room", player),
             "To Inventions From UFO": lambda state: state.has("Key for UFO Room", player),
             "To UFO From Inventions": lambda state: state.has("Key for UFO Room", player),
             "To Torture From Inventions": lambda state: state.has("Key for Torture Room", player),
+            "To Inventions From Torture": lambda state: state.has("Key for Torture Room", player),
+            "To Torture": lambda state: state.has("Key for Puzzle Room", player),
             "To Puzzle Room Mastermind From Torture": lambda state: state.has("Key for Puzzle Room", player),
             "To Bedroom": lambda state: state.has("Key for Bedroom", player),
             "To Underground Lake From Underground Tunnels": lambda state: state.has("Key for Underground Lake Room", player),