Shivers: Add events and fix require puzzle hints logic (#4018)

* Adds some events, renames things, fails for many players. * Adds entrance rules for requires hints. * Cleanup and add goal item. * Cleanup. * Add additional rule. * Event and regions additions. * Updates from merge. * Adds collect behavior option. * Fix missing generator location. * Fix whitespace and optimize imports. * Switch location order back. * Add name replacement for storage. * Fix test failure. * Improve puzzle hints required. * Add missing locations and cleanup indirect conditions. * Fix naming. * PR feedback. * Missed comment. * Cleanup imports, use strings for option equivalence, and update option description. * Fix rule. * Create rolling buffer goal items and remove goal items and location from default options. * Cleanup. * Removes dateutil. * Fixes Subterranean World information plaque.
2025-10-21 20:21:32 -06:00 · 2024-12-27 15:07:55 -05:00
parent 218f28912e
commit 3bcc86f539
10 changed files with 783 additions and 461 deletions
--- a/worlds/shivers/data/excluded_locations.json
+++ b/worlds/shivers/data/excluded_locations.json
@@ -11,7 +11,7 @@
 		"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 Staircase) Subterranean World",
 		"Information Plaque: (Underground Maze) Dero",
 		"Information Plaque: (Egypt) Tomb of the Ixupi",
 		"Information Plaque: (Egypt) The Sphinx",
--- a/worlds/shivers/data/locations.json
+++ b/worlds/shivers/data/locations.json
@@ -19,7 +19,7 @@
    "Puzzle Solved Fortune Teller Door",
    "Puzzle Solved Alchemy",
    "Puzzle Solved UFO Symbols",
-    "Puzzle Solved Anansi Musicbox",
+    "Puzzle Solved Anansi Music Box",
    "Puzzle Solved Gallows",
    "Puzzle Solved Mastermind",
    "Puzzle Solved Marble Flipper",
@@ -54,7 +54,7 @@
    "Final Riddle: Norse God Stone Message",
    "Final Riddle: Beth's Body Page 17",
    "Final Riddle: Guillotine Dropped",
-    "Puzzle Hint Found: Combo Lock in Mailbox",
+    "Puzzle Hint Found: Mailbox",
    "Puzzle Hint Found: Orange Symbol",
    "Puzzle Hint Found: Silver Symbol",
    "Puzzle Hint Found: Green Symbol",
@@ -113,15 +113,19 @@
    "Puzzle Solved Office Elevator",
    "Puzzle Solved Bedroom Elevator",
    "Puzzle Solved Three Floor Elevator",
-    "Ixupi Captured Lightning"
+    "Ixupi Captured Lightning",
+    "Puzzle Solved Combination Lock",
+    "Puzzle Hint Found: Beth's Note",
+    "Mystery Solved"
  ],
  "locations_by_region": {
    "Outside": [
+      "Puzzle Solved Combination Lock",
      "Puzzle Solved Gears",
      "Puzzle Solved Stone Henge",
      "Puzzle Solved Office Elevator",
      "Puzzle Solved Three Floor Elevator",
-      "Puzzle Hint Found: Combo Lock in Mailbox",
+      "Puzzle Hint Found: Mailbox",
      "Puzzle Hint Found: Orange Symbol",
      "Puzzle Hint Found: Silver Symbol",
      "Puzzle Hint Found: Green Symbol",
@@ -130,32 +134,42 @@
      "Puzzle Hint Found: Tan Symbol"
    ],
    "Underground Lake": [
-      "Flashback Memory Obtained Windlenot's Ghost",
+      "Flashback Memory Obtained Windlenot's Ghost"
+    ],
+    "Windlenot's Body": [
      "Flashback Memory Obtained Egyptian Hieroglyphics Explained"
    ],
    "Office": [
      "Flashback Memory Obtained Scrapbook",
-      "Accessible: Storage: Desk Drawer",
+      "Storage: Desk Drawer",
      "Puzzle Hint Found: Atlantis Map",
      "Puzzle Hint Found: Tape Recorder Heard",
      "Puzzle Solved Bedroom Elevator"
    ],
    "Workshop": [
      "Puzzle Solved Workshop Drawers",
-      "Accessible: Storage: Workshop Drawers",
+      "Storage: Workshop Drawers",
      "Puzzle Hint Found: Basilisk Bone Fragments"
    ],
    "Bedroom": [
      "Flashback Memory Obtained Professor Windlenot's Diary"
    ],
+    "Lobby": [
+      "Puzzle Solved Theater Door",
+      "Flashback Memory Obtained Museum Brochure",
+      "Information Plaque: (Lobby) Jade Skull",
+      "Information Plaque: (Lobby) Transforming Masks",
+      "Storage: Slide",
+      "Storage: Transforming Mask"
+    ],
    "Library": [
      "Puzzle Solved Library Statue",
      "Flashback Memory Obtained In Search of the Unexplained",
      "Flashback Memory Obtained South American Pictographs",
      "Flashback Memory Obtained Mythology of the Stars",
      "Flashback Memory Obtained Black Book",
-      "Accessible: Storage: Library Cabinet",
-      "Accessible: Storage: Library Statue"
+      "Storage: Library Cabinet",
+      "Storage: Library Statue"
    ],
    "Maintenance Tunnels": [
      "Flashback Memory Obtained Beth's Address Book"
@@ -163,37 +177,46 @@
    "Three Floor Elevator": [
      "Puzzle Hint Found: Elevator Writing"
    ],
-    "Lobby": [
-      "Puzzle Solved Theater Door",
-      "Flashback Memory Obtained Museum Brochure",
-      "Information Plaque: (Lobby) Jade Skull",
-      "Information Plaque: (Lobby) Transforming Masks",
-      "Accessible: Storage: Slide",
-      "Accessible: Storage: Transforming Mask"
-    ],
    "Generator": [
-      "Final Riddle: Beth's Body Page 17",
      "Ixupi Captured Lightning"
    ],
-    "Theater Back Hallways": [
+    "Beth's Body": [
+      "Final Riddle: Beth's Body Page 17"
+    ],
+    "Theater": [
+      "Storage: Theater",
+      "Puzzle Hint Found: Beth's Note"
+    ],
+    "Theater Back Hallway": [
      "Puzzle Solved Clock Tower Door"
    ],
-    "Clock Tower Staircase": [
+    "Clock Chains": [
      "Puzzle Solved Clock Chains"
    ],
    "Clock Tower": [
      "Flashback Memory Obtained Beth's Ghost",
-      "Accessible: Storage: Clock Tower",
+      "Storage: Clock Tower",
      "Puzzle Hint Found: Shaman Security Camera"
    ],
    "Projector Room": [
      "Flashback Memory Obtained Theater Movie"
    ],
+    "Prehistoric": [
+      "Information Plaque: (Prehistoric) Bronze Unicorn",
+      "Information Plaque: (Prehistoric) Griffin",
+      "Information Plaque: (Prehistoric) Eagles Nest",
+      "Information Plaque: (Prehistoric) Large Spider",
+      "Information Plaque: (Prehistoric) Starfish",
+      "Storage: Eagles Nest"
+    ],
+    "Greenhouse": [
+      "Storage: Greenhouse"
+    ],
    "Ocean": [
      "Puzzle Solved Atlantis",
      "Puzzle Solved Organ",
      "Flashback Memory Obtained Museum Blueprints",
-      "Accessible: Storage: Ocean",
+      "Storage: Ocean",
      "Puzzle Hint Found: Sirens Song Heard",
      "Information Plaque: (Ocean) Quartz Crystal",
      "Information Plaque: (Ocean) Poseidon",
@@ -204,10 +227,14 @@
      "Information Plaque: (Underground Maze Staircase) Subterranean World",
      "Puzzle Solved Maze Door"
    ],
+    "Tar River": [
+      "Storage: Tar River",
+      "Information Plaque: (Underground Maze) Dero"
+    ],
    "Egypt": [
      "Puzzle Solved Columns of RA",
      "Puzzle Solved Burial Door",
-      "Accessible: Storage: Egypt",
+      "Storage: Egypt",
      "Puzzle Hint Found: Egyptian Sphinx Heard",
      "Information Plaque: (Egypt) Tomb of the Ixupi",
      "Information Plaque: (Egypt) The Sphinx",
@@ -216,7 +243,7 @@
    "Burial": [
      "Puzzle Solved Chinese Solitaire",
      "Flashback Memory Obtained Merrick's Notebook",
-      "Accessible: Storage: Chinese Solitaire",
+      "Storage: Chinese Solitaire",
      "Information Plaque: (Burial) Norse Burial Ship",
      "Information Plaque: (Burial) Paracas Burial Bundles",
      "Information Plaque: (Burial) Spectacular Coffins of Ghana",
@@ -225,15 +252,14 @@
    ],
    "Shaman": [
      "Puzzle Solved Shaman Drums",
-      "Accessible: Storage: Shaman Hut",
+      "Storage: Shaman Hut",
      "Information Plaque: (Shaman) Witch Doctors of the Congo",
      "Information Plaque: (Shaman) Sarombe doctor of Mozambique"
    ],
    "Gods Room": [
      "Puzzle Solved Lyre",
      "Puzzle Solved Red Door",
-      "Accessible: Storage: Lyre",
-      "Final Riddle: Norse God Stone Message",
+      "Storage: Lyre",
      "Information Plaque: (Gods) Fisherman's Canoe God",
      "Information Plaque: (Gods) Mayan Gods",
      "Information Plaque: (Gods) Thor",
@@ -242,6 +268,9 @@
      "Information Plaque: (Gods) Sumerian Lyre",
      "Information Plaque: (Gods) Chuen"
    ],
+    "Norse Stone": [
+      "Final Riddle: Norse God Stone Message"
+    ],
    "Blue Maze": [
      "Puzzle Solved Fortune Teller Door"
    ],
@@ -251,35 +280,46 @@
    ],
    "Inventions": [
      "Puzzle Solved Alchemy",
-      "Accessible: Storage: Alchemy"
+      "Storage: Alchemy"
    ],
    "UFO": [
      "Puzzle Solved UFO Symbols",
-      "Accessible: Storage: UFO",
-      "Final Riddle: Planets Aligned",
+      "Storage: UFO",
      "Information Plaque: (UFO) Coincidence or Extraterrestrial Visits?",
      "Information Plaque: (UFO) Planets",
      "Information Plaque: (UFO) Astronomical Construction",
      "Information Plaque: (UFO) Aliens"
    ],
+    "Orrery": [
+      "Final Riddle: Planets Aligned"
+    ],
+    "Janitor Closet": [
+      "Storage: Janitor Closet"
+    ],
+    "Werewolf": [
+      "Information Plaque: (Werewolf) Lycanthropy"
+    ],
+    "Pegasus": [
+      "Information Plaque: (Pegasus) Cyclops"
+    ],
    "Anansi": [
-      "Puzzle Solved Anansi Musicbox",
+      "Puzzle Solved Anansi Music Box",
      "Flashback Memory Obtained Ancient Astrology",
-      "Accessible: Storage: Skeleton",
-      "Accessible: Storage: Anansi",
+      "Storage: Skeleton",
+      "Storage: Anansi Music Box",
      "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: (Anansi) Death"
    ],
    "Torture": [
      "Puzzle Solved Gallows",
-      "Accessible: Storage: Gallows",
-      "Final Riddle: Guillotine Dropped",
+      "Storage: Gallows",
      "Puzzle Hint Found: Gallows Information Plaque",
      "Information Plaque: (Torture) Guillotine"
    ],
+    "Guillotine": [
+      "Final Riddle: Guillotine Dropped"
+    ],
    "Puzzle Room Mastermind": [
      "Puzzle Solved Mastermind",
      "Puzzle Hint Found: Mastermind Information Plaque"
@@ -287,29 +327,8 @@
    "Puzzle Room Marbles": [
      "Puzzle Solved Marble Flipper"
    ],
-    "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: (Underground Maze) Dero"
-    ],
-    "Theater": [
-      "Accessible: Storage: Theater"
-    ],
-    "Greenhouse": [
-      "Accessible: Storage: Greenhouse"
-    ],
-    "Janitor Closet": [
-      "Accessible: Storage: Janitor Closet"
-    ],
-    "Skull Dial Bridge": [
-      "Accessible: Storage: Skull Bridge",
+    "Skull Bridge": [
+      "Storage: Skull Bridge",
      "Puzzle Solved Skull Dial Door"
    ],
    "Water Capture": [
@@ -338,6 +357,9 @@
    ],
    "Metal Capture": [
      "Ixupi Captured Metal"
+    ],
+    "Victory": [
+      "Mystery Solved"
    ]
  }
 }
--- a/worlds/shivers/data/regions.json
+++ b/worlds/shivers/data/regions.json
@@ -4,22 +4,25 @@
 		["Registry", ["To Outside From Registry"]],
 		["Outside", ["To Underground Tunnels From Outside", "To Lobby From Outside"]],
 		["Underground Tunnels", ["To Underground Lake From Underground Tunnels", "To Outside From Underground"]],
-		["Underground Lake", ["To Underground Tunnels From Underground Lake", "To Underground Blue Tunnels From Underground Lake"]],
+		["Underground Lake", ["To Underground Tunnels From Underground Lake", "To Windlenot's Body From Underground Lake", "To Underground Blue Tunnels From Underground Lake"]],
+		["Windlenot's Body", ["To Underground Lake From Windlenot's Body"]],
 		["Underground Blue Tunnels", ["To Underground Lake From Underground Blue Tunnels", "To Office Elevator From Underground Blue Tunnels"]],
 		["Office Elevator", ["To Underground Blue Tunnels From Office Elevator","To Office From Office Elevator"]],
 		["Office", ["To Office Elevator From Office", "To Workshop", "To Lobby From Office", "To Bedroom Elevator From Office", "To Ash Capture From Office"]],
 		["Workshop", ["To Office From Workshop", "To Wood Capture From Workshop"]],
 		["Bedroom Elevator", ["To Office From Bedroom Elevator", "To Bedroom"]],
 		["Bedroom", ["To Bedroom Elevator From Bedroom", "To Metal Capture From Bedroom"]],
-		["Lobby", ["To Office From Lobby", "To Library From Lobby", "To Theater From Lobby", "To Prehistoric From Lobby", "To Egypt From Lobby", "To Tar River From Lobby", "To Outside From Lobby", "To Water Capture From Lobby", "To Crystal Capture From Lobby"]],
+		["Lobby", ["To Office From Lobby", "To Library From Lobby", "To Theater From Lobby", "To Prehistoric From Lobby", "To Egypt From Lobby", "To Tar River From Lobby", "To Outside From Lobby", "To Water Capture From Lobby", "To Crystal Capture From Lobby", "To Victory"]],
 		["Library", ["To Lobby From Library", "To Maintenance Tunnels From Library", "To Wax Capture From Library"]],
-		["Maintenance Tunnels", ["To Library From Maintenance Tunnels", "To Three Floor Elevator From Maintenance Tunnels", "To Generator"]],
+		["Maintenance Tunnels", ["To Library From Maintenance Tunnels", "To Three Floor Elevator From Maintenance Tunnels", "To Generator From Maintenance Tunnels"]],
 		["Generator", ["To Maintenance Tunnels From Generator"]],
-		["Theater", ["To Lobby From Theater", "To Theater Back Hallways From Theater"]],
-		["Theater Back Hallways", ["To Theater From Theater Back Hallways", "To Clock Tower Staircase From Theater Back Hallways", "To Maintenance Tunnels From Theater Back Hallways", "To Projector Room"]],
-		["Clock Tower Staircase", ["To Theater Back Hallways From Clock Tower Staircase", "To Clock Tower"]],
+		["Beth's Body", ["To Generator From Beth's Body"]],
+		["Theater", ["To Lobby From Theater", "To Theater Back Hallway From Theater"]],
+		["Theater Back Hallway", ["To Theater From Theater Back Hallway", "To Clock Tower Staircase From Theater Back Hallway", "To Maintenance Tunnels From Theater Back Hallway", "To Projector Room"]],
+		["Clock Tower Staircase", ["To Theater Back Hallway From Clock Tower Staircase", "To Clock Tower"]],
+		["Clock Chains", ["To Clock Tower Staircase From Clock Chains"]],
 		["Clock Tower", ["To Clock Tower Staircase From Clock Tower"]],
-		["Projector Room", ["To Theater Back Hallways From Projector Room", "To Metal Capture From Projector Room"]],
+		["Projector Room", ["To Theater Back Hallway From Projector Room", "To Metal Capture From Projector Room"]],
 		["Prehistoric", ["To Lobby From Prehistoric", "To Greenhouse", "To Ocean From Prehistoric", "To Oil Capture From Prehistoric", "To Metal Capture From Prehistoric"]],
 		["Greenhouse", ["To Prehistoric From Greenhouse", "To Sand Capture From Greenhouse"]],
 		["Ocean", ["To Prehistoric From Ocean", "To Maze Staircase From Ocean", "To Crystal Capture From Ocean", "To Sand Capture From Ocean"]],
@@ -28,22 +31,26 @@
 		["Tar River", ["To Maze From Tar River", "To Lobby From Tar River", "To Oil Capture From Tar River"]],
 		["Egypt", ["To Lobby From Egypt", "To Burial From Egypt", "To Blue Maze From Egypt", "To Cloth Capture From Egypt"]],
 		["Burial", ["To Egypt From Burial", "To Shaman From Burial", "To Ash Capture From Burial", "To Cloth Capture From Burial"]],
-		["Shaman", ["To Burial From Shaman", "To Gods Room", "To Wax Capture From Shaman"]],
-		["Gods Room", ["To Shaman From Gods Room", "To Anansi From Gods Room", "To Wood Capture From Gods Room"]],
-		["Anansi", ["To Gods Room From Anansi", "To Werewolf From Anansi", "To Wax Capture From Anansi", "To Wood Capture From Anansi"]],
-		["Werewolf", ["To Anansi From Werewolf", "To Night Staircase From Werewolf"]],
-		["Night Staircase", ["To Werewolf From Night Staircase", "To Janitor Closet", "To UFO"]],
+		["Shaman", ["To Burial From Shaman", "To Gods Room From Shaman", "To Wax Capture From Shaman"]],
+		["Gods Room", ["To Shaman From Gods Room", "To Anansi From Gods Room", "To Wood Capture From Gods Room", "To Norse Stone From Gods Room"]],
+		["Norse Stone", ["To Gods Room From Norse Stone"]],
+		["Anansi", ["To Gods Room From Anansi", "To Pegasus From Anansi", "To Wax Capture From Anansi"]],
+		["Pegasus", ["To Anansi From Pegasus", "To Werewolf From Pegasus", "To Wood Capture From Pegasus"]],
+		["Werewolf", ["To Pegasus From Werewolf", "To Night Staircase From Werewolf"]],
+		["Night Staircase", ["To Werewolf From Night Staircase", "To Janitor Closet", "To UFO From Night Staircase"]],
 		["Janitor Closet", ["To Night Staircase From Janitor Closet", "To Water Capture From Janitor Closet", "To Cloth Capture From Janitor Closet"]],
-		["UFO", ["To Night Staircase From UFO", "To Inventions From UFO"]],
+		["UFO", ["To Night Staircase From UFO", "To Orrery From UFO", "To Inventions From UFO"]],
+		["Orrery", ["To UFO From Orrery"]],
 		["Blue Maze", ["To Egypt From Blue Maze", "To Three Floor Elevator From Blue Maze Bottom", "To Three Floor Elevator From Blue Maze Top", "To Fortune Teller", "To Inventions From Blue Maze", "To Wood Capture From Blue Maze"]],
 		["Three Floor Elevator", ["To Maintenance Tunnels From Three Floor Elevator", "To Blue Maze From Three Floor Elevator"]],
 		["Fortune Teller", ["To Blue Maze From Fortune Teller"]],
 		["Inventions", ["To Blue Maze From Inventions", "To UFO From Inventions", "To Torture From Inventions"]],
 		["Torture", ["To Inventions From Torture", "To Puzzle Room Mastermind From Torture"]],
+		["Guillotine", ["To Torture From Guillotine"]],
 		["Puzzle Room Mastermind", ["To Torture", "To Puzzle Room Marbles From Puzzle Room Mastermind"]],
-		["Puzzle Room Marbles", ["To Puzzle Room Mastermind From Puzzle Room Marbles", "To Skull Dial Bridge From Puzzle Room Marbles"]],
-		["Skull Dial Bridge", ["To Puzzle Room Marbles From Skull Dial Bridge", "To Slide Room"]],
-		["Slide Room", ["To Skull Dial Bridge From Slide Room", "To Lobby From Slide Room"]],
+		["Puzzle Room Marbles", ["To Puzzle Room Mastermind From Puzzle Room Marbles", "To Skull Bridge From Puzzle Room Marbles"]],
+		["Skull Bridge", ["To Puzzle Room Marbles From Skull Bridge", "To Slide Room"]],
+		["Slide Room", ["To Skull Bridge From Slide Room", "To Lobby From Slide Room"]],
 		["Water Capture", []],
 		["Wax Capture", []],
 		["Ash Capture", []],
@@ -52,17 +59,20 @@
 		["Wood Capture", []],
 		["Crystal Capture", []],
 		["Sand Capture", []],
-		["Metal Capture", []]
+		["Metal Capture", []],
+		["Victory", []]
    ],
    "mandatory_connections": [
-    ["To Registry", "Registry"],
+		["To Registry", "Registry"],
 		["To Outside From Registry", "Outside"],
 		["To Outside From Underground", "Outside"],
 		["To Outside From Lobby", "Outside"],
 		["To Underground Tunnels From Outside", "Underground Tunnels"],
 		["To Underground Tunnels From Underground Lake", "Underground Tunnels"],
 		["To Underground Lake From Underground Tunnels", "Underground Lake"],
+		["To Underground Lake From Windlenot's Body", "Underground Lake"],
 		["To Underground Lake From Underground Blue Tunnels", "Underground Lake"],
+		["To Windlenot's Body From Underground Lake", "Windlenot's Body"],
 		["To Underground Blue Tunnels From Underground Lake", "Underground Blue Tunnels"],
 		["To Underground Blue Tunnels From Office Elevator", "Underground Blue Tunnels"],
 		["To Office Elevator From Underground Blue Tunnels", "Office Elevator"],
@@ -86,7 +96,7 @@
 		["To Library From Lobby", "Library"],
 		["To Library From Maintenance Tunnels", "Library"],
 		["To Theater From Lobby", "Theater" ],
-		["To Theater From Theater Back Hallways", "Theater"],
+		["To Theater From Theater Back Hallway", "Theater"],
 		["To Prehistoric From Lobby", "Prehistoric"],
 		["To Prehistoric From Greenhouse", "Prehistoric"],
 		["To Prehistoric From Ocean", "Prehistoric"],
@@ -96,15 +106,17 @@
 		["To Maintenance Tunnels From Generator", "Maintenance Tunnels"],
 		["To Maintenance Tunnels From Three Floor Elevator", "Maintenance Tunnels"],
 		["To Maintenance Tunnels From Library", "Maintenance Tunnels"],
-		["To Maintenance Tunnels From Theater Back Hallways", "Maintenance Tunnels"],
+		["To Maintenance Tunnels From Theater Back Hallway", "Maintenance Tunnels"],
 		["To Three Floor Elevator From Maintenance Tunnels", "Three Floor Elevator"],
 		["To Three Floor Elevator From Blue Maze Bottom", "Three Floor Elevator"],
 		["To Three Floor Elevator From Blue Maze Top", "Three Floor Elevator"],
-		["To Generator", "Generator"],
-		["To Theater Back Hallways From Theater", "Theater Back Hallways"],
-		["To Theater Back Hallways From Clock Tower Staircase", "Theater Back Hallways"],
-		["To Theater Back Hallways From Projector Room", "Theater Back Hallways"],
-		["To Clock Tower Staircase From Theater Back Hallways", "Clock Tower Staircase"],
+		["To Generator From Maintenance Tunnels", "Generator"],
+		["To Generator From Beth's Body", "Generator"],
+		["To Theater Back Hallway From Theater", "Theater Back Hallway"],
+		["To Theater Back Hallway From Clock Tower Staircase", "Theater Back Hallway"],
+		["To Theater Back Hallway From Projector Room", "Theater Back Hallway"],
+		["To Clock Tower Staircase From Theater Back Hallway", "Clock Tower Staircase"],
+		["To Clock Tower Staircase From Clock Chains", "Clock Tower Staircase"],
 		["To Clock Tower Staircase From Clock Tower", "Clock Tower Staircase"],
 		["To Projector Room", "Projector Room"],
 		["To Clock Tower", "Clock Tower"],
@@ -125,30 +137,37 @@
 		["To Blue Maze From Egypt", "Blue Maze"],
 		["To Shaman From Burial", "Shaman"],
 		["To Shaman From Gods Room", "Shaman"],
-		["To Gods Room", "Gods Room" ],
+		["To Gods Room From Shaman", "Gods Room" ],
+		["To Gods Room From Norse Stone", "Gods Room" ],
 		["To Gods Room From Anansi", "Gods Room"],
+		["To Norse Stone From Gods Room", "Norse Stone" ],
 		["To Anansi From Gods Room", "Anansi"],
-		["To Anansi From Werewolf", "Anansi"],
-		["To Werewolf From Anansi", "Werewolf"],
+		["To Anansi From Pegasus", "Anansi"],
+		["To Pegasus From Anansi", "Pegasus"],
+		["To Pegasus From Werewolf", "Pegasus"],
+		["To Werewolf From Pegasus", "Werewolf"],
 		["To Werewolf From Night Staircase", "Werewolf"],
 		["To Night Staircase From Werewolf", "Night Staircase"],
 		["To Night Staircase From Janitor Closet", "Night Staircase"],
 		["To Night Staircase From UFO", "Night Staircase"],
 		["To Janitor Closet", "Janitor Closet"],
-		["To UFO", "UFO"],
+		["To UFO From Night Staircase", "UFO"],
+		["To UFO From Orrery", "UFO"],
 		["To UFO From Inventions", "UFO"],
+		["To Orrery From UFO", "Orrery"],
 		["To Inventions From UFO", "Inventions"],
 		["To Inventions From Blue Maze", "Inventions"],
 		["To Inventions From Torture", "Inventions"],
 		["To Fortune Teller", "Fortune Teller"],
 		["To Torture", "Torture"],
+		["To Torture From Guillotine", "Torture"],
 		["To Torture From Inventions", "Torture"],
 		["To Puzzle Room Mastermind From Torture", "Puzzle Room Mastermind"],
 		["To Puzzle Room Mastermind From Puzzle Room Marbles", "Puzzle Room Mastermind"],
 		["To Puzzle Room Marbles From Puzzle Room Mastermind", "Puzzle Room Marbles"],
-		["To Puzzle Room Marbles From Skull Dial Bridge", "Puzzle Room Marbles"],
-		["To Skull Dial Bridge From Puzzle Room Marbles", "Skull Dial Bridge"],
-		["To Skull Dial Bridge From Slide Room", "Skull Dial Bridge"],
+		["To Puzzle Room Marbles From Skull Bridge", "Puzzle Room Marbles"],
+		["To Skull Bridge From Puzzle Room Marbles", "Skull Bridge"],
+		["To Skull Bridge From Slide Room", "Skull Bridge"],
 		["To Slide Room", "Slide Room"],
 		["To Wax Capture From Library", "Wax Capture"],
 		["To Wax Capture From Shaman", "Wax Capture"],
@@ -164,7 +183,7 @@
 		["To Cloth Capture From Janitor Closet", "Cloth Capture"],
 		["To Wood Capture From Workshop", "Wood Capture"],
 		["To Wood Capture From Gods Room", "Wood Capture"],
-		["To Wood Capture From Anansi", "Wood Capture"],
+		["To Wood Capture From Pegasus", "Wood Capture"],
 		["To Wood Capture From Blue Maze", "Wood Capture"],
 		["To Crystal Capture From Lobby", "Crystal Capture"],
 		["To Crystal Capture From Ocean", "Crystal Capture"],
@@ -172,6 +191,7 @@
 		["To Sand Capture From Ocean", "Sand Capture"],
 		["To Metal Capture From Bedroom", "Metal Capture"],
 		["To Metal Capture From Projector Room", "Metal Capture"],
-		["To Metal Capture From Prehistoric", "Metal Capture"]
+		["To Metal Capture From Prehistoric", "Metal Capture"],
+		["To Victory", "Victory"]
 	]
 }