morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Shivers: Renaming for clarity and consistency (#2869)

Browse Source 
* Moves plaque location to front for better tracker referencing.

* Tiki should be Shaman.

* Hanging should be Gallows.

* Merrick spelling.

* Clarity change.
This commit is contained in:
Kory Dondzila
2024-03-12 17:17:18 -05:00
committed by GitHub
parent ecd84fd1ca
commit d953927b3a
6 changed files with 155 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/shivers/Rules.py
View File

@@ -96,8 +96,8 @@ def get_rules_lookup(player: int):
"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 Shaman From Burial": lambda state: state.has("Key for Shaman Room", player),
"To Burial From Shaman": lambda state: state.has("Key for Shaman 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),
@@ -145,7 +145,7 @@ def get_rules_lookup(player: int):
"locations_puzzle_hints": {
"Puzzle Solved Clock Tower Door": lambda state: state.can_reach("Three Floor Elevator", "Region", player),
"Puzzle Solved Clock Chains": lambda state: state.can_reach("Bedroom", "Region", player),
"Puzzle Solved Tiki Drums": lambda state: state.can_reach("Clock Tower", "Region", player),
"Puzzle Solved Shaman Drums": lambda state: state.can_reach("Clock Tower", "Region", player),
"Puzzle Solved Red Door": lambda state: state.can_reach("Maintenance Tunnels", "Region", player),
"Puzzle Solved UFO Symbols": lambda state: state.can_reach("Library", "Region", player),
"Puzzle Solved Maze Door": lambda state: state.can_reach("Projector Room", "Region", player),
@@ -202,7 +202,7 @@ def set_rules(world: "ShiversWorld") -> None:
forbid_item(multiworld.get_location("Ixupi Captured Water", player), "Water Always Available in Lobby", player)
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Library", player)
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Anansi Room", player)
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Tiki Room", player)
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Shaman Room", player)
forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Office", player)
forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Burial Room", player)
forbid_item(multiworld.get_location("Ixupi Captured Oil", player), "Oil Always Available in Prehistoric Room", player)