Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shivers: Renaming for clarity and consistency #2869

Merged
merged 5 commits into from
Mar 12, 2024
Merged

Shivers: Renaming for clarity and consistency #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b29a50f
Moves plaque location to front for better tracker referencing.
korydondzila Feb 26, 2024
b65a05a
Tiki should be Shaman.
korydondzila Feb 26, 2024
61c19fe
Hanging should be Gallows.
korydondzila Feb 26, 2024
a17868a
Merrick spelling.
korydondzila Feb 26, 2024
e039da6
Clarity change.
korydondzila Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions worlds/shivers/Items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ItemData(typing.NamedTuple):
"Key for Generator Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 29, "key"),
"Key for Egypt Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 30, "key"),
"Key for Library Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 31, "key"),
"Key for Tiki Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 32, "key"),
"Key for Shaman Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 32, "key"),
"Key for UFO Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 33, "key"),
"Key for Torture Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 34, "key"),
"Key for Puzzle Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 35, "key"),
Expand Down Expand Up @@ -90,7 +90,7 @@ class ItemData(typing.NamedTuple):
"Water Always Available in Lobby": ItemData(SHIVERS_ITEM_ID_OFFSET + 92, "filler2", ItemClassification.filler),
"Wax Always Available in Library": ItemData(SHIVERS_ITEM_ID_OFFSET + 93, "filler2", ItemClassification.filler),
"Wax Always Available in Anansi Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 94, "filler2", ItemClassification.filler),
"Wax Always Available in Tiki Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 95, "filler2", ItemClassification.filler),
"Wax Always Available in Shaman Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 95, "filler2", ItemClassification.filler),
"Ash Always Available in Office": ItemData(SHIVERS_ITEM_ID_OFFSET + 96, "filler2", ItemClassification.filler),
"Ash Always Available in Burial Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 97, "filler2", ItemClassification.filler),
"Oil Always Available in Prehistoric Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 98, "filler2", ItemClassification.filler),
Expand Down
17 changes: 13 additions & 4 deletions worlds/shivers/Options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,38 @@ class LobbyAccess(Choice):
option_local = 2

class PuzzleHintsRequired(DefaultOnToggle):
"""If turned on puzzle hints will be available before the corresponding puzzle is required. For example: The Tiki
"""If turned on puzzle hints will be available before the corresponding puzzle is required. For example: The Shaman
Drums puzzle will be placed after access to the security cameras which give you the solution. Turning this off
allows for greater randomization."""
display_name = "Puzzle Hints Required"

class InformationPlaques(Toggle):
"""Adds Information Plaques as checks."""
"""
Adds Information Plaques as checks.
(40 Locations)
"""
display_name = "Include Information Plaques"

class FrontDoorUsable(Toggle):
"""Adds a key to unlock the front door of the museum."""
display_name = "Front Door Usable"

class ElevatorsStaySolved(DefaultOnToggle):
"""Adds elevators as checks and will remain open upon solving them."""
"""
Adds elevators as checks and will remain open upon solving them.
(3 Locations)
"""
display_name = "Elevators Stay Solved"

class EarlyBeth(DefaultOnToggle):
"""Beth's body is open at the start of the game. This allows any pot piece to be placed in the slide and early checks on the second half of the final riddle."""
display_name = "Early Beth"

class EarlyLightning(Toggle):
"""Allows lightning to be captured at any point in the game. You will still need to capture all ten Ixupi for victory."""
"""
Allows lightning to be captured at any point in the game. You will still need to capture all ten Ixupi for victory.
(1 Location)
"""
display_name = "Early Lightning"


Expand Down
8 changes: 4 additions & 4 deletions worlds/shivers/Rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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)
Expand Down
80 changes: 40 additions & 40 deletions worlds/shivers/data/excluded_locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
{
"plaques": [
"Information Plaque: Transforming Masks (Lobby)",
"Information Plaque: Jade Skull (Lobby)",
"Information Plaque: Bronze Unicorn (Prehistoric)",
"Information Plaque: Griffin (Prehistoric)",
"Information Plaque: Eagles Nest (Prehistoric)",
"Information Plaque: Large Spider (Prehistoric)",
"Information Plaque: Starfish (Prehistoric)",
"Information Plaque: Quartz Crystal (Ocean)",
"Information Plaque: Poseidon (Ocean)",
"Information Plaque: Colossus of Rhodes (Ocean)",
"Information Plaque: Poseidon's Temple (Ocean)",
"Information Plaque: Subterranean World (Underground Maze)",
"Information Plaque: Dero (Underground Maze)",
"Information Plaque: Tomb of the Ixupi (Egypt)",
"Information Plaque: The Sphinx (Egypt)",
"Information Plaque: Curse of Anubis (Egypt)",
"Information Plaque: Norse Burial Ship (Burial)",
"Information Plaque: Paracas Burial Bundles (Burial)",
"Information Plaque: Spectacular Coffins of Ghana (Burial)",
"Information Plaque: Cremation (Burial)",
"Information Plaque: Animal Crematorium (Burial)",
"Information Plaque: Witch Doctors of the Congo (Tiki)",
"Information Plaque: Sarombe doctor of Mozambique (Tiki)",
"Information Plaque: Fisherman's Canoe God (Gods)",
"Information Plaque: Mayan Gods (Gods)",
"Information Plaque: Thor (Gods)",
"Information Plaque: Celtic Janus Sculpture (Gods)",
"Information Plaque: Sumerian Bull God - An (Gods)",
"Information Plaque: Sumerian Lyre (Gods)",
"Information Plaque: Chuen (Gods)",
"Information Plaque: African Creation Myth (Anansi)",
"Information Plaque: Apophis the Serpent (Anansi)",
"Information Plaque: Death (Anansi)",
"Information Plaque: Cyclops (Pegasus)",
"Information Plaque: Lycanthropy (Werewolf)",
"Information Plaque: Coincidence or Extraterrestrial Visits? (UFO)",
"Information Plaque: Planets (UFO)",
"Information Plaque: Astronomical Construction (UFO)",
"Information Plaque: Guillotine (Torture)",
"Information Plaque: Aliens (UFO)"
"Information Plaque: (Lobby) Transforming Masks",
"Information Plaque: (Lobby) Jade Skull",
"Information Plaque: (Prehistoric) Bronze Unicorn",
"Information Plaque: (Prehistoric) Griffin",
"Information Plaque: (Prehistoric) Eagles Nest",
"Information Plaque: (Prehistoric) Large Spider",
"Information Plaque: (Prehistoric) Starfish",
"Information Plaque: (Ocean) Quartz Crystal",
"Information Plaque: (Ocean) Poseidon",
"Information Plaque: (Ocean) Colossus of Rhodes",
"Information Plaque: (Ocean) Poseidon's Temple",
"Information Plaque: (Underground Maze) Subterranean World",
"Information Plaque: (Underground Maze) Dero",
"Information Plaque: (Egypt) Tomb of the Ixupi",
"Information Plaque: (Egypt) The Sphinx",
"Information Plaque: (Egypt) Curse of Anubis",
"Information Plaque: (Burial) Norse Burial Ship",
"Information Plaque: (Burial) Paracas Burial Bundles",
"Information Plaque: (Burial) Spectacular Coffins of Ghana",
"Information Plaque: (Burial) Cremation",
"Information Plaque: (Burial) Animal Crematorium",
"Information Plaque: (Shaman) Witch Doctors of the Congo",
"Information Plaque: (Shaman) Sarombe doctor of Mozambique",
"Information Plaque: (Gods) Fisherman's Canoe God",
"Information Plaque: (Gods) Mayan Gods",
"Information Plaque: (Gods) Thor",
"Information Plaque: (Gods) Celtic Janus Sculpture",
"Information Plaque: (Gods) Sumerian Bull God - An",
"Information Plaque: (Gods) Sumerian Lyre",
"Information Plaque: (Gods) Chuen",
"Information Plaque: (Anansi) African Creation Myth",
"Information Plaque: (Anansi) Apophis the Serpent",
"Information Plaque: (Anansi) Death",
"Information Plaque: (Pegasus) Cyclops",
"Information Plaque: (Werewolf) Lycanthropy",
"Information Plaque: (UFO) Coincidence or Extraterrestrial Visits?",
"Information Plaque: (UFO) Planets",
"Information Plaque: (UFO) Astronomical Construction",
"Information Plaque: (Torture) Guillotine",
"Information Plaque: (UFO) Aliens"
],
"elevators": [
"Puzzle Solved Office Elevator",
Expand Down
Loading
Loading