From b29a50fbabdf7116b658ce04f228d310098afaf6 Mon Sep 17 00:00:00 2001 From: Kory Dondzila Date: Mon, 26 Feb 2024 14:03:14 -0500 Subject: [PATCH 1/5] Moves plaque location to front for better tracker referencing. --- worlds/shivers/Options.py | 15 +- worlds/shivers/data/excluded_locations.json | 80 +++++----- worlds/shivers/data/locations.json | 160 ++++++++++---------- 3 files changed, 132 insertions(+), 123 deletions(-) diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py index 6d188040691..308143c4589 100644 --- a/worlds/shivers/Options.py +++ b/worlds/shivers/Options.py @@ -19,7 +19,10 @@ class PuzzleHintsRequired(DefaultOnToggle): 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): @@ -27,7 +30,10 @@ class FrontDoorUsable(Toggle): 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): @@ -35,7 +41,10 @@ class EarlyBeth(DefaultOnToggle): 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" diff --git a/worlds/shivers/data/excluded_locations.json b/worlds/shivers/data/excluded_locations.json index a37285eb1d2..5ccbc5de7a8 100644 --- a/worlds/shivers/data/excluded_locations.json +++ b/worlds/shivers/data/excluded_locations.json @@ -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: (Tiki) Witch Doctors of the Congo", + "Information Plaque: (Tiki) 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", diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json index fdf8ed69d1e..f5e303693c1 100644 --- a/worlds/shivers/data/locations.json +++ b/worlds/shivers/data/locations.json @@ -70,46 +70,46 @@ "Puzzle Hint Found: Elevator Writing", "Puzzle Hint Found: Tiki Security Camera", "Puzzle Hint Found: Tape Recorder Heard", - "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: (Tiki) Witch Doctors of the Congo", + "Information Plaque: (Tiki) 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", "Puzzle Solved Office Elevator", "Puzzle Solved Bedroom Elevator", "Puzzle Solved Three Floor Elevator", @@ -176,8 +176,8 @@ "Lobby": [ "Puzzle Solved Theater Door", "Flashback Memory Obtained Museum Brochure", - "Information Plaque: Jade Skull (Lobby)", - "Information Plaque: Transforming Masks (Lobby)", + "Information Plaque: (Lobby) Jade Skull", + "Information Plaque: (Lobby) Transforming Masks", "Accessible: Storage: Slide", "Accessible: Storage: Eagles Head" ], @@ -204,10 +204,10 @@ "Flashback Memory Obtained Museum Blueprints", "Accessible: Storage: Ocean", "Puzzle Hint Found: Sirens Song Heard", - "Information Plaque: Quartz Crystal (Ocean)", - "Information Plaque: Poseidon (Ocean)", - "Information Plaque: Colossus of Rhodes (Ocean)", - "Information Plaque: Poseidon's Temple (Ocean)" + "Information Plaque: (Ocean) Quartz Crystal", + "Information Plaque: (Ocean) Poseidon", + "Information Plaque: (Ocean) Colossus of Rhodes", + "Information Plaque: (Ocean) Poseidon's Temple" ], "Maze Staircase": [ "Puzzle Solved Maze Door" @@ -217,38 +217,38 @@ "Puzzle Solved Burial Door", "Accessible: Storage: Egypt", "Puzzle Hint Found: Egyptian Sphinx Heard", - "Information Plaque: Tomb of the Ixupi (Egypt)", - "Information Plaque: The Sphinx (Egypt)", - "Information Plaque: Curse of Anubis (Egypt)" + "Information Plaque: (Egypt) Tomb of the Ixupi", + "Information Plaque: (Egypt) The Sphinx", + "Information Plaque: (Egypt) Curse of Anubis" ], "Burial": [ "Puzzle Solved Chinese Solitaire", "Flashback Memory Obtained Merick's Notebook", "Accessible: Storage: Chinese Solitaire", - "Information Plaque: Norse Burial Ship (Burial)", - "Information Plaque: Paracas Burial Bundles (Burial)", - "Information Plaque: Spectacular Coffins of Ghana (Burial)", - "Information Plaque: Animal Crematorium (Burial)", - "Information Plaque: Cremation (Burial)" + "Information Plaque: (Burial) Norse Burial Ship", + "Information Plaque: (Burial) Paracas Burial Bundles", + "Information Plaque: (Burial) Spectacular Coffins of Ghana", + "Information Plaque: (Burial) Animal Crematorium", + "Information Plaque: (Burial) Cremation" ], "Tiki": [ "Puzzle Solved Tiki Drums", "Accessible: Storage: Tiki Hut", - "Information Plaque: Witch Doctors of the Congo (Tiki)", - "Information Plaque: Sarombe doctor of Mozambique (Tiki)" + "Information Plaque: (Tiki) Witch Doctors of the Congo", + "Information Plaque: (Tiki) Sarombe doctor of Mozambique" ], "Gods Room": [ "Puzzle Solved Lyre", "Puzzle Solved Red Door", "Accessible: Storage: Lyre", "Final Riddle: Norse God Stone Message", - "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: (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" ], "Blue Maze": [ "Puzzle Solved Fortune Teller Door" @@ -265,28 +265,28 @@ "Puzzle Solved UFO Symbols", "Accessible: Storage: UFO", "Final Riddle: Planets Aligned", - "Information Plaque: Coincidence or Extraterrestrial Visits? (UFO)", - "Information Plaque: Planets (UFO)", - "Information Plaque: Astronomical Construction (UFO)", - "Information Plaque: Aliens (UFO)" + "Information Plaque: (UFO) Coincidence or Extraterrestrial Visits?", + "Information Plaque: (UFO) Planets", + "Information Plaque: (UFO) Astronomical Construction", + "Information Plaque: (UFO) Aliens" ], "Anansi": [ "Puzzle Solved Anansi Musicbox", "Flashback Memory Obtained Ancient Astrology", "Accessible: Storage: Skeleton", "Accessible: Storage: Anansi", - "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: (Anansi) African Creation Myth", + "Information Plaque: (Anansi) Apophis the Serpent", + "Information Plaque: (Anansi) Death", + "Information Plaque: (Pegasus) Cyclops", + "Information Plaque: (Werewolf) Lycanthropy" ], "Torture": [ "Puzzle Solved Gallows", "Accessible: Storage: Hanging", "Final Riddle: Guillotine Dropped", "Puzzle Hint Found: Gallows Information Plaque", - "Information Plaque: Guillotine (Torture)" + "Information Plaque: (Torture) Guillotine" ], "Puzzle Room Mastermind": [ "Puzzle Solved Mastermind", @@ -296,17 +296,17 @@ "Puzzle Solved Marble Flipper" ], "Prehistoric": [ - "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: (Prehistoric) Bronze Unicorn", + "Information Plaque: (Prehistoric) Griffin", + "Information Plaque: (Prehistoric) Eagles Nest", + "Information Plaque: (Prehistoric) Large Spider", + "Information Plaque: (Prehistoric) Starfish", "Accessible: Storage: Eagles Nest" ], "Tar River": [ "Accessible: Storage: Tar River", - "Information Plaque: Subterranean World (Underground Maze)", - "Information Plaque: Dero (Underground Maze)" + "Information Plaque: (Underground Maze) Subterranean World", + "Information Plaque: (Underground Maze) Dero" ], "Theater": [ "Accessible: Storage: Theater" From b65a05a1bb73429820cc3a3090965ed9533762d3 Mon Sep 17 00:00:00 2001 From: Kory Dondzila Date: Mon, 26 Feb 2024 17:03:17 -0500 Subject: [PATCH 2/5] Tiki should be Shaman. --- worlds/shivers/Items.py | 4 ++-- worlds/shivers/Options.py | 2 +- worlds/shivers/Rules.py | 8 ++++---- worlds/shivers/data/excluded_locations.json | 4 ++-- worlds/shivers/data/locations.json | 20 ++++++++++---------- worlds/shivers/data/regions.json | 12 ++++++------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/worlds/shivers/Items.py b/worlds/shivers/Items.py index caf24ded298..3b403be5cb7 100644 --- a/worlds/shivers/Items.py +++ b/worlds/shivers/Items.py @@ -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"), @@ -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), diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py index 308143c4589..b70882f9a54 100644 --- a/worlds/shivers/Options.py +++ b/worlds/shivers/Options.py @@ -13,7 +13,7 @@ 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" diff --git a/worlds/shivers/Rules.py b/worlds/shivers/Rules.py index 57488ff3331..8aa8aa2c28d 100644 --- a/worlds/shivers/Rules.py +++ b/worlds/shivers/Rules.py @@ -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) diff --git a/worlds/shivers/data/excluded_locations.json b/worlds/shivers/data/excluded_locations.json index 5ccbc5de7a8..29655d4a502 100644 --- a/worlds/shivers/data/excluded_locations.json +++ b/worlds/shivers/data/excluded_locations.json @@ -21,8 +21,8 @@ "Information Plaque: (Burial) Spectacular Coffins of Ghana", "Information Plaque: (Burial) Cremation", "Information Plaque: (Burial) Animal Crematorium", - "Information Plaque: (Tiki) Witch Doctors of the Congo", - "Information Plaque: (Tiki) Sarombe doctor of Mozambique", + "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", diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json index f5e303693c1..980b7ffd6cf 100644 --- a/worlds/shivers/data/locations.json +++ b/worlds/shivers/data/locations.json @@ -13,7 +13,7 @@ "Puzzle Solved Columns of RA", "Puzzle Solved Burial Door", "Puzzle Solved Chinese Solitaire", - "Puzzle Solved Tiki Drums", + "Puzzle Solved Shaman Drums", "Puzzle Solved Lyre", "Puzzle Solved Red Door", "Puzzle Solved Fortune Teller Door", @@ -68,7 +68,7 @@ "Puzzle Hint Found: Gallows Information Plaque", "Puzzle Hint Found: Mastermind Information Plaque", "Puzzle Hint Found: Elevator Writing", - "Puzzle Hint Found: Tiki Security Camera", + "Puzzle Hint Found: Shaman Security Camera", "Puzzle Hint Found: Tape Recorder Heard", "Information Plaque: (Lobby) Transforming Masks", "Information Plaque: (Lobby) Jade Skull", @@ -91,8 +91,8 @@ "Information Plaque: (Burial) Spectacular Coffins of Ghana", "Information Plaque: (Burial) Cremation", "Information Plaque: (Burial) Animal Crematorium", - "Information Plaque: (Tiki) Witch Doctors of the Congo", - "Information Plaque: (Tiki) Sarombe doctor of Mozambique", + "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", @@ -193,7 +193,7 @@ "Clock Tower": [ "Flashback Memory Obtained Beth's Ghost", "Accessible: Storage: Clock Tower", - "Puzzle Hint Found: Tiki Security Camera" + "Puzzle Hint Found: Shaman Security Camera" ], "Projector Room": [ "Flashback Memory Obtained Theater Movie" @@ -231,11 +231,11 @@ "Information Plaque: (Burial) Animal Crematorium", "Information Plaque: (Burial) Cremation" ], - "Tiki": [ - "Puzzle Solved Tiki Drums", - "Accessible: Storage: Tiki Hut", - "Information Plaque: (Tiki) Witch Doctors of the Congo", - "Information Plaque: (Tiki) Sarombe doctor of Mozambique" + "Shaman": [ + "Puzzle Solved Shaman Drums", + "Accessible: Storage: Shaman Hut", + "Information Plaque: (Shaman) Witch Doctors of the Congo", + "Information Plaque: (Shaman) Sarombe doctor of Mozambique" ], "Gods Room": [ "Puzzle Solved Lyre", diff --git a/worlds/shivers/data/regions.json b/worlds/shivers/data/regions.json index 3e81136c45f..963d100fadd 100644 --- a/worlds/shivers/data/regions.json +++ b/worlds/shivers/data/regions.json @@ -27,9 +27,9 @@ ["Maze", ["To Maze Staircase From Maze", "To Tar River"]], ["Tar River", ["To Maze From Tar River", "To Lobby From Tar River"]], ["Egypt", ["To Lobby From Egypt", "To Burial From Egypt", "To Blue Maze From Egypt"]], - ["Burial", ["To Egypt From Burial", "To Tiki From Burial"]], - ["Tiki", ["To Burial From Tiki", "To Gods Room"]], - ["Gods Room", ["To Tiki From Gods Room", "To Anansi From Gods Room"]], + ["Burial", ["To Egypt From Burial", "To Shaman From Burial"]], + ["Shaman", ["To Burial From Shaman", "To Gods Room"]], + ["Gods Room", ["To Shaman From Gods Room", "To Anansi From Gods Room"]], ["Anansi", ["To Gods Room From Anansi", "To Werewolf From Anansi"]], ["Werewolf", ["To Anansi From Werewolf", "To Night Staircase From Werewolf"]], ["Night Staircase", ["To Werewolf From Night Staircase", "To Janitor Closet", "To UFO"]], @@ -109,13 +109,13 @@ ["To Tar River", "Tar River"], ["To Tar River From Lobby", "Tar River"], ["To Burial From Egypt", "Burial"], - ["To Burial From Tiki", "Burial"], + ["To Burial From Shaman", "Burial"], ["To Blue Maze From Three Floor Elevator", "Blue Maze"], ["To Blue Maze From Fortune Teller", "Blue Maze"], ["To Blue Maze From Inventions", "Blue Maze"], ["To Blue Maze From Egypt", "Blue Maze"], - ["To Tiki From Burial", "Tiki"], - ["To Tiki From Gods Room", "Tiki"], + ["To Shaman From Burial", "Shaman"], + ["To Shaman From Gods Room", "Shaman"], ["To Gods Room", "Gods Room" ], ["To Gods Room From Anansi", "Gods Room"], ["To Anansi From Gods Room", "Anansi"], From 61c19fef0ff918d4c70078631c84a60e070b5014 Mon Sep 17 00:00:00 2001 From: Kory Dondzila Date: Mon, 26 Feb 2024 17:11:11 -0500 Subject: [PATCH 3/5] Hanging should be Gallows. --- worlds/shivers/data/locations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json index 980b7ffd6cf..5dc4dbc01a7 100644 --- a/worlds/shivers/data/locations.json +++ b/worlds/shivers/data/locations.json @@ -283,7 +283,7 @@ ], "Torture": [ "Puzzle Solved Gallows", - "Accessible: Storage: Hanging", + "Accessible: Storage: Gallows", "Final Riddle: Guillotine Dropped", "Puzzle Hint Found: Gallows Information Plaque", "Information Plaque: (Torture) Guillotine" From a17868a19400ad879ca288d975bb666ec2a11d61 Mon Sep 17 00:00:00 2001 From: Kory Dondzila Date: Mon, 26 Feb 2024 17:15:29 -0500 Subject: [PATCH 4/5] Merrick spelling. --- worlds/shivers/data/locations.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json index 5dc4dbc01a7..a135ceb37b0 100644 --- a/worlds/shivers/data/locations.json +++ b/worlds/shivers/data/locations.json @@ -38,7 +38,7 @@ "Flashback Memory Obtained Theater Movie", "Flashback Memory Obtained Museum Blueprints", "Flashback Memory Obtained Beth's Address Book", - "Flashback Memory Obtained Merick's Notebook", + "Flashback Memory Obtained Merrick's Notebook", "Flashback Memory Obtained Professor Windlenot's Diary", "Ixupi Captured Water", "Ixupi Captured Wax", @@ -223,7 +223,7 @@ ], "Burial": [ "Puzzle Solved Chinese Solitaire", - "Flashback Memory Obtained Merick's Notebook", + "Flashback Memory Obtained Merrick's Notebook", "Accessible: Storage: Chinese Solitaire", "Information Plaque: (Burial) Norse Burial Ship", "Information Plaque: (Burial) Paracas Burial Bundles", From e039da6df9fab2ab6c7925ada31c521160641cf5 Mon Sep 17 00:00:00 2001 From: Kory Dondzila Date: Mon, 26 Feb 2024 17:34:21 -0500 Subject: [PATCH 5/5] Clarity change. --- worlds/shivers/data/locations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json index a135ceb37b0..1d62f85d2d1 100644 --- a/worlds/shivers/data/locations.json +++ b/worlds/shivers/data/locations.json @@ -179,7 +179,7 @@ "Information Plaque: (Lobby) Jade Skull", "Information Plaque: (Lobby) Transforming Masks", "Accessible: Storage: Slide", - "Accessible: Storage: Eagles Head" + "Accessible: Storage: Transforming Mask" ], "Generator": [ "Final Riddle: Beth's Body Page 17"