Skip to content

Commit d953927

Browse files
korydondzilakorydondzila
authored
Shivers: Renaming for clarity and consistency (#2869)
* Moves plaque location to front for better tracker referencing. * Tiki should be Shaman. * Hanging should be Gallows. * Merrick spelling. * Clarity change.
1 parent ecd84fd commit d953927

File tree

6 files changed

+156
-147
lines changed

6 files changed

+156
-147
lines changed

‎worlds/shivers/Items.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ItemData(typing.NamedTuple):
4747
"Key for Generator Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 29, "key"),
4848
"Key for Egypt Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 30, "key"),
4949
"Key for Library Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 31, "key"),
50-
"Key for Tiki Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 32, "key"),
50+
"Key for Shaman Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 32, "key"),
5151
"Key for UFO Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 33, "key"),
5252
"Key for Torture Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 34, "key"),
5353
"Key for Puzzle Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 35, "key"),
@@ -90,7 +90,7 @@ class ItemData(typing.NamedTuple):
9090
"Water Always Available in Lobby": ItemData(SHIVERS_ITEM_ID_OFFSET + 92, "filler2", ItemClassification.filler),
9191
"Wax Always Available in Library": ItemData(SHIVERS_ITEM_ID_OFFSET + 93, "filler2", ItemClassification.filler),
9292
"Wax Always Available in Anansi Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 94, "filler2", ItemClassification.filler),
93-
"Wax Always Available in Tiki Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 95, "filler2", ItemClassification.filler),
93+
"Wax Always Available in Shaman Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 95, "filler2", ItemClassification.filler),
9494
"Ash Always Available in Office": ItemData(SHIVERS_ITEM_ID_OFFSET + 96, "filler2", ItemClassification.filler),
9595
"Ash Always Available in Burial Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 97, "filler2", ItemClassification.filler),
9696
"Oil Always Available in Prehistoric Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 98, "filler2", ItemClassification.filler),

‎worlds/shivers/Options.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,38 @@ class LobbyAccess(Choice):
1313
option_local = 2
1414

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

2121
class InformationPlaques(Toggle):
22-
"""Adds Information Plaques as checks."""
22+
"""
23+
Adds Information Plaques as checks.
24+
(40 Locations)
25+
"""
2326
display_name = "Include Information Plaques"
2427

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

2932
class ElevatorsStaySolved(DefaultOnToggle):
30-
"""Adds elevators as checks and will remain open upon solving them."""
33+
"""
34+
Adds elevators as checks and will remain open upon solving them.
35+
(3 Locations)
36+
"""
3137
display_name = "Elevators Stay Solved"
3238

3339
class EarlyBeth(DefaultOnToggle):
3440
"""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."""
3541
display_name = "Early Beth"
3642

3743
class EarlyLightning(Toggle):
38-
"""Allows lightning to be captured at any point in the game. You will still need to capture all ten Ixupi for victory."""
44+
"""
45+
Allows lightning to be captured at any point in the game. You will still need to capture all ten Ixupi for victory.
46+
(1 Location)
47+
"""
3948
display_name = "Early Lightning"
4049

4150

‎worlds/shivers/Rules.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ def get_rules_lookup(player: int):
9696
"To Lobby From Egypt": lambda state: state.has("Key for Egypt Room", player),
9797
"To Egypt From Lobby": lambda state: state.has("Key for Egypt Room", player),
9898
"To Janitor Closet": lambda state: state.has("Key for Janitor Closet", player),
99-
"To Tiki From Burial": lambda state: state.has("Key for Tiki Room", player),
100-
"To Burial From Tiki": lambda state: state.has("Key for Tiki Room", player),
99+
"To Shaman From Burial": lambda state: state.has("Key for Shaman Room", player),
100+
"To Burial From Shaman": lambda state: state.has("Key for Shaman Room", player),
101101
"To Inventions From UFO": lambda state: state.has("Key for UFO Room", player),
102102
"To UFO From Inventions": lambda state: state.has("Key for UFO Room", player),
103103
"To Torture From Inventions": lambda state: state.has("Key for Torture Room", player),
@@ -145,7 +145,7 @@ def get_rules_lookup(player: int):
145145
"locations_puzzle_hints": {
146146
"Puzzle Solved Clock Tower Door": lambda state: state.can_reach("Three Floor Elevator", "Region", player),
147147
"Puzzle Solved Clock Chains": lambda state: state.can_reach("Bedroom", "Region", player),
148-
"Puzzle Solved Tiki Drums": lambda state: state.can_reach("Clock Tower", "Region", player),
148+
"Puzzle Solved Shaman Drums": lambda state: state.can_reach("Clock Tower", "Region", player),
149149
"Puzzle Solved Red Door": lambda state: state.can_reach("Maintenance Tunnels", "Region", player),
150150
"Puzzle Solved UFO Symbols": lambda state: state.can_reach("Library", "Region", player),
151151
"Puzzle Solved Maze Door": lambda state: state.can_reach("Projector Room", "Region", player),
@@ -202,7 +202,7 @@ def set_rules(world: "ShiversWorld") -> None:
202202
forbid_item(multiworld.get_location("Ixupi Captured Water", player), "Water Always Available in Lobby", player)
203203
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Library", player)
204204
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Anansi Room", player)
205-
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Tiki Room", player)
205+
forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Shaman Room", player)
206206
forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Office", player)
207207
forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Burial Room", player)
208208
forbid_item(multiworld.get_location("Ixupi Captured Oil", player), "Oil Always Available in Prehistoric Room", player)

‎worlds/shivers/data/excluded_locations.json

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
{
22
"plaques": [
3-
"Information Plaque: Transforming Masks (Lobby)",
4-
"Information Plaque: Jade Skull (Lobby)",
5-
"Information Plaque: Bronze Unicorn (Prehistoric)",
6-
"Information Plaque: Griffin (Prehistoric)",
7-
"Information Plaque: Eagles Nest (Prehistoric)",
8-
"Information Plaque: Large Spider (Prehistoric)",
9-
"Information Plaque: Starfish (Prehistoric)",
10-
"Information Plaque: Quartz Crystal (Ocean)",
11-
"Information Plaque: Poseidon (Ocean)",
12-
"Information Plaque: Colossus of Rhodes (Ocean)",
13-
"Information Plaque: Poseidon's Temple (Ocean)",
14-
"Information Plaque: Subterranean World (Underground Maze)",
15-
"Information Plaque: Dero (Underground Maze)",
16-
"Information Plaque: Tomb of the Ixupi (Egypt)",
17-
"Information Plaque: The Sphinx (Egypt)",
18-
"Information Plaque: Curse of Anubis (Egypt)",
19-
"Information Plaque: Norse Burial Ship (Burial)",
20-
"Information Plaque: Paracas Burial Bundles (Burial)",
21-
"Information Plaque: Spectacular Coffins of Ghana (Burial)",
22-
"Information Plaque: Cremation (Burial)",
23-
"Information Plaque: Animal Crematorium (Burial)",
24-
"Information Plaque: Witch Doctors of the Congo (Tiki)",
25-
"Information Plaque: Sarombe doctor of Mozambique (Tiki)",
26-
"Information Plaque: Fisherman's Canoe God (Gods)",
27-
"Information Plaque: Mayan Gods (Gods)",
28-
"Information Plaque: Thor (Gods)",
29-
"Information Plaque: Celtic Janus Sculpture (Gods)",
30-
"Information Plaque: Sumerian Bull God - An (Gods)",
31-
"Information Plaque: Sumerian Lyre (Gods)",
32-
"Information Plaque: Chuen (Gods)",
33-
"Information Plaque: African Creation Myth (Anansi)",
34-
"Information Plaque: Apophis the Serpent (Anansi)",
35-
"Information Plaque: Death (Anansi)",
36-
"Information Plaque: Cyclops (Pegasus)",
37-
"Information Plaque: Lycanthropy (Werewolf)",
38-
"Information Plaque: Coincidence or Extraterrestrial Visits? (UFO)",
39-
"Information Plaque: Planets (UFO)",
40-
"Information Plaque: Astronomical Construction (UFO)",
41-
"Information Plaque: Guillotine (Torture)",
42-
"Information Plaque: Aliens (UFO)"
3+
"Information Plaque: (Lobby) Transforming Masks",
4+
"Information Plaque: (Lobby) Jade Skull",
5+
"Information Plaque: (Prehistoric) Bronze Unicorn",
6+
"Information Plaque: (Prehistoric) Griffin",
7+
"Information Plaque: (Prehistoric) Eagles Nest",
8+
"Information Plaque: (Prehistoric) Large Spider",
9+
"Information Plaque: (Prehistoric) Starfish",
10+
"Information Plaque: (Ocean) Quartz Crystal",
11+
"Information Plaque: (Ocean) Poseidon",
12+
"Information Plaque: (Ocean) Colossus of Rhodes",
13+
"Information Plaque: (Ocean) Poseidon's Temple",
14+
"Information Plaque: (Underground Maze) Subterranean World",
15+
"Information Plaque: (Underground Maze) Dero",
16+
"Information Plaque: (Egypt) Tomb of the Ixupi",
17+
"Information Plaque: (Egypt) The Sphinx",
18+
"Information Plaque: (Egypt) Curse of Anubis",
19+
"Information Plaque: (Burial) Norse Burial Ship",
20+
"Information Plaque: (Burial) Paracas Burial Bundles",
21+
"Information Plaque: (Burial) Spectacular Coffins of Ghana",
22+
"Information Plaque: (Burial) Cremation",
23+
"Information Plaque: (Burial) Animal Crematorium",
24+
"Information Plaque: (Shaman) Witch Doctors of the Congo",
25+
"Information Plaque: (Shaman) Sarombe doctor of Mozambique",
26+
"Information Plaque: (Gods) Fisherman's Canoe God",
27+
"Information Plaque: (Gods) Mayan Gods",
28+
"Information Plaque: (Gods) Thor",
29+
"Information Plaque: (Gods) Celtic Janus Sculpture",
30+
"Information Plaque: (Gods) Sumerian Bull God - An",
31+
"Information Plaque: (Gods) Sumerian Lyre",
32+
"Information Plaque: (Gods) Chuen",
33+
"Information Plaque: (Anansi) African Creation Myth",
34+
"Information Plaque: (Anansi) Apophis the Serpent",
35+
"Information Plaque: (Anansi) Death",
36+
"Information Plaque: (Pegasus) Cyclops",
37+
"Information Plaque: (Werewolf) Lycanthropy",
38+
"Information Plaque: (UFO) Coincidence or Extraterrestrial Visits?",
39+
"Information Plaque: (UFO) Planets",
40+
"Information Plaque: (UFO) Astronomical Construction",
41+
"Information Plaque: (Torture) Guillotine",
42+
"Information Plaque: (UFO) Aliens"
4343
],
4444
"elevators": [
4545
"Puzzle Solved Office Elevator",

0 commit comments

Comments
 (0)