159 files changed, 668 insertions, 160 deletions

@@ -6,7 +6,7 @@ from worlds.AutoWorld import WebWorld, World
 from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS
 from .options import Lingo2Options
 from .player_logic import Lingo2PlayerLogic
-from .regions import create_regions
+from .regions import create_regions, shuffle_entrances, connect_ports_from_ut
 from .static_logic import Lingo2StaticLogic
 from .version import APWORLD_VERSION
 
@@ -46,12 +46,25 @@ class Lingo2World(World):
 
     player_logic: Lingo2PlayerLogic
 
+    port_pairings: dict[int, int]
+
     def generate_early(self):
         self.player_logic = Lingo2PlayerLogic(self)
+        self.port_pairings = {}
 
     def create_regions(self):
         create_regions(self)
 
+    def connect_entrances(self):
+        if self.options.shuffle_worldports:
+            if hasattr(self.multiworld, "re_gen_passthrough") and "Lingo 2" in self.multiworld.re_gen_passthrough:
+                slot_value = self.multiworld.re_gen_passthrough["Lingo 2"]["port_pairings"]
+                self.port_pairings = {int(fp): int(tp) for fp, tp in slot_value.items()}
+
+                connect_ports_from_ut(self.port_pairings, self)
+            else:
+                shuffle_entrances(self)
+
         from Utils import visualize_regions
 
         visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
@@ -100,17 +113,29 @@ class Lingo2World(World):
             "shuffle_gallery_paintings",
             "shuffle_letters",
             "shuffle_symbols",
+            "shuffle_worldports",
             "strict_cyan_ending",
             "strict_purple_ending",
             "victory_condition",
         ]
 
-        slot_data = {
+        slot_data: dict[str, object] = {
             **self.options.as_dict(*slot_options),
             "version": [self.static_logic.get_data_version(), APWORLD_VERSION],
         }
 
+        if self.options.shuffle_worldports:
+            slot_data["port_pairings"] = self.port_pairings
+
         return slot_data
 
     def get_filler_item_name(self) -> str:
         return "A Job Well Done"
+
+    # for the universal tracker, doesn't get called in standard gen
+    # docs: https://github.com/FarisTheAncient/Archipelago/blob/tracker/worlds/tracker/docs/re-gen-passthrough.md
+    @staticmethod
+    def interpret_slot_data(slot_data: dict[str, object]) -> dict[str, object]:
+        # returning slot_data so it regens, giving it back in multiworld.re_gen_passthrough
+        # we are using re_gen_passthrough over modifying the world here due to complexities with ER
+        return slot_data
@@ -52,6 +52,16 @@ class ShuffleSymbols(Toggle):
     display_name = "Shuffle Symbols"
 
 
+class ShuffleWorldports(Toggle):
+    """
+    Randomizes the connections between maps. This affects worldports only, which are the loading zones you walk into in
+    order to change maps. This does not affect paintings, panels that teleport you, or certain other special connections
+    like the one between The Shop and Control Center. Connections that depend on placing letters in keyholders are also
+    currently not shuffled.
+    """
+    display_name = "Shuffle Worldports"
+
+
 class KeyholderSanity(Toggle):
     """
     If enabled, 26 locations will be created for placing each key into its respective Green Ending keyholder.
@@ -157,6 +167,7 @@ class Lingo2Options(PerGameCommonOptions):
     shuffle_gallery_paintings: ShuffleGalleryPaintings
     shuffle_letters: ShuffleLetters
     shuffle_symbols: ShuffleSymbols
+    shuffle_worldports: ShuffleWorldports
     keyholder_sanity: KeyholderSanity
     cyan_door_behavior: CyanDoorBehavior
     daedalus_roof_access: DaedalusRoofAccess
@@ -234,10 +234,10 @@ class Lingo2PlayerLogic:
 
         for door_group in world.static_logic.objects.door_groups:
             if door_group.type == data_pb2.DoorGroupType.CONNECTOR:
-                if not self.world.options.shuffle_doors:
+                if not self.world.options.shuffle_doors or self.world.options.shuffle_worldports:
                     continue
             elif door_group.type == data_pb2.DoorGroupType.COLOR_CONNECTOR:
-                if not self.world.options.shuffle_control_center_colors:
+                if not self.world.options.shuffle_control_center_colors or self.world.options.shuffle_worldports:
                     continue
             elif door_group.type == data_pb2.DoorGroupType.SHUFFLE_GROUP:
                 if not self.world.options.shuffle_doors:
@@ -1,6 +1,8 @@
 from typing import TYPE_CHECKING
 
+import BaseClasses
 from BaseClasses import Region, ItemClassification, Entrance
+from entrance_rando import randomize_entrances
 from .items import Lingo2Item
 from .locations import Lingo2Location
 from .player_logic import AccessRequirements
@@ -76,6 +78,9 @@ def create_regions(world: "Lingo2World"):
             port = world.static_logic.objects.ports[connection.port]
             connection_name = f"{connection_name} (via port {port.name})"
 
+            if world.options.shuffle_worldports and not port.no_shuffle:
+                continue
+
             if port.HasField("required_door"):
                 reqs.merge(world.player_logic.get_door_open_reqs(port.required_door))
 
@@ -116,3 +121,68 @@ def create_regions(world: "Lingo2World"):
             world.multiworld.register_indirect_condition(regions[region], connection)
 
     world.multiworld.regions += regions.values()
+
+
+def shuffle_entrances(world: "Lingo2World"):
+    er_entrances: list[Entrance] = []
+    er_exits: list[Entrance] = []
+
+    port_id_by_name: dict[str, int] = {}
+
+    for port in world.static_logic.objects.ports:
+        if port.no_shuffle:
+            continue
+
+        port_region_name = world.static_logic.get_room_region_name(port.room_id)
+        port_region = world.multiworld.get_region(port_region_name, world.player)
+
+        connection_name = f"{port_region_name} - {port.name}"
+        port_id_by_name[connection_name] = port.id
+
+        entrance = port_region.create_er_target(connection_name)
+        entrance.randomization_type = BaseClasses.EntranceType.TWO_WAY
+
+        er_exit = port_region.create_exit(connection_name)
+        er_exit.randomization_type = BaseClasses.EntranceType.TWO_WAY
+
+        if port.HasField("required_door"):
+            door_reqs = world.player_logic.get_door_open_reqs(port.required_door)
+            er_exit.access_rule = make_location_lambda(door_reqs, world, None)
+
+            for region in door_reqs.get_referenced_rooms():
+                world.multiworld.register_indirect_condition(world.multiworld.get_region(region, world.player),
+                                                             er_exit)
+
+        er_entrances.append(entrance)
+        er_exits.append(er_exit)
+
+    result = randomize_entrances(world, True, {0:[0]}, False, er_entrances,
+                                 er_exits)
+
+    for (f, to) in result.pairings:
+        world.port_pairings[port_id_by_name[f]] = port_id_by_name[to]
+
+
+def connect_ports_from_ut(port_pairings: dict[int, int], world: "Lingo2World"):
+    for fpid, tpid in port_pairings.items():
+        from_port = world.static_logic.objects.ports[fpid]
+        to_port = world.static_logic.objects.ports[tpid]
+
+        from_region_name = world.static_logic.get_room_region_name(from_port.room_id)
+        to_region_name = world.static_logic.get_room_region_name(to_port.room_id)
+
+        from_region = world.multiworld.get_region(from_region_name, world.player)
+        to_region = world.multiworld.get_region(to_region_name, world.player)
+
+        connection = Entrance(world.player, f"{from_region_name} - {from_port.name}", from_region)
+
+        if from_port.HasField("required_door"):
+            door_reqs = world.player_logic.get_door_open_reqs(from_port.required_door)
+            connection.access_rule = make_location_lambda(door_reqs, world, None)
+
+            for region in door_reqs.get_referenced_rooms():
+                world.multiworld.register_indirect_condition(world.multiworld.get_region(region, world.player),
+                                                             connection)
+
+        from_region.exits.append(connection)
+        connection.connect(to_region)
@@ -54,10 +54,13 @@ def lingo2_can_satisfy_requirements(state: CollectionState, reqs: AccessRequirem
     return True
 
 def make_location_lambda(reqs: AccessRequirements, world: "Lingo2World",
-                         regions: dict[str, Region]) -> Callable[[CollectionState], bool]:
+                         regions: dict[str, Region] | None) -> Callable[[CollectionState], bool]:
     # Replace required rooms with regions for the top level requirement, which saves looking up the regions during rule
     # checking.
-    required_regions = [regions[room_name] for room_name in reqs.rooms]
+    if regions is not None:
+        required_regions = [regions[room_name] for room_name in reqs.rooms]
+    else:
+        required_regions = [world.multiworld.get_region(room_name, world.player) for room_name in reqs.rooms]
     new_reqs = reqs.copy()
     new_reqs.rooms.clear()
     return lambda state: lingo2_can_satisfy_requirements(state, new_reqs, required_regions, world)
@@ -6,6 +6,7 @@ var objects
 var door_id_by_map_node_path = {}
 var painting_id_by_map_node_path = {}
 var panel_id_by_map_node_path = {}
+var port_id_by_map_node_path = {}
 var door_id_by_ap_id = {}
 var map_id_by_name = {}
 var progressive_id_by_ap_id = {}
@@ -79,6 +80,16 @@ func load(data_bytes):
 
                 var _map_data = painting_id_by_map_node_path[map.get_name()]
 
+        for port in objects.get_ports():
+                var room = objects.get_rooms()[port.get_room_id()]
+                var map = objects.get_maps()[room.get_map_id()]
+
+                if not map.get_name() in port_id_by_map_node_path:
+                        port_id_by_map_node_path[map.get_name()] = {}
+
+                var map_data = port_id_by_map_node_path[map.get_name()]
+                map_data[port.get_path()] = port.get_id()
+
         for progressive in objects.get_progressives():
                 progressive_id_by_ap_id[progressive.get_ap_id()] = progressive.get_id()
 
@@ -121,6 +132,14 @@ func get_panel_for_map_node_path(map_name, node_path):
         return map_data.get(node_path, null)
 
 
+func get_port_for_map_node_path(map_name, node_path):
+        if not port_id_by_map_node_path.has(map_name):
+                return null
+
+        var map_data = port_id_by_map_node_path[map_name]
+        return map_data.get(node_path, null)
+
+
 func get_door_ap_id(door_id):
         var door = objects.get_doors()[door_id]
         if door.has_ap_id():
@@ -46,11 +46,13 @@ var apworld_version = [0, 0]
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var keyholder_sanity = false
+var port_pairings = {}
 var shuffle_control_center_colors = false
 var shuffle_doors = false
 var shuffle_gallery_paintings = false
 var shuffle_letters = kSHUFFLE_LETTERS_VANILLA
 var shuffle_symbols = false
+var shuffle_worldports = false
 var strict_cyan_ending = false
 var strict_purple_ending = false
 var victory_condition = -1
@@ -380,6 +382,7 @@ func _client_connected(slot_data):
         shuffle_gallery_paintings = bool(slot_data.get("shuffle_gallery_paintings", false))
         shuffle_letters = int(slot_data.get("shuffle_letters", 0))
         shuffle_symbols = bool(slot_data.get("shuffle_symbols", false))
+        shuffle_worldports = bool(slot_data.get("shuffle_worldports", false))
         strict_cyan_ending = bool(slot_data.get("strict_cyan_ending", false))
         strict_purple_ending = bool(slot_data.get("strict_purple_ending", false))
         victory_condition = int(slot_data.get("victory_condition", 0))
@@ -387,6 +390,13 @@ func _client_connected(slot_data):
         if slot_data.has("version"):
                 apworld_version = [int(slot_data["version"][0]), int(slot_data["version"][1])]
 
+        port_pairings.clear()
+        if slot_data.has("port_pairings"):
+                var raw_pp = slot_data.get("port_pairings")
+
+                for p1 in raw_pp.keys():
+                        port_pairings[int(p1)] = int(raw_pp[p1])
+
         # Set up item locks.
         _item_locks = {}
 
@@ -404,12 +414,14 @@ func _client_connected(slot_data):
                                 _item_locks[door.get_id()] = [progressive.get_ap_id(), i + 1]
 
                 for door_group in gamedata.objects.get_door_groups():
-                        if (
-                                door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.CONNECTOR
-                                or door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.SHUFFLE_GROUP
-                        ):
-                                for door in door_group.get_doors():
-                                        _item_locks[door] = [door_group.get_ap_id(), 1]
+                        if door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.CONNECTOR:
+                                if shuffle_worldports:
+                                        continue
+                        elif door_group.get_type() != gamedata.SCRIPT_proto.DoorGroupType.SHUFFLE_GROUP:
+                                continue
+
+                        for door in door_group.get_doors():
+                                _item_locks[door] = [door_group.get_ap_id(), 1]
 
         if shuffle_control_center_colors:
                 for door in gamedata.objects.get_doors():
@@ -417,7 +429,10 @@ func _client_connected(slot_data):
                                 _item_locks[door.get_id()] = [door.get_ap_id(), 1]
 
                 for door_group in gamedata.objects.get_door_groups():
-                        if door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.COLOR_CONNECTOR:
+                        if (
+                                door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.COLOR_CONNECTOR
+                                and not shuffle_worldports
+                        ):
                                 for door in door_group.get_doors():
                                         _item_locks[door] = [door_group.get_ap_id(), 1]
 
@@ -192,6 +192,11 @@ func startGame():
         unlocks.loadData()
         unlocks.unlockKey("capslock", 1)
 
+        if ap.shuffle_worldports:
+                settings.worldport_fades = "default"
+        else:
+                settings.worldport_fades = "never"
+
         clearResourceCache("res://objects/meshes/gridDoor.tscn")
         clearResourceCache("res://objects/nodes/collectable.tscn")
         clearResourceCache("res://objects/nodes/door.tscn")
@@ -1,10 +1,53 @@
 extends "res://scripts/nodes/worldport.gd"
 
+var absolute_rotation = false
+var target_rotation = 0
+
 
 func _ready():
+        var node_path = String(
+                get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names()
+        )
+
+        var ap = global.get_node("Archipelago")
+
+        if ap.shuffle_worldports:
+                var gamedata = global.get_node("Gamedata")
+                var port_id = gamedata.get_port_for_map_node_path(global.map, node_path)
+                if port_id != null:
+                        if port_id in ap.port_pairings:
+                                var target_port = gamedata.objects.get_ports()[ap.port_pairings[port_id]]
+                                var target_room = gamedata.objects.get_rooms()[target_port.get_room_id()]
+                                var target_map = gamedata.objects.get_maps()[target_room.get_map_id()]
+
+                                exit = target_map.get_name()
+                                entry_point.x = target_port.get_destination().get_x()
+                                entry_point.y = target_port.get_destination().get_y()
+                                entry_point.z = target_port.get_destination().get_z()
+                                absolute_rotation = true
+                                target_rotation = target_port.get_rotation()
+                                sets_entry_point = true
+                                invisible = false
+                                fades = true
+
         if global.map == "icarus" and exit == "daedalus":
-                var ap = global.get_node("Archipelago")
                 if not ap.daedalus_roof_access:
                         entry_point = Vector3(58, 10, 0)
 
         super._ready()
+
+
+func bodyEntered(body):
+        if body.is_in_group("player"):
+                if absolute_rotation:
+                        entry_rotate.y = target_rotation - body.rotation_degrees.y
+
+        super.bodyEntered(body)
+
+
+func changeScene():
+        var player = get_tree().get_root().get_node("scene/player")
+        if player != null:
+                player.playable = false
+
+        super.changeScene()
@@ -963,7 +963,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Lime Room"
+      room: "Revitalized Entrance"
       name: "REVITALIZED"
     }
   }
@@ -1,6 +1,9 @@
 door_groups {
   name: "The Entry - Repetitive Entrance"
-  type: CONNECTOR
+  # This *should* be a CONNECTOR, but currently we're not shuffling these
+  # entrances because we want to guarantee that there's a way to The Repetitive
+  # without missing keys in vanilla doors. Hopefully can be changed eventually.
+  type: SHUFFLE_GROUP
   doors {
     map: "the_entry"
     name: "Starting Room West Wall North Door"
@@ -2,4 +2,8 @@ name: "Ancient Entrance"
 ports {
   name: "ANCIENT"
   path: "Components/Warps/worldport8"
+  destination { x: -27 y: 0 z: -34 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -9,4 +9,6 @@ panels {
 ports {
   name: "BETWEEN"
   path: "Components/Warps/worldport5"
+  destination { x: 39 y: 0 z: -17 }
+  rotation: 270
 }
@@ -9,4 +9,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport2"
+  destination { x: 26 y: 0 z: -16.5 }
+  rotation: 0
 }
@@ -9,4 +9,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -1.5 }
+  rotation: 0
 }
@@ -50,21 +50,27 @@ keyholders {
 ports {
   name: "RIGHT"
   path: "Components/Warps/worldport6"
+  destination { x: 82 y: 0 z: -10 }
+  rotation: 90
 }
 ports {
   name: "LEFT"
   path: "Components/Warps/worldport7"
-  # Check that this is correct.
+  destination { x: 82 y: 0 z: -48 }
+  rotation: 90
 }
 ports {
   name: "RELENTLESS_LEFT"
   path: "Components/Warps/worldport9"
+  no_shuffle: true
 }
 ports {
   name: "RELENTLESS_SHOP"
   path: "Components/Warps/worldport11"
+  no_shuffle: true
 }
 ports {
   name: "RELENTLESS_TURN"
   path: "Components/Warps/worldport10"
+  no_shuffle: true
 }
@@ -9,4 +9,8 @@ panels {
 ports {
   name: "PARTIAL"
   path: "Components/Warps/worldport4"
+  destination { x: 21 y: 0 z: -41 }
+  rotation: 270
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -17,4 +17,8 @@ panels {
 ports {
   name: "PERCEPTIVE"
   path: "Components/Warps/worldport12"
+  destination { x: -23 y: 0 z: -11 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -2,4 +2,8 @@ name: "Repetitive Entrance"
 ports {
   name: "REPETITIVE"
   path: "Components/Warps/worldport14"
+  destination { x: -16 y: 0 z: -17.5 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -9,4 +9,8 @@ panels {
 ports {
   name: "TENACIOUS"
   path: "Components/Warps/worldport13"
+  destination { x: 56 y: 0 z: -38 }
+  rotation: 180
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -9,4 +9,8 @@ panels {
 ports {
   name: "UNKEMPT"
   path: "Components/Warps/worldport3"
+  destination { x: 34 y: 0 z: -38.5 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -195,4 +195,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/Worldports/worldport16"
+  destination { x: -84 y: 0 z: 81 }
+  rotation: 270
 }
@@ -11,4 +11,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/Worldports/worldport4"
+  destination { x: -21 y: 0 z: -4 }
+  rotation: 90
 }
@@ -3,4 +3,5 @@ panel_display_name: "Hedges"
 ports {
   name: "TENACIOUS"
   path: "Components/Warps/Worldports/worldport13"
+  no_shuffle: true
 }
@@ -7,4 +7,6 @@ paintings {
 ports {
   name: "HIVE"
   path: "Components/Warps/Worldports/worldport9"
+  destination { x: 64 y: 1 z: 24.5 }
+  rotation: 0
 }
@@ -77,4 +77,6 @@ paintings {
 ports {
   name: "REVITALIZED"
   path: "Components/Warps/Worldports/worldport7"
+  destination { x: 45 y: 0 z: 94 }
+  rotation: 270
 }
@@ -3,4 +3,6 @@ panel_display_name: "South Area"
 ports {
   name: "GREAT"
   path: "Components/Warps/Worldports/worldport17"
+  destination { x: -24 y: 0 z: 61 }
+  rotation: 270
 }
@@ -17,4 +17,6 @@ paintings {
 ports {
   name: "QUIET"
   path: "Components/Warps/Worldports/worldport5"
+  destination { x: -32 y: 0 z: -40 }
+  rotation: 90
 }
@@ -11,4 +11,6 @@ panels {
 ports {
   name: "BEARER"
   path: "Components/Warps/Worldports/worldport11"
+  destination { x: 93.5 y: 0 z: 27 }
+  rotation: 90
 }
@@ -10,4 +10,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/Worldports/worldport"
+  destination { x: 0 y: 0 z: 11 }
+  rotation: 0
 }
@@ -52,8 +52,12 @@ paintings {
 ports {
   name: "SWEET1"
   path: "Components/Warps/Worldports/worldport14"
+  destination { x: -27 y: 0 z: 76.5 }
+  rotation: 270
 }
 ports {
   name: "SWEET2"
   path: "Components/Warps/Worldports/worldport15"
+  destination { x: -36 y: 0 z: 76.5 }
+  rotation: 90
 }
@@ -49,4 +49,6 @@ panels {
 ports {
   name: "TREE"
   path: "Components/Warps/Worldports/worldport12"
+  destination { x: 41 y: 0 z: 50.5 }
+  rotation: 0
 }
@@ -3,4 +3,6 @@ panel_display_name: "O2 Room"
 ports {
   name: "UNKEMPT"
   path: "Components/Warps/Worldports/worldport6"
+  destination { x: -61 y: 0 z: 95 }
+  rotation: 270
 }
@@ -1,12 +1,8 @@
 name: "White Hallway From Entry"
 panel_display_name: "Southwest Area"
-# Not exactly sure what to do with this yet. In unshuffled connections, the door
-# here should be paired with the door on the other end (which is vanilla) even
-# if control center color doors are shuffled. But when connections are shuffled
-# maybe this should be shuffled separately? I might also want to find a way to
-# register when there's a door immediately outside of a connection so that when
-# two connections behind doors are shuffled together, their doors can be paired.
 ports {
   name: "ENTRY"
   path: "Components/Warps/Worldports/worldport10"
+  destination { x: -46 y: 0 z: 23 }
+  rotation: 90
 }
@@ -38,4 +38,6 @@ panels {
 ports {
   name: "WONDROUS"
   path: "Components/Warps/Worldports/worldport3"
+  destination { x: -104 y: 0 z: -69 }
+  rotation: 180
 }
@@ -31,4 +31,6 @@ paintings {
 ports {
   name: "FOURROOMS"
   path: "Components/Warps/Worldports/worldport8"
+  destination { x: 92.5 y: 0 z: -62 }
+  rotation: 90
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 0 y: 0 z: -40.5 }
+  rotation: 180
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "IMPRESSIVE"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport3"
-  orientation: "south"
+  destination { x: 20 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "OWL"
   path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: 20 y: 0 z: -40.5 }
+  rotation: 180
 }
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 10 y: 0 z: -84.5 }
+  rotation: 180
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "UNYIELDING"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 4 z: 15 }
+  rotation: 90
 }
@@ -2,5 +2,6 @@ name: "Tree Entrance"
 ports {
   name: "TREE"
   path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: -19 y: 0 z: -83.5 }
+  rotation: 180
 }
@@ -14,10 +14,12 @@ paintings {
 ports {
   name: "CC"
   path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: 36 y: 0 z: 1 }
+  rotation: 180
 }
 ports {
   name: "LIVELY"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: 24 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -198,5 +198,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: -1 y: 0 z: 20 }
+  rotation: 90
 }
@@ -2,5 +2,6 @@ name: "Plaza Entrance"
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 1 }
+  rotation: 180
 }
@@ -128,5 +128,6 @@ panels {
 ports {
   name: "GALLERY"
   path: "Components/Warps/worldport"
-  orientation: "southwest" # uhhhh this is new
+  destination { x: -19 y: 0 z: 19 }
+  rotation: 315
 }
@@ -24,10 +24,12 @@ panels {
 ports {
   name: "STURDY"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -75 }
+  rotation: 270
 }
 ports {
   name: "DARKROOM"
   path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -51 }
+  rotation: 270
 }
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: 3.5 y: 0 z: 19 }
+  rotation: 270
 }
@@ -86,7 +86,8 @@ panels {
 ports {
   name: "DARKROOM"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 7.5 }
+  rotation: 180
 }
 paintings {
   name: "P"
@@ -1,7 +1,12 @@
 connections {
+  from_room: "First Room"
+  to_room: "First Room Exit"
+  door { name: "Second Room Entrance" }
+}
+connections {
   from {
     port {
-      room: "First Room"
+      room: "First Room Exit"
       name: "NEXT"
     }
   }
@@ -14,9 +19,14 @@ connections {
   oneway: true
 }
 connections {
+  from_room: "Second Room"
+  to_room: "Second Room Exit"
+  door { name: "Third Room Entrance" }
+}
+connections {
   from {
     port {
-      room: "Second Room"
+      room: "Second Room Exit"
       name: "NEXT"
     }
   }
@@ -3,5 +3,6 @@ panel_display_name: "Second Room"
 ports {
   name: "CONGRUENT"
   path: "Components/Warps/worldport7"
-  orientation: "east"
+  destination { x: 51.5 y: 0 z: 29 }
+  rotation: 90
 }
@@ -3,5 +3,6 @@ panel_display_name: "First Room"
 ports {
   name: "COLORFUL"
   path: "Components/Warps/worldport8"
-  orientation: "north"
+  destination { x: 20 y: 0 z: -12 }
+  rotation: 180
 }
@@ -3,5 +3,6 @@ panel_display_name: "First Room"
 ports {
   name: "DOUBLESIDED"
   path: "Components/Warps/worldport6"
-  orientation: "east"
+  destination { x: 15 y: 0 z: 23 }
+  rotation: 90
 }
@@ -0,0 +1,8 @@
+name: "First Room Exit"
+panel_display_name: "First Room"
+ports {
+  name: "NEXT"
+  path: "Components/Warps/worldport2"
+  destination { x: 0 y: 0 z: -15 }
+  rotation: 180
+}
@@ -34,11 +34,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
-  orientation: "south"
-}
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport2"
-  orientation: "north"
-  required_door { name: "Second Room Entrance" }
+  destination { x: -10 y: 0 z: 10 }
+  rotation: 0
 }
@@ -0,0 +1,8 @@
+name: "Second Room Exit"
+panel_display_name: "Second Room"
+ports {
+  name: "NEXT"
+  path: "Components/Warps/worldport4"
+  destination { x: 48 y: 0 z: -15 }
+  rotation: 180
+}
@@ -39,11 +39,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport3"
-  orientation: "south"
-}
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport4"
-  orientation: "north"
-  required_door { name: "Third Room Entrance" }
+  destination { x: 38 y: 0 z: 10 }
+  rotation: 0
 }
@@ -66,5 +66,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 97 y: 0 z: 10 }
+  rotation: 0
 }
@@ -2,5 +2,6 @@ name: "Gallery Maze"
 ports {
   name: "GALLERY"
   path: "Components/Warps/worldport4"
-  orientation: "east"
+  destination { x: -58 y: 0 z: -76 }
+  rotation: 90
 }
@@ -28,15 +28,18 @@ panels {
 ports {
   name: "ENTRY1"
   path: "Components/Worldports/worldport3"
-  orientation: "west"
+  destination { x: -33 y: 0 z: 28 }
+  rotation: 270
 }
 ports {
   name: "ENTRY2"
   path: "Components/Worldports/worldport"
-  orientation: "south"
+  destination { x: -30 y: 0 z: 51 }
+  rotation: 0
 }
 ports {
   name: "ENTRY3"
   path: "Components/Worldports/worldport2"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 51 }
+  rotation: 0
 }
@@ -9,6 +9,6 @@ panels {
 ports {
   name: "TREE"
   path: "Components/Worldports/worldport4"
-  orientation: "east"
-  # This is double sided.
+  destination { x: -16 y: 0 z: -31 }
+  rotation: 270
 }
@@ -2,5 +2,6 @@ name: "Unyielding Entrance"
 ports {
   name: "UNYIELDING"
   path: "Components/Warps/worldport5"
-  orientation: "east"
+  destination { x: 14 y: 0 z: 5 }
+  rotation: 90
 }
@@ -16,5 +16,6 @@ panels {
 ports {
   name: "DARKROOM"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 8 }
+  rotation: 270
 }
@@ -160,6 +160,11 @@ connections {
   door { name: "Lime Room Entrance" }
 }
 connections {
+  from_room: "Lime Room"
+  to_room: "Revitalized Entrance"
+  door { name: "Revitalized Entrance" }
+}
+connections {
   from { painting { room: "Link Area" name: "NEAR" } }
   to { painting { room: "Flipped Link Area" name: "NEAR" } }
   oneway: true
@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
   name: "COMPOSITE"
   path: "Components/Warps/worldport12"
-  orientation: "east"
+  destination { x: 16 y: 0 z: -20 }
+  rotation: 90
 }
@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -16 y: 0 z: -20 }
+  rotation: 270
 }
@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
   name: "DIGITAL"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -78 y: 0 z: -24 }
+  rotation: 270
 }
@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -36 }
+  rotation: 180
 }
@@ -32,5 +32,6 @@ paintings {
 ports {
   name: "LIONIZED"
   path: "Components/Warps/worldport10"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -88.5 }
+  rotation: 180
 }
@@ -2,6 +2,7 @@ name: "Four Rooms Entrance"
 ports {
   name: "FOUR"
   path: "Components/Warps/worldport9"
-  orientation: "south"
+  destination { x: -41 y: 6 z: -17.5 }
+  rotation: 0
   gravity: Y_PLUS
 }
@@ -10,5 +10,6 @@ panels {
 ports {
   name: "GALLERY"
   path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 8.5 }
+  rotation: 180
 }
\ No newline at end of file
@@ -73,7 +73,8 @@ panels {
 ports {
   name: "DARKROOM"
   path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 43 y: 0 z: -10 }
+  rotation: 0
 }
 paintings {
   name: "PAINS"
@@ -2,5 +2,6 @@ name: "Liberated Entrance"
 ports {
   name: "BLUE"
   path: "worldport8"
-  orientation: "west"
+  destination { x: 18 y: 0 z: 55 }
+  rotation: 270
 }
@@ -19,9 +19,3 @@ panels {
   answer: "white"
   symbols: EXAMPLE
 }
-ports {
-  name: "REVITALIZED"
-  path: "worldport7"
-  orientation: "north"
-  required_door { name: "Revitalized Entrance" }
-}
\ No newline at end of file
@@ -2,5 +2,6 @@ name: "Literate Entrance"
 ports {
   name: "BROWN"
   path: "worldport9"
-  orientation: "east"
+  destination { x: 39 y: 0 z: 55 }
+  rotation: 90
 }
@@ -10,5 +10,6 @@ panels {
 ports {
   name: "PARTHENON"
   path: "Components/Warps/worldport8"
-  orientation: "north"
-}
\ No newline at end of file
+  destination { x: -5.5 y: 0 z: 18 }
+  rotation: 180
+}
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "HOLE"
   path: "worldport4"
-  orientation: "down"
-}
\ No newline at end of file
+  destination { x: 74 y: 0 z: -43 }
+  rotation: 0
+}
@@ -3,5 +3,9 @@ panel_display_name: "Starting Room"
 ports {
   name: "REPETITIVE"
   path: "Components/Warps/worldport7"
-  orientation: "north"
+  destination { x: -20 y: 0 z: -16 }
+  rotation: 180
+  # TODO: this is part of what makes the keyholder dependent connection from CC
+  # safe in vanilla doors
+  no_shuffle: true
 }
@@ -0,0 +1,8 @@
+name: "Revitalized Entrance"
+panel_display_name: "Colored Doors Area"
+ports {
+  name: "REVITALIZED"
+  path: "worldport7"
+  destination { x: -58 y: 0 z: 31.5 }
+  rotation: 180
+}
@@ -10,5 +10,6 @@ panels {
 ports {
   name: "SHOP"
   path: "Components/Warps/worldport13"
-  orientation: "east"
+  destination { x: 18 y: 0 z: 49 }
+  rotation: 90
 }
\ No newline at end of file
@@ -3,5 +3,6 @@ panel_display_name: "Colored Doors Area"
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport11"
-  orientation: "west"
+  destination { x: -45 y: 0 z: 24 }
+  rotation: 270
 }
@@ -7,5 +7,6 @@ letters {
 ports {
   name: "CC"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -12.5 y: 0 z: 60 }
+  rotation: 270
 }
@@ -24,5 +24,6 @@ ports {
   name: "GALLERY"
   path: "Components/Warps/worldport2"
   gravity: Z_PLUS
-  # TODO: orientation is not well defined with Z-axis gravity
+  # TODO: entrance shuffling for non Y axis gravity
+  no_shuffle: true
 }
@@ -163,5 +163,6 @@ paintings {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 16 }
+  rotation: 270
 }
@@ -125,22 +125,26 @@ paintings {
 ports {
   name: "UNKEMPT"
   path: "Meshes/Blocks/Warps/worldport5"
-  orientation: "north"
+  destination { x: 72 y: 0 z: 10.5 }
+  rotation: 180
 }
 ports {
   name: "THREEDOORS"
   path: "Meshes/Blocks/Warps/worldport16"
-  orientation: "south"
+  destination { x: 77 y: 0 z: 33.5 }
+  rotation: 0
 }
 ports {
   name: "TOWER"
   path: "Meshes/Blocks/Warps/worldport10"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 52 }
+  rotation: 0
   required_door { name: "Tower Entrance" }
   # The reverse warp bypasses the door, so there needs to be two oneway connections.
 }
 ports {
   name: "TREE"
   path: "Meshes/Blocks/Warps/worldport17"
-  orientation: "north"
+  destination { x: 26 y: 0 z: 58 }
+  rotation: 180
 }
@@ -3,5 +3,6 @@ panel_display_name: "Pillar Room"
 ports {
   name: "COLORFUL"
   path: "Meshes/Blocks/Warps/worldport13"
-  orientation: "west"
+  destination { x: -37.5 y: 0 z: 74 }
+  rotation: 270
 }
@@ -10,7 +10,8 @@ panels {
 ports {
   name: "DAEDALUS"
   path: "Meshes/Blocks/Warps/worldport8"
-  orientation: "south"
+  destination { x: 98 y: 2 z: 27.5 }
+  rotation: 0
   required_door { name: "Daedalus Entrance" }
   # The reverse warp bypasses the door, so there needs to be two oneway connections.
 }
@@ -10,5 +10,6 @@ panels {
 ports {
   name: "HIVE"
   path: "Meshes/Blocks/Warps/worldport19"
-  orientation: "east"
+  destination { x: -91.5 y: 0 z: 37 }
+  rotation: 90
 }
@@ -3,5 +3,6 @@ panel_display_name: "West Side"
 ports {
   name: "JUBILANT"
   path: "Meshes/Blocks/Warps/worldport12"
-  orientation: "east"
+  destination { x: -62 y: 0 z: -19 }
+  rotation: 90
 }
@@ -123,26 +123,31 @@ panels {
 ports {
   name: "ENTRY"
   path: "Meshes/Blocks/Warps/worldport"
-  orientation: "south"
+  destination { x: 33 y: 0 z: 15 }
+  rotation: 0
 }
 ports {
   name: "KEEN"
   path: "Meshes/Blocks/Warps/worldport6"
-  orientation: "north"
+  destination { x: 33 y: 0 z: -21 }
+  rotation: 180
 }
 ports {
   name: "ORB"
   path: "Meshes/Blocks/Warps/worldport3"
-  orientation: "north"
+  destination { x: 62 y: 0 z: -13 }
+  rotation: 180
 }
 ports {
   name: "LINEAR"
   path: "Meshes/Blocks/Warps/worldport15"
-  orientation: "south"
+  destination { x: 33 y: 0 z: -42.5 }
+  rotation: 0
 }
 ports {
   name: "DIGITAL"
   path: "Meshes/Blocks/Warps/worldport4"
-  orientation: "down"
+  destination { x: -6.5 y: 0 z: 7.5 }
+  rotation: 0
   required_door { name: "Digital Entrance" }
 }
@@ -57,7 +57,7 @@ keyholders {
 ports {
   name: "INVISIBLE"
   path: "Meshes/Blocks/Warps/worldport20"
-  orientation: "north"
-  # Note that this can be easily entered from the other side.
+  destination { x: 33 y: 0 z: -66.5 }
+  rotation: 0
   required_door { name: "Invisible Entrance" }
 }
@@ -3,5 +3,6 @@ panel_display_name: "Main Area"
 ports {
   name: "DAEDALUS"
   path: "Meshes/Blocks/Warps/worldport18"
-  orientation: "north"
+  destination { x: 158 y: 0 z: 14 }
+  rotation: 180
 }
@@ -3,5 +3,6 @@ panel_display_name: "Main Area"
 ports {
   name: "BETWEEN"
   path: "Meshes/Blocks/Warps/worldport11"
-  orientation: "east"
+  destination { x: 83 y: 0 z: -21 }
+  rotation: 90
 }
@@ -3,5 +3,6 @@ panel_display_name: "Question Room"
 ports {
   name: "TALENTED"
   path: "Meshes/Blocks/Warps/worldport14"
-  orientation: "south"
+  destination { x: 109 y: -6 z: -26.5 }
+  rotation: 0
 }
@@ -64,17 +64,20 @@ paintings {
 ports {
   name: "IMPRESSIVE"
   path: "Meshes/Blocks/Warps/worldport2"
-  orientation: "south"
+  destination { x: -34 y: 0 z: 22.5 }
+  rotation: 0
 }
 ports {
   name: "CC"
   path: "Meshes/Blocks/Warps/worldport9"
-  orientation: "north"
+  destination { x: -59 y: 0 z: -50.5 }
+  rotation: 180
 }
 ports {
   name: "PARTIAL"
   path: "Meshes/Blocks/Warps/worldport7"
-  orientation: "east"
+  destination { x: -62 y: 0 z: 11 }
+  rotation: 90
   # ER with this is weird; make sure to place on the surface
   required_door { name: "Partial Entrance" }
 }
@@ -3,10 +3,12 @@ name: "Main Area"
 ports {
   name: "RIGHT"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 30 y: 0 z: 19 }
+  rotation: 270
 }
 ports {
   name: "LEFT"
   path: "Components/Warps/worldport2"
-  orientation: "east"
+  destination { x: 30 y: 0 z: -76 }
+  rotation: 270
 }
@@ -273,20 +273,24 @@ keyholders {
 ports {
   name: "DAED1"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -1.5 y: 0 z: 24 }
+  rotation: 270
 }
 ports {
   name: "DAED2"
   path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: -26.5 y: 0 z: -22 }
+  rotation: 270
 }
 ports {
   name: "DAED3"
   path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -44.5 y: 0 z: -13 }
+  rotation: 90
 }
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport4"
-  orientation: "west"
+  destination { x: -29.5 y: 0 z: -62 }
+  rotation: 270
 }
@@ -23,5 +23,6 @@ panels {
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -33 y: 0 z: 1 }
+  rotation: 90
 }
@@ -10,5 +10,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 11.5 }
+  rotation: 0
 }
@@ -10,5 +10,6 @@ panels {
 ports {
   name: "FOURROOMS"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -27 y: 0 z: 25.5 }
+  rotation: 0
 }
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 0 y: 0 z: -57 }
+  rotation: 180
 }
@@ -6,5 +6,7 @@ masteries {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  # Should this be shuffleable? It skips the maze lol.
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
 }
@@ -98,5 +98,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 9 }
+  rotation: 270
 }
@@ -70,5 +70,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -58,5 +58,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -58,4 +58,6 @@ panels {
 ports {
   name: "BETWEEN"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -107,7 +107,8 @@ panels {
 ports {
   name: "UNYIELDING"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
 keyholders {
   name: "S"
@@ -14,7 +14,8 @@ paintings {
 ports {
   name: "MID"
   path: "Components/Warps/worldport4"
-  orientation: "south"
+  destination { x: -69 y: 0 z: 43 }
+  rotation: 90
   # This port is in the room immediately after solving the B puzzles, which
   # means it seems like it would be inaccessible if you enter the map from the
   # painting or from the final port, but entering the O or R areas brings you
@@ -23,5 +24,6 @@ ports {
 ports {
   name: "FINAL"
   path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: -69 y: 0 z: 87 }
+  rotation: 90
 }
@@ -86,5 +86,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 38 y: 0 z: 39 }
+  rotation: 90
 }
@@ -150,6 +150,7 @@ paintings {
 ports {
   name: "FOURROOMS"
   path: "Components/Warps/worldport2"
-  orientation: "east"
+  destination { x: 71.5 y: 0 z: -9 }
+  rotation: 90
   # Note that this is behind teal walls.
 }
@@ -2,5 +2,6 @@ name: "Magenta Hallway"
 ports {
   name: "STURDY"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: 17 y: 0 z: -46 }
+  rotation: 270
 }
@@ -9,7 +9,8 @@ panels {
 ports {
   name: "GALLERY"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 9 }
+  rotation: 0
   # TODO: Note that this port is accessible from the other side in the Z1
   # room. Hmm.
 }
@@ -56,15 +56,18 @@ panels {
 ports {
   name: "GALLERY"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
 }
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: 0 y: 0 z: -21 }
+  rotation: 0
 }
 ports {
   name: "REVITALIZED"
   path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: -24 y: 0 z: -39 }
+  rotation: 180
 }
@@ -9,5 +9,8 @@ panels {
 ports {
   name: "CC"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 8 }
+  rotation: 180
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -100,7 +100,8 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 20 }
+  rotation: 270
 }
 keyholders {
   # This is one of the ones that's misnamed within the game.
@@ -2,5 +2,8 @@ name: "Main Area"
 ports {
   name: "CC"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 0 z: 13 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -37,15 +37,18 @@ panels {
 ports {
   name: "UNYIELDING"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: 1 y: 0 z: 10 }
+  rotation: 270
 }
 ports {
   name: "IMPRESSIVE"
   path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: 11 y: 0 z: 10 }
+  rotation: 270
 }
 ports {
   name: "BETWEEN"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -9 y: 0 z: 10 }
+  rotation: 270
 }
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "REPETITIVE"
   path: "Components/Warps/worldport5"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 16 }
+  rotation: 180
 }
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "SIRENIC"
   path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -51 y: 0 z: -43 }
+  rotation: 270
 }
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "SYMBOLIC"
   path: "Components/Warps/worldport4"
-  orientation: "south"
+  destination { x: 28 y: 0 z: 4 }
+  rotation: 0
 }
@@ -98,5 +98,6 @@ panels {
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 0 z: 8 }
+  rotation: 90
 }
@@ -2,5 +2,9 @@ name: "Entry Connector"
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -11 y: 0 z: 13 }
+  rotation: 0
+  # TODO: this is part of what makes the keyholder dependent connection form CC
+  # safe in vanilla doors
+  no_shuffle: true
 }
@@ -139,5 +139,8 @@ paintings {
 ports {
   name: "CC"
   path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -5.5 y: 0 z: 56 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -2,5 +2,6 @@ name: "Plaza Connector"
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport"
-  orientation: "north"
+  destination { x: 15 y: 0 z: 13 }
+  rotation: 0
 }
@@ -9,5 +9,6 @@ panels {
 ports {
   name: "PARTHENON"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 30 y: 0 z: 16 }
+  rotation: 0
 }
@@ -156,6 +156,8 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
+  destination { x: 4 y: 0 z: 12 }
+  rotation: 90
 }
 keyholders {
   name: "N"
@@ -16,5 +16,6 @@ panels {
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 26 }
+  rotation: 0
 }
@@ -32,5 +32,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -8.5 y: 0 z: 6 }
+  rotation: 270
 }
@@ -106,8 +106,12 @@ panels {
 ports {
   name: "OWL"
   path: "Components/Warps/worldport"
+  destination { x: 17 y: 0 z: 41 }
+  rotation: 90
 }
 ports {
   name: "COLORFUL"
   path: "Components/Warps/worldport2"
+  destination { x: 17 y: 0 z: -33 }
+  rotation: 90
 }
@@ -10,4 +10,6 @@ panels {
 ports {
   name: "UNKEMPT"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 13 }
+  rotation: 0
 }
@@ -201,8 +201,12 @@ panels {
 ports {
   name: "EXIT1"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -11.5 }
+  rotation: 180
 }
 ports {
   name: "EXIT2"
   path: "Components/Warps/worldport2"
+  destination { x: 0 y: 0 z: -17.5 }
+  rotation: 0
 }
@@ -8,4 +8,6 @@ panels {
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 2.5 }
+  rotation: 0
 }
@@ -112,4 +112,6 @@ keyholders {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
@@ -9,4 +9,8 @@ panels {
 ports {
   name: "CC"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 10 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -30,8 +30,12 @@ panels {
 ports {
   name: "BEGIN"
   path: "Components/Warps/worldport6"
+  destination { x: -38 y: 0 z: 41.5 }
+  rotation: 0
 }
 ports {
   name: "BEGIN2"
   path: "Components/Warps/worldport5"
+  destination { x: -38 y: 0 z: 27.5 }
+  rotation: 180
 }
@@ -30,8 +30,12 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
+  destination { x: -16 y: 0 z: 0.5 }
+  rotation: 180
 }
 ports {
   name: "TTD"
   path: "Components/Warps/worldport2"
+  destination { x: -16 y: 0 z: 14.5 }
+  rotation: 0
 }
@@ -16,4 +16,6 @@ panels {
 ports {
   name: "BEGIN"
   path: "Components/Warps/worldport7"
+  destination { x: -16 y: 0 z: 41.5 }
+  rotation: 0
 }
@@ -16,4 +16,6 @@ panels {
 ports {
   name: "BEGIN"
   path: "Components/Warps/worldport8"
+  destination { x: -16 y: 0 z: 27.5 }
+  rotation: 180
 }
@@ -28,8 +28,12 @@ panels {
 ports {
   name: "BEGIN"
   path: "Components/Warps/worldport3"
+  destination { x: -38 y: 0 z: 14.5 }
+  rotation: 0
 }
 ports {
   name: "NEXT"
   path: "Components/Warps/worldport4"
+  destination { x: -38 y: 0 z: 0.5 }
+  rotation: 180
 }
@@ -98,4 +98,6 @@ panels {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
+  destination { x: -0 y: 0 z: 13 }
+  rotation: 0
 }
@@ -2,4 +2,6 @@ name: "Bearer Entrance"
 ports {
   name: "BEARER"
   path: "Components/Warps/worldport"
+  destination { x: -15.5 y: 0 z: 20 }
+  rotation: 270
 }
@@ -212,18 +212,28 @@ panels {
 ports {
   name: "UNKEMPT"
   path: "Components/Warps/worldport4"
+  destination { x: -21 y: 0 z: 7 }
+  rotation: 0
+  # enterable from either side
 }
 ports {
   name: "DIGITAL"
   path: "Components/Warps/worldport5"
+  destination { x: -21 y: 0 z: -7 }
+  rotation: 180
+  # enterable from either side
 }
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport2"
+  destination { x: 21 y: 0 z: -4 }
+  rotation: 180
 }
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport3"
+  destination { x: 15.5 y: 0 z: -19 }
+  rotation: 90
 }
 paintings {
   name: "SEA"
@@ -9,4 +9,8 @@ panels {
 ports {
   name: "CC"
   path: "Components/Warps/worldport2"
+  destination { x: -4.5 y: 0 z: 7 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -2,4 +2,6 @@ name: "Daedalus Entrance"
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport4"
+  destination { x: 33 y: 0 z: -10 }
+  rotation: 90
 }
@@ -217,13 +217,19 @@ keyholders {
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport"
+  destination { x: -3 y: 0 z: 11 }
+  rotation: 270
 }
 ports {
   name: "TREE"
   path: "Components/Warps/worldport5"
+  destination { x: -34 y: 0 z: 7 }
+  rotation: 270
 }
 ports {
   name: "SUNTEMPLE"
   path: "Components/Warps/worldport3"
+  destination { x: -42 y: 0 z: -2 }
+  rotation: 270
   required_door { name: "Sun Temple Entrance" }
 }
@@ -2,4 +2,6 @@ name: "Bearer Entrance"
 ports {
   name: "BEARER"
   path: "Components/Warps/worldport4"
+  destination { x: 23 y: 0 z: -29 }
+  rotation: 90
 }
@@ -9,4 +9,6 @@ panels {
 ports {
   name: "DIGITAL"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
 }
@@ -2,4 +2,6 @@ name: "Nuanced Entrance"
 ports {
   name: "NUANCED"
   path: "Components/Warps/worldport3"
+  destination { x: -23 y: 0 z: -29 }
+  rotation: 270
 }
@@ -16,4 +16,6 @@ panels {
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport5"
+  destination { x: 35 y: 0 z: 44 }
+  rotation: 270
 }
@@ -8,4 +8,6 @@ panels {
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport"
+  destination { x: 18 y: 0 z: 41 }
+  rotation: 180
 }
@@ -58,4 +58,6 @@ panels {
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
 }
@@ -87,6 +87,12 @@ enum PuzzleSymbol {
   QUESTION = 19;
 }
 
+message Vec3d {
+  optional double x = 1;
+  optional double y = 2;
+  optional double z = 3;
+}
+
 message ProxyIdentifier {
   optional uint64 panel = 1;
   optional string answer = 2;
@@ -181,8 +187,10 @@ message Port {
   optional string name = 3;
 
   optional string path = 4;
-  optional string orientation = 5;
+  optional Vec3d destination = 5;
+  optional double rotation = 8;
   optional AxisDirection gravity = 7;
+  optional bool no_shuffle = 9;
 
   optional uint64 required_door = 6;
 }
@@ -152,7 +152,13 @@ message HumanPort {
   optional string name = 1;
   optional string path = 2;
 
-  optional string orientation = 3;
+  optional bool no_shuffle = 7;
+
+  // These specify how the player should be placed when a randomized entrance
+  // sends them to this port. "rotation" is in degrees and is counter-clockwise 
+  // from the positive X axis.
+  optional Vec3d destination = 3;
+  optional double rotation = 6;
   optional AxisDirection gravity = 5 [default = Y_MINUS];
 
   optional DoorIdentifier required_door = 4;
@@ -239,7 +239,13 @@ class DataPacker {
     Port& port = *container_.all_objects().mutable_ports(port_id);
 
     port.set_path(h_port.path());
-    port.set_orientation(h_port.orientation());
+
+    if (h_port.no_shuffle()) {
+      port.set_no_shuffle(h_port.no_shuffle());
+    } else {
+      *port.mutable_destination() = h_port.destination();
+      port.set_rotation(h_port.rotation());
+    }
 
     // Setting this explicitly because the Godot protobuf doesn't support
     // custom defaults.
@@ -273,6 +273,21 @@ class Validator {
         }
       }
     }
+
+    for (const HumanPort& port : port_info.definitions) {
+      if (!port.no_shuffle()) {
+        if (!port.has_destination()) {
+          std::cout << "Port " << port_identifier.ShortDebugString()
+                    << " is shuffleable and missing a destination."
+                    << std::endl;
+        }
+        if (!port.has_rotation()) {
+          std::cout << "Port " << port_identifier.ShortDebugString()
+                    << " is shuffleable and missing a rotation."
+                    << std::endl;
+        }
+      }
+    }
   }
 
   void ValidatePainting(const PaintingIdentifier& painting_identifier,