Entrance randomizer stuff

4 files changed, 541 insertions, 0 deletions

@@ -3,6 +3,7 @@ using Archipelago.MultiClient.Net.Enums;
 using Archipelago.MultiClient.Net.MessageLog.Messages;
 using Archipelago.MultiClient.Net.Models;
 using Archipelago.MultiClient.Net.Packets;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -17,6 +18,11 @@ namespace ManifoldGardenArchipelago
         private HashSet<string> _items = [];
         private HashSet<string> _locations = [];
 
+        private bool _roomShuffle = false;
+        public bool RoomShuffle => _roomShuffle;
+
+        public Dictionary<EntranceIdentifier, EntranceIdentifier> EntranceMapping = [];
+
         public async Task<LoginResult> Connect(string url, string slotName, string password)
         {
             LoginResult result;
@@ -35,6 +41,22 @@ namespace ManifoldGardenArchipelago
                 return new LoginFailure(ex.GetBaseException().Message);
             }
 
+            LoginSuccessful login = result as LoginSuccessful;
+            if (login.SlotData.ContainsKey("connections"))
+            {
+                _roomShuffle = true;
+
+                foreach (var connection in (JArray)login.SlotData["connections"])
+                {
+                    var connList = (JArray)connection;
+                    EntranceIdentifier ei1 = new((string)connList[0], (string)connList[1]);
+                    EntranceIdentifier ei2 = new((string)connList[2], (string)connList[3]);
+
+                    EntranceMapping[ei1] = ei2;
+                    EntranceMapping[ei2] = ei1;
+                }
+            }
+
             return result;
         }
 
@@ -15,12 +15,29 @@ namespace ManifoldGardenArchipelago
         }
     }
 
+    public readonly struct EntranceIdentifier(string region, string name)
+    {
+        public readonly string region = region;
+        public readonly string name = name;
+
+        public override string ToString()
+        {
+            return $"Entrance({region},{name})";
+        }
+    }
+
     public readonly struct LocationDescription(string name_arg, Requirement requirement_arg)
     {
         public readonly string name = name_arg;
         public readonly Requirement requirement = requirement_arg;
     }
 
+    public readonly struct PortalDescription(string scene, string name)
+    {
+        public readonly string scene = scene;
+        public readonly string name = name;
+    }
+
     public class SceneDescription
     {
         public readonly List<LocationDescription> locations = [];
@@ -28,6 +45,7 @@ namespace ManifoldGardenArchipelago
         public readonly Dictionary<int, Requirement> smokeWalls = [];
         public readonly Dictionary<int, Requirement> worldGrows = [];
         public readonly Dictionary<int, Requirement> lasers = [];
+        public readonly Dictionary<string, EntranceIdentifier> portals = [];
     }
 
     public class GameStateListeners
@@ -51,6 +69,8 @@ namespace ManifoldGardenArchipelago
         public static readonly Dictionary<SceneItemReference, GameStateListeners> listenersBySphere = [];
         public static readonly Dictionary<string, GameStateListeners> listenersByItem = [];
 
+        public static readonly Dictionary<EntranceIdentifier, PortalDescription> portal_by_entrance = [];
+
         public static Requirement ParseRequirement(string scene, Dictionary<object, object> yamlReq)
         {
             List<Requirement> reqs = [];
@@ -512,6 +532,19 @@ namespace ManifoldGardenArchipelago
                     }
                 }
 
+                if (sceneDetails.ContainsKey("portals"))
+                {
+                    foreach (var portalPair in (Dictionary<object, object>)sceneDetails["portals"])
+                    {
+                        string portalName = (string)portalPair.Key;
+                        var portalData = (Dictionary<object, object>)portalPair.Value;
+                        EntranceIdentifier entranceIdentifier = new((string)portalData["region"], (string)portalData["connection"]);
+
+                        sceneDescription.portals[portalName] = entranceIdentifier;
+                        portal_by_entrance[entranceIdentifier] = new(scenePair.Key, portalName);
+                    }
+                }
+
                 scenes[scenePair.Key] = sceneDescription;
             }
         }
@@ -453,4 +453,60 @@ namespace ManifoldGardenArchipelago
             return true;
         }
     }
+
+    [HarmonyPatch(typeof(LevelSystems), nameof(LevelSystems.InitializeAndLoadLevel))]
+    static class LevelSystemsInitializeAndLoadLevelPatch
+    {
+        static void Prefix(LevelSystems __instance)
+        {
+            if (Plugin.archipelagoManager.RoomShuffle)
+            {
+                if (GameData.scenes.TryGetValue(__instance.levelName, out SceneDescription sceneDescription))
+                {
+                    foreach (var portal in __instance.LevelInfo.portalList)
+                    {
+                        if (sceneDescription.portals.TryGetValue(portal.portalName, out EntranceIdentifier exitId) &&
+                            Plugin.archipelagoManager.EntranceMapping.TryGetValue(exitId, out EntranceIdentifier enterId) &&
+                            GameData.portal_by_entrance.TryGetValue(enterId, out PortalDescription pairedPortalDescription))
+                        {
+                            SceneLink secondLink = new()
+                            {
+                                portalName = pairedPortalDescription.name,
+                                sceneName = pairedPortalDescription.scene.Substring(0, pairedPortalDescription.scene.Length - 10),
+                                gravity = GravityDirection.DownBlue,
+                                targetScene = portal,
+                            };
+                            portal.targetScene = secondLink;
+                        }
+                    }
+                }
+            }
+
+            /*if (__instance.gameObject.scene.name == "World_000_Optimized")
+            {
+                // 0: Portal_W001
+                SceneLink sceneLink = __instance.LevelInfo.portalList[0];
+                SceneLink secondLink = new()
+                {
+                    portalName = "Portal_W063",
+                    sceneName = "Hallway_W045_W073",
+                    gravity = GravityDirection.DownBlue,
+                    targetScene = sceneLink
+                };
+                sceneLink.targetScene = secondLink;
+            }
+            else if (__instance.gameObject.scene.name == "Hallway_W045_W073_Optimized")
+            {
+                SceneLink sceneLink = __instance.LevelInfo.portalList[3];
+                SceneLink secondLink = new()
+                {
+                    portalName = "Portal_W001",
+                    sceneName = "World_000",
+                    gravity = GravityDirection.DownBlue,
+                    targetScene = sceneLink
+                };
+                sceneLink.targetScene = secondLink;
+            }*/
+        }
+    }
 }
@@ -10,6 +10,34 @@ World_000_Optimized:
         - button:
             scene: Hallway_W000_W052_Optimized
             index: 0
+  portals:
+    Portal_W001:
+      region: "000"
+      connection: A
+    Portal_W052:
+      region: "000"
+      connection: B
+Hallway_W000_W001_Optimized:
+  portals:
+    Portal_W000:
+      region: "000_001"
+      connection: A
+    Portal_W001:
+      region: "000_001"
+      connection: B
+    Portal_W900:
+      region: "000_001"
+      connection: C
+World_900_Garnier_Optimized:
+  portals:
+    Portal_W000:
+      region: "900"
+      connection: A
+Hallway_W062_W900_Optimized:
+  portals:
+    Portal_W062:
+      region: "900"
+      connection: B
 World_062_LargeGap_Optimized:
   locations:
     Large Gap Puzzle Solved:
@@ -65,6 +93,22 @@ World_062_LargeGap_Optimized:
         - button:
             scene: Hallway_W062_W063_Optimized
             index: 0
+  portals:
+    Portal_W052:
+      region: "062/Outside"
+      connection: A
+    Portal_W073:
+      region: "062/Inside"
+      connection: B
+    Portal_W026:
+      region: "062/Inside"
+      connection: C
+    Portal_W604:
+      region: "062/SecretHub"
+      connection: A
+    Portal_W900:
+      region: "062/SecretHub"
+      connection: C
 Hallway_W062_W063_Optimized:
   doors:
     0:
@@ -74,6 +118,10 @@ Hallway_W062_W063_Optimized:
         - socket:
             scene: World_063_TowerX_Optimized
             index: 0
+  portals:
+    Portal_W063:
+      region: "062/SecretHub"
+      connection: B
 World_001_Optimized:
   locations:
     Blue - Red Laser Activated:
@@ -95,6 +143,15 @@ World_001_Optimized:
     149:
       item: Blue - Red Laser
       socket: 5
+  portals:
+    Portal_To_W000:
+      region: "001"
+      connection: A
+Hallway_W044_W001A_Optimized:
+  portals:
+    Portal_W044:
+      region: "001"
+      connection: B
 World_044_CubicSpaceDivision_Optimized:
   locations:
     Blue God Cube Planted:
@@ -126,6 +183,25 @@ World_044_CubicSpaceDivision_Optimized:
   doors:
     12:
       item: Orange Garden
+  portals:
+    Portal_W001:
+      region: "044"
+      connection: A
+    Portal_W003:
+      region: "044"
+      connection: C
+    Portal_W053:
+      region: "044"
+      connection: E
+    Portal_W002:
+      region: "044"
+      connection: G
+    Portal_W051:
+      region: "044"
+      connection: I
+    Portal_W063:
+      region: "044"
+      connection: K
 World_044B_CubicSpaceDivision_Optimized:
   doors:
     0:
@@ -135,6 +211,10 @@ World_044B_CubicSpaceDivision_Optimized:
         - button:
             scene: Hallway_W044_W015_Optimized
             index: 1
+  portals:
+    Portal_W015:
+      region: "044"
+      connection: B
 Hallway_W044_W015_Optimized:
   locations:
     Tower Orange Tree Puzzle Solved:
@@ -151,6 +231,13 @@ Hallway_W044_W015_Optimized:
         - button:
             scene: World_015_Stepwell_Optimized
             index: 1
+  portals:
+    Portal_W045:
+      region: "044_014"
+      connection: A
+    Portal_W613:
+      region: "044_014"
+      connection: C
 World_613_LongBridgeLongTower_Optimized:
   locations:
     Long Bridge Long Tower Puzzle Solved:
@@ -169,6 +256,13 @@ World_613_LongBridgeLongTower_Optimized:
       or:
         - button: 0
         - pad: 0
+  portals:
+    Portal_W026:
+      region: "613"
+      connection: A
+    Portal_W015:
+      region: "613"
+      connection: B
 World_015_Stepwell_Optimized:
   doors:
     1:
@@ -198,6 +292,10 @@ Hallway_W015_W041_Optimized:
         - button:
             scene: World_045_FirstHub_Optimized
             index: 0
+  portals:
+    Portal_W041:
+      region: "PathToPyramid"
+      connection: B
 World_045_FirstHub_Optimized:
   locations:
     Pyramid First Exit Opened:
@@ -249,6 +347,25 @@ World_045_FirstHub_Optimized:
         - button: 0
         - inverted:
             pad: 1
+  portals:
+    Portal_W015:
+      region: "045"
+      connection: A
+    Portal_W018:
+      region: "045"
+      connection: B
+    Portal_W053:
+      region: "045"
+      connection: D
+    Portal_W037:
+      region: "045"
+      connection: F
+    Portal_W044:
+      region: "045/RedExit"
+      connection: A
+    Portal_W057:
+      region: "045/GreenExit"
+      connection: A
 Hallway_W045_W018_Optimized:
   locations:
     Purple/Orange Tree Puzzle Solved:
@@ -260,6 +377,13 @@ Hallway_W045_W018_Optimized:
         - button:
             scene: Hallway_W041_W018_Optimized
             index: 0
+  portals:
+    Portal_W045:
+      region: "045_018"
+      connection: A
+    Portal_W018:
+      region: "045_018"
+      connection: B
 Hallway_W041_W018_Optimized:
   doors:
     0:
@@ -268,6 +392,13 @@ Hallway_W041_W018_Optimized:
         - button:
             scene: World_018_PastaTile_Optimized
             index: 0
+  portals:
+    Portal_W041:
+      region: "041_018"
+      connection: A
+    Portal_W018:
+      region: "041_018"
+      connection: B
 World_612_BlindSpherePuzzle_Optimized:
   locations:
     Blind Sphere Puzzle Solved:
@@ -283,6 +414,10 @@ World_612_BlindSpherePuzzle_Optimized:
         - button:
             scene: Hallway_W612_W057_Optimized
             index: 0
+  portals:
+    Portal_W057:
+      region: "041_018"
+      connection: C
 World_018_PastaTile_Optimized:
   doors:
     0:
@@ -303,6 +438,19 @@ World_018_PastaTile_Optimized:
               index: 0
             - scene: Hallway_W018_W063_Optimized
               index: 1
+  portals:
+    Portal_W041:
+      region: "018/Inside"
+      connection: A
+    Portal_W003:
+      region: "018/Outside"
+      connection: B
+    Portal_W073:
+      region: "018/Secret"
+      connection: A
+    Portal_W063:
+      region: "018/Secret"
+      connection: B
 Hallway_W018_W003B_Optimized:
   locations:
     Mini Sphere Puzzle Solved:
@@ -317,10 +465,26 @@ Hallway_W018_W003B_Optimized:
       or:
         - button: 1
         - entry: World_003_SpherePipe_Optimized
+  portals:
+    Portal_W018:
+      region: "018_003B"
+      connection: A
+    Portal_W003:
+      region: "018_003B"
+      connection: B
 World_003_SpherePipe_Optimized:
   locations:
     Red - Tree Purified:
       entry: AudioVisual_003_Optimized
+  portals:
+    Portal_W018:
+      region: "003"
+      connection: A
+Hallway_W044_W003_Optimized:
+  portals:
+    Portal_W044:
+      region: "003"
+      connection: B
 World_044C_CubicSpaceDivision_Optimized:
   doors:
     1:
@@ -330,6 +494,10 @@ World_044C_CubicSpaceDivision_Optimized:
         - button:
             scene: Hallway_W044_W045_Optimized
             index: 0
+  portals:
+    Portal_W045-053:
+      region: "044"
+      connection: D
 Hallway_W044_W045_Optimized:
   locations:
     Final Test Puzzle Solved:
@@ -350,6 +518,16 @@ Hallway_W044_W045_Optimized:
             pad:
               scene: World_045_FirstHub_Optimized
               index: 0
+  portals:
+    Portal_W044:
+      region: "044_045"
+      connection: A
+    Portal_W045:
+      region: "044_045"
+      connection: B
+    Portal_W804:
+      region: "044_045"
+      connection: D
 Hallway_W045_W053_Optimized:
   doors:
     1:
@@ -357,6 +535,13 @@ Hallway_W045_W053_Optimized:
       or:
         - button: 0
         - entry: World_053_WaterTechingPuzzle_Optimized
+  portals:
+    Portal_W041:
+      region: "045_053"
+      connection: A
+    Portal_053:
+      region: "045_053"
+      connection: B
 World_053_WaterTechingPuzzle_Optimized:
   locations:
     Green - Blue Waterwheel Activated:
@@ -366,6 +551,15 @@ World_053_WaterTechingPuzzle_Optimized:
   doors:
     4:
       item: Green - Water Room Entrance
+  portals:
+    Portal_W045A:
+      region: "053"
+      connection: A
+Hallway_W044_W053_Optimized:
+  portals:
+    Portal_W044:
+      region: "053"
+      connection: B
 World_044E_CubicSpaceDivision_Optimized:
   doors:
     1:
@@ -375,6 +569,10 @@ World_044E_CubicSpaceDivision_Optimized:
         - socket:
             scene: Hallway_W044_W057_Optimized
             index: 0
+  portals:
+    Portal_W057:
+      region: "044"
+      connection: F
 Hallway_W044_W057_Optimized:
   doors:
     1:
@@ -383,6 +581,13 @@ Hallway_W044_W057_Optimized:
         - waterwheel:
             scene: World_057_WaterAndPortals_Optimized
             index: 0
+  portals:
+    Portal_W044:
+      region: "044_057"
+      connection: A
+    Portal_W057:
+      region: "044_057"
+      connection: B
 Hallway_W612_W057_Optimized:
   doors:
     2:
@@ -391,6 +596,13 @@ Hallway_W612_W057_Optimized:
         - button:
             scene: World_057_WaterAndPortals_Optimized
             index: 0
+  portals:
+    Portal_W612:
+      region: "612_057"
+      connection: A
+    Portal_W015:
+      region: "612_057"
+      connection: B
 World_057_WaterAndPortals_Optimized:
   locations:
     Water Through Portals Puzzle Solved:
@@ -407,6 +619,13 @@ World_057_WaterAndPortals_Optimized:
       or:
         - waterwheel: 0
         - button: 0
+  portals:
+    Portal_W044:
+      region: "057"
+      connection: A
+    Portal_W612:
+      region: "057"
+      connection: B
 Hallway_W057_W045_Optimized:
   doors:
     1:
@@ -416,6 +635,10 @@ Hallway_W057_W045_Optimized:
             pad:
               scene: World_045_FirstHub_Optimized
               index: 1
+  portals:
+    Portal_W045:
+      region: "057"
+      connection: C
 Hallway_W045_W073_Optimized:
   locations:
     Apartments Waterwheel Activated:
@@ -436,6 +659,19 @@ Hallway_W045_W073_Optimized:
         - button:
             scene: Hallway_W073_W018_Optimized
             index: 0
+  portals:
+    Portal_W045:
+      region: "045_073"
+      connection: A
+    Portal_W073:
+      region: "045_073"
+      connection: B
+    Portal_W018:
+      region: "045_073"
+      connection: C
+    Portal_W063:
+      region: "045_073"
+      connection: D
 Hallway_W073_W018_Optimized:
   doors:
     1:
@@ -444,6 +680,13 @@ Hallway_W073_W018_Optimized:
         - button:
             scene: World_018_PastaTile_Optimized
             index: 1
+  portals:
+    Portal_W073:
+      region: "073_018"
+      connection: A
+    Portal_W018:
+      region: "073_018"
+      connection: B
 Hallway_W018_W063_Optimized:
   doors:
     0:
@@ -453,6 +696,16 @@ Hallway_W018_W063_Optimized:
       or:
         - button: [0, 1]
         - entry: World_063_TowerX_Optimized
+  portals:
+    Portal_W018:
+      region: "018_063"
+      connection: A
+    Portal_H044-073:
+      region: "018_063"
+      connection: B
+    Portal_W063:
+      region: "018_063"
+      connection: C
 World_073_WaterThruStairs_Optimized:
   locations:
     Skylight Room Waterwheel Activated:
@@ -487,6 +740,16 @@ World_073_WaterThruStairs_Optimized:
         - button:
             scene: Hallway_W044_W045_Optimized
             index: 0
+  portals:
+    Portal_W045:
+      region: "073"
+      connection: A
+    Portal_W062:
+      region: "073"
+      connection: B
+    Portal_W026:
+      region: "073"
+      connection: C
 Hallway_W073_W062_Optimized:
   doors:
     1:
@@ -496,6 +759,13 @@ Hallway_W073_W062_Optimized:
         - socket:
             scene: World_062_LargeGap_Optimized
             index: 0
+  portals:
+    Portal_W073:
+      region: "073_062"
+      connection: A
+    Portal_W062:
+      region: "073_062"
+      connection: B
 Hallway_W000_W052_Optimized:
   doors:
     2:
@@ -504,6 +774,13 @@ Hallway_W000_W052_Optimized:
         - button:
             scene: World_052_JerryMcGuirePuzzle_Optimized
             index: 1
+  portals:
+    Portal_W000:
+      region: "000_052"
+      connection: A
+    Portal_W052:
+      region: "000_052"
+      connection: B
 World_052_JerryMcGuirePuzzle_Optimized:
   locations:
     Jerry McGuire Puzzle Solved:
@@ -527,6 +804,13 @@ World_052_JerryMcGuirePuzzle_Optimized:
         - button:
             scene: Hallway_W052_W062_Optimized
             index: 0
+  portals:
+    Portal_W000:
+      region: "052"
+      connection: A
+    Portal_W062:
+      region: "052"
+      connection: B
 Hallway_W052_W062_Optimized:
   doors:
     2:
@@ -536,6 +820,13 @@ Hallway_W052_W062_Optimized:
         - button:
             scene: World_062_LargeGap_Optimized
             index: 0
+  portals:
+    Portal_W052:
+      region: "052_062"
+      connection: A
+    Portal_W062:
+      region: "052_062"
+      connection: B
 Hallway_W062_W026_Optimized:
   doors:
     1:
@@ -543,6 +834,13 @@ Hallway_W062_W026_Optimized:
       or:
         - button: 0
         - entry: World_026_Library_Optimized
+  portals:
+    Portal_W062:
+      region: "062_026"
+      connection: A
+    Portal_W026:
+      region: "062_026"
+      connection: B
 World_026_Library_Optimized:
   locations:
     Single Socket Puzzle Solved:
@@ -566,6 +864,19 @@ World_026_Library_Optimized:
     3:
       item: Library - Yellow Smoke Wall
       entry: World_026_Library_Optimized
+  portals:
+    Portal_W062:
+      region: "026"
+      connection: A
+    Portal_W002:
+      region: "026"
+      connection: B
+    Portal_W051:
+      region: "026"
+      connection: D
+    Portal_W044 (051):
+      region: "026/YellowExit"
+      connection: A
 Hallway_W026_W002_Optimized:
   locations:
     Yellow Cube Fetch Quest Completed:
@@ -578,6 +889,13 @@ Hallway_W026_W002_Optimized:
         - button:
             scene: Hallway_W026_W015_Optimized
             index: 0
+  portals:
+    Portal_W26:
+      region: "026_002"
+      connection: A
+    Portal_W015:
+      region: "026_002"
+      connection: C
 Hallway_W026_W015_Optimized:
   doors:
     0:
@@ -586,6 +904,13 @@ Hallway_W026_W015_Optimized:
         - pad:
             scene: World_613_LongBridgeLongTower_Optimized
             index: 0
+  portals:
+    Portal_W026:
+      region: "026_015"
+      connection: A
+    Portal_W613:
+      region: "026_015"
+      connection: B
 Hallway_W026_W002_PuzzleRoom_Optimized:
   locations:
     Yellow Entrance Puzzle Solved:
@@ -596,6 +921,10 @@ Hallway_W026_W002_PuzzleRoom_Optimized:
       or:
         - socket: [0, 1]
         - entry: World_002_Optimized
+  portals:
+    Portal_W002:
+      region: "026_002/PuzzleRoom"
+      connection: B
 World_002_Optimized:
   locations:
     Yellow - Blue Tower Solved:
@@ -606,6 +935,15 @@ World_002_Optimized:
       socket: 4
     Yellow - Tree Purified:
       entry: AudioVisual_002_Optimized
+  portals:
+    Portal_W026:
+      region: "002"
+      connection: A
+Hallway_W044_W002_Optimized:
+  portals:
+    Portal_W044:
+      region: "002"
+      connection: B
 World_044D_CubicSpaceDivision_Optimized:
   doors:
     0:
@@ -615,6 +953,10 @@ World_044D_CubicSpaceDivision_Optimized:
         - button:
             scene: Hallway_W044_W026_Optimized
             index: 0
+  portals:
+    Portal_W026:
+      region: "044"
+      connection: H
 Hallway_W044_W026_Optimized:
   doors:
     2:
@@ -628,6 +970,16 @@ Hallway_W044_W026_Optimized:
       or:
         - button: 0
         - button: 1
+  portals:
+    Portal_W044:
+      region: "044_026"
+      connection: A
+    Portal_W026:
+      region: "044_026"
+      connection: B
+    Portal_W073:
+      region: "044_026"
+      connection: C
 Hallway_W073_W026_Optimized:
   doors:
     1:
@@ -636,6 +988,13 @@ Hallway_W073_W026_Optimized:
         - button:
             scene: Hallway_W044_W026_Optimized
             index: 1
+  portals:
+    Portal_W073:
+      region: "073_026"
+      connection: A
+    Portal_W026:
+      region: "073_026"
+      connection: B
 Hallway_W026_W051_Optimized:
   doors:
     0:
@@ -643,10 +1002,26 @@ Hallway_W026_W051_Optimized:
       or:
         - button: 0
         - entry: World_051_CeilingSuspendPuzzle_Optimized
+  portals:
+    Portal_W026:
+      region: "026_051"
+      connection: A
+    Portal_W051:
+      region: "026_051"
+      connection: B
 World_051_CeilingSuspendPuzzle_Optimized:
   locations:
     Purple - Tree Purified:
       entry: AudioVisual_051_Optimized
+  portals:
+    Portal_W026:
+      region: "051"
+      connection: A
+Hallway_W044_W051A_Optimized:
+  portals:
+    Portal_W044:
+      region: "051"
+      connection: B
 World_044G_CubicSpaceDivision_Optimized:
   doors:
     1:
@@ -656,6 +1031,10 @@ World_044G_CubicSpaceDivision_Optimized:
         - button:
             scene: Hallway_W033_W063_Optimized
             index: 0
+  portals:
+    Portal_W051:
+      region: "044"
+      connection: J
 Hallway_W033_W063_Optimized:
   locations:
     Shattered Bridges Puzzle Solved:
@@ -672,6 +1051,13 @@ Hallway_W033_W063_Optimized:
         - socket:
             scene: World_063_TowerX_Optimized
             index: 0
+  portals:
+    Portal_W044:
+      region: "033_063"
+      connection: A
+    Portal_W063:
+      region: "033_063"
+      connection: B
 World_611_SecretRoom1_Optimized:
   locations:
     Shattered Bridges Secret Puzzle Solved:
@@ -688,6 +1074,10 @@ World_611_SecretRoom1_Optimized:
         - socket:
             scene: World_604_TetrominoNonEuclidean_Optimized
             index: 0
+  portals:
+    Portal_W604:
+      region: "611"
+      connection: B
 World_604_TetrominoNonEuclidean_Optimized:
   locations:
     Non-Euclidean Tetromino Puzzle Solved:
@@ -703,6 +1093,13 @@ World_604_TetrominoNonEuclidean_Optimized:
         - button:
             scene: Hallway_W604_W062_Optimized
             index: 0
+  portals:
+    Portal_W611:
+      region: "604"
+      connection: A
+    Portal_W062:
+      region: "604"
+      connection: B
 Hallway_W604_W062_Optimized:
   doors:
     0:
@@ -721,6 +1118,13 @@ Hallway_W604_W062_Optimized:
         - button:
             scene: World_062_LargeGap_Optimized
             index: 4
+  portals:
+    Portal_W604:
+      region: "604_062"
+      connection: A
+    Portal_W062:
+      region: "604_062"
+      connection: B
 World_063_TowerX_Optimized:
   locations:
     Orange - Inside Puzzle Solved:
@@ -733,6 +1137,21 @@ World_063_TowerX_Optimized:
       or:
         - socket: 0
         - socket: 1
+  portals:
+    Portal_W044B:
+      region: "063/Inside"
+      connection: A
+    Portal_W062:
+      region: "063/Inside"
+      connection: B
+    Portal_W018:
+      region: "063/Outside"
+      connection: B
+Hallway_W044_W063_Optimized:
+  portals:
+    Portal_W044:
+      region: "063/Inside"
+      connection: D
 Hallway_W045_W804_Optimized:
   doors:
     0:
@@ -740,6 +1159,13 @@ Hallway_W045_W804_Optimized:
       or:
         - button: 0
         - entry: World_804_Optimized
+  portals:
+    Portal_W045:
+      region: "045_804"
+      connection: A
+    Portal_W804:
+      region: "045_804"
+      connection: B
 World_801_Optimized:
   locations:
     Rainbow - Orange Tree Puzzle Solved:
@@ -760,6 +1186,10 @@ World_804_Optimized:
   locations:
     Rainbow - Double Gravity Puzzle Solved:
       socket: [0, 1]
+  portals:
+    Portal_W045:
+      region: "804"
+      connection: B
 World_807_TetrominoWaterAndGears_Optimized:
   locations:
     Rainbow - First Water Tetromino Puzzle Solved: