diff --git a/worlds/shivers/Rules.py b/worlds/shivers/Rules.py index 4e1058fecfc8..62f4cd6a077f 100644 --- a/worlds/shivers/Rules.py +++ b/worlds/shivers/Rules.py @@ -154,11 +154,11 @@ def get_rules_lookup(player: int): "Final Riddle: Guillotine Dropped": lambda state: state.can_reach("Underground Lake", "Region", player) }, "elevators": { - "Puzzle Solved Underground Elevator": lambda state: ((state.can_reach("Underground Lake", "Region", player) or state.can_reach("Office", "Region", player) - and state.has("Key for Office Elevator", player))), + "Puzzle Solved Office Elevator": lambda state: ((state.can_reach("Underground Lake", "Region", player) or state.can_reach("Office", "Region", player)) + and state.has("Key for Office Elevator", player)), "Puzzle Solved Bedroom Elevator": lambda state: (state.can_reach("Office", "Region", player) and state.has_all({"Key for Bedroom Elevator","Crawling"}, player)), - "Puzzle Solved Three Floor Elevator": lambda state: (((state.can_reach("Maintenance Tunnels", "Region", player) or state.can_reach("Blue Maze", "Region", player)) - and state.has("Key for Three Floor Elevator", player))) + "Puzzle Solved Three Floor Elevator": lambda state: ((state.can_reach("Maintenance Tunnels", "Region", player) or state.can_reach("Blue Maze", "Region", player)) + and state.has("Key for Three Floor Elevator", player)) }, "lightning": { "Ixupi Captured Lightning": lambda state: lightning_capturable(state, player) diff --git a/worlds/shivers/data/excluded_locations.json b/worlds/shivers/data/excluded_locations.json index 6ed625077af8..a37285eb1d29 100644 --- a/worlds/shivers/data/excluded_locations.json +++ b/worlds/shivers/data/excluded_locations.json @@ -42,7 +42,7 @@ "Information Plaque: Aliens (UFO)" ], "elevators": [ - "Puzzle Solved Underground Elevator", + "Puzzle Solved Office Elevator", "Puzzle Solved Bedroom Elevator", "Puzzle Solved Three Floor Elevator" ], diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json index 7d031b886bff..fdf8ed69d1e5 100644 --- a/worlds/shivers/data/locations.json +++ b/worlds/shivers/data/locations.json @@ -110,7 +110,7 @@ "Information Plaque: Astronomical Construction (UFO)", "Information Plaque: Guillotine (Torture)", "Information Plaque: Aliens (UFO)", - "Puzzle Solved Underground Elevator", + "Puzzle Solved Office Elevator", "Puzzle Solved Bedroom Elevator", "Puzzle Solved Three Floor Elevator", "Ixupi Captured Lightning" @@ -129,7 +129,7 @@ "Ixupi Captured Sand", "Ixupi Captured Metal", "Ixupi Captured Lightning", - "Puzzle Solved Underground Elevator", + "Puzzle Solved Office Elevator", "Puzzle Solved Three Floor Elevator", "Puzzle Hint Found: Combo Lock in Mailbox", "Puzzle Hint Found: Orange Symbol",