155 files changed, 334 insertions, 19 deletions

@@ -12,7 +12,7 @@ from .player_logic import Lingo2PlayerLogic
 from .regions import create_regions, shuffle_entrances, connect_ports_from_ut
 from .static_logic import Lingo2StaticLogic
 from .version import APWORLD_VERSION
-from ..LauncherComponents import Component, Type, components, launch as launch_component
+from ..LauncherComponents import Component, Type, components, launch as launch_component, icon_paths
 
 
 class Lingo2WebWorld(WebWorld):
@@ -163,6 +163,7 @@ def launch_client(*args):
     launch_component(client_main, name="Lingo2Client", args=args)
 
 
+icon_paths["lingo2_ico"] = f"ap:{__name__}/logo.png"
 component = Component("Lingo 2 Client", component_type=Type.CLIENT, func=launch_client,
-                      description="Open Lingo 2.", supports_uri=True, game_name="Lingo 2")
+                      description="Open Lingo 2.", supports_uri=True, game_name="Lingo 2", icon="lingo2_ico")
 components.append(component)
@@ -175,7 +175,7 @@ func get_door_receivers(door_id):
 
 func get_worldport_display_name(port_id):
         var port = objects.get_ports()[port_id]
-        return "%s - %s (Worldport)" % [_get_room_object_map_name(port), port.get_name()]
+        return "%s - %s" % [_get_room_object_map_name(port), port.get_display_name()]
 
 
 func _get_map_object_map_name(obj):
@@ -333,6 +333,7 @@ func _on_checked_worldports_updated():
         var textclient_node = global.get_node("Textclient")
         if textclient_node != null:
                 textclient_node.update_locations()
+                textclient_node.update_worldports()
 
 
 func _client_could_not_connect(message):
@@ -449,6 +450,10 @@ func _client_connected(slot_data):
 
                 _inverse_item_locks[lock[0]].append([door_id, lock[1]])
 
+        if shuffle_worldports:
+                var textclient = global.get_node("Textclient")
+                textclient.setup_worldports()
+
         ap_connected.emit()
 
 
@@ -8,6 +8,13 @@ var tracker_label
 var is_open = false
 
 var locations_overlay
+var location_texture
+var worldport_texture
+
+var worldports_tab
+var worldports_tree
+var port_tree_item_by_map = {}
+var port_tree_item_by_map_port = {}
 
 
 func _ready():
@@ -20,9 +27,10 @@ func _ready():
         locations_overlay.offset_bottom = 720
         locations_overlay.offset_left = 20
         locations_overlay.anchor_right = 1.0
-        locations_overlay.offset_right = -20
+        locations_overlay.offset_right = -10
         locations_overlay.scroll_active = false
         locations_overlay.mouse_filter = Control.MOUSE_FILTER_IGNORE
+        locations_overlay.texture_filter = CanvasItem.TEXTURE_FILTER_NEAREST
         add_child(locations_overlay)
         update_locations_visibility()
 
@@ -83,6 +91,31 @@ func _ready():
         tracker_label = RichTextLabel.new()
         tracker_margins.add_child(tracker_label)
 
+        worldports_tab = MarginContainer.new()
+        worldports_tab.name = "Worldports"
+        worldports_tab.add_theme_constant_override("margin_top", 60)
+        worldports_tab.add_theme_constant_override("margin_left", 60)
+        worldports_tab.add_theme_constant_override("margin_right", 60)
+        worldports_tab.add_theme_constant_override("margin_bottom", 60)
+        tabs.add_child(worldports_tab)
+        tabs.set_tab_hidden(2, true)
+
+        worldports_tree = Tree.new()
+        worldports_tree.columns = 2
+        worldports_tree.hide_root = true
+        worldports_tree.theme = preload("res://assets/themes/baseUI.tres")
+        worldports_tree.add_theme_font_size_override("font_size", 24)
+        worldports_tab.add_child(worldports_tree)
+
+        var runtime = global.get_node("Runtime")
+        var location_image = Image.new()
+        location_image.load_png_from_buffer(runtime.read_path("assets/location.png"))
+        location_texture = ImageTexture.create_from_image(location_image)
+
+        var worldport_image = Image.new()
+        worldport_image.load_png_from_buffer(runtime.read_path("assets/worldport.png"))
+        worldport_texture = ImageTexture.create_from_image(worldport_image)
+
 
 func _input(event):
         if global.loaded and event is InputEventKey and event.pressed:
@@ -144,16 +177,22 @@ func update_locations():
         locations_overlay.push_outline_color(Color(0, 0, 0, 1))
         locations_overlay.push_outline_size(2)
 
+        const kLocation = 0
+        const kWorldport = 1
+
         var location_names = []
+        var type_by_name = {}
         for location_id in ap.client._accessible_locations:
                 if not ap.client._checked_locations.has(location_id):
                         var location_name = gamedata.location_name_by_id.get(location_id, "(Unknown)")
                         location_names.append(location_name)
+                        type_by_name[location_name] = kLocation
 
         for port_id in ap.client._accessible_worldports:
                 if not ap.client._checked_worldports.has(port_id):
                         var port_name = gamedata.get_worldport_display_name(port_id)
                         location_names.append(port_name)
+                        type_by_name[port_name] = kWorldport
 
         location_names.sort()
 
@@ -161,7 +200,14 @@ func update_locations():
         for location_name in location_names:
                 tracker_label.append_text("[p]%s[/p]" % location_name)
                 if count < 18:
-                        locations_overlay.append_text("[p align=right]%s[/p]" % location_name)
+                        locations_overlay.push_paragraph(HORIZONTAL_ALIGNMENT_RIGHT)
+                        locations_overlay.append_text(location_name)
+                        locations_overlay.append_text(" ")
+                        if type_by_name[location_name] == kLocation:
+                                locations_overlay.add_image(location_texture)
+                        elif type_by_name[location_name] == kWorldport:
+                                locations_overlay.add_image(worldport_texture)
+                        locations_overlay.pop()
                 count += 1
 
         if count > 18:
@@ -173,5 +219,77 @@ func update_locations_visibility():
         locations_overlay.visible = ap.show_locations
 
 
+func setup_worldports():
+        tabs.set_tab_hidden(2, false)
+
+        var root_ti = worldports_tree.create_item(null)
+
+        var ports_by_map_id = {}
+        var display_names_by_map_id = {}
+        var display_names_by_port_id = {}
+
+        var ap = global.get_node("Archipelago")
+        var gamedata = global.get_node("Gamedata")
+        for fpid in ap.port_pairings:
+                var port = gamedata.objects.get_ports()[fpid]
+                var room = gamedata.objects.get_rooms()[port.get_room_id()]
+
+                if not ports_by_map_id.has(room.get_map_id()):
+                        ports_by_map_id[room.get_map_id()] = []
+
+                        var map = gamedata.objects.get_maps()[room.get_map_id()]
+                        display_names_by_map_id[map.get_id()] = map.get_display_name()
+
+                ports_by_map_id[room.get_map_id()].append(fpid)
+                display_names_by_port_id[fpid] = port.get_display_name()
+
+        var sorted_map_ids = ports_by_map_id.keys().duplicate()
+        sorted_map_ids.sort_custom(
+                func(a, b): return display_names_by_map_id[a] < display_names_by_map_id[b]
+        )
+
+        for map_id in sorted_map_ids:
+                var map_ti = root_ti.create_child()
+                map_ti.set_text(0, display_names_by_map_id[map_id])
+                map_ti.visible = false
+                map_ti.collapsed = true
+                port_tree_item_by_map[map_id] = map_ti
+                port_tree_item_by_map_port[map_id] = {}
+
+                var port_ids = ports_by_map_id[map_id]
+                port_ids.sort_custom(
+                        func(a, b): return display_names_by_port_id[a] < display_names_by_port_id[b]
+                )
+
+                for port_id in port_ids:
+                        var port_ti = map_ti.create_child()
+                        port_ti.set_text(0, display_names_by_port_id[port_id])
+                        port_ti.set_text(1, gamedata.get_worldport_display_name(ap.port_pairings[port_id]))
+                        port_ti.visible = false
+                        port_tree_item_by_map_port[map_id][port_id] = port_ti
+
+        update_worldports()
+
+
+func update_worldports():
+        var ap = global.get_node("Archipelago")
+
+        for map_id in port_tree_item_by_map_port.keys():
+                var map_visible = false
+
+                for port_id in port_tree_item_by_map_port[map_id].keys():
+                        var ti = port_tree_item_by_map_port[map_id][port_id]
+                        ti.visible = ap.client._checked_worldports.has(port_id)
+
+                        if ti.visible:
+                                map_visible = true
+
+                port_tree_item_by_map[map_id].visible = map_visible
+
+
 func reset():
         locations_overlay.clear()
+        tabs.set_tab_hidden(2, true)
+        port_tree_item_by_map.clear()
+        port_tree_item_by_map_port.clear()
+        worldports_tree.clear()
@@ -495,6 +495,7 @@ async def process_game_cmd(manager: Lingo2Manager, args: dict):
         updates = manager.update_worldports(worldports)
         if len(updates) > 0:
             async_start(manager.client_ctx.update_worldports(updates), name="client update worldports")
+            manager.game_ctx.send_update_worldports(updates)
     elif cmd == "Quit":
         manager.client_ctx.exit_event.set()
 
@@ -731,7 +731,7 @@ connections {
   from {
     port {
       map: "the_orb"
-      room: "B Room"
+      room: "Middle Room"
       name: "MID"
     }
   }
@@ -1,6 +1,7 @@
 name: "Ancient Entrance"
 ports {
   name: "ANCIENT"
+  display_name: "Ancient Entrance"
   path: "Components/Warps/worldport8"
   destination { x: -27 y: 0 z: -34 }
   rotation: 90
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "BETWEEN"
+  display_name: "Between Connector"
   path: "Components/Warps/worldport5"
   destination { x: 39 y: 0 z: -17 }
   rotation: 270
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entry Connector"
   path: "Components/Warps/worldport2"
   destination { x: 26 y: 0 z: -16.5 }
   rotation: 0
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: -1.5 }
   rotation: 0
@@ -49,28 +49,33 @@ keyholders {
 }
 ports {
   name: "RIGHT"
+  display_name: "Hinterlands South Entrance"
   path: "Components/Warps/worldport6"
   destination { x: 82 y: 0 z: -10 }
   rotation: 90
 }
 ports {
   name: "LEFT"
+  display_name: "Hinterlands North Entrance"
   path: "Components/Warps/worldport7"
   destination { x: 82 y: 0 z: -48 }
   rotation: 90
 }
 ports {
   name: "RELENTLESS_LEFT"
+  display_name: "Relentless LEFT Entrance"
   path: "Components/Warps/worldport9"
   no_shuffle: true
 }
 ports {
   name: "RELENTLESS_SHOP"
+  display_name: "Relentless SHOP Entrance"
   path: "Components/Warps/worldport11"
   no_shuffle: true
 }
 ports {
   name: "RELENTLESS_TURN"
+  display_name: "Relentless TURN Entrance"
   path: "Components/Warps/worldport10"
   no_shuffle: true
 }
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "PARTIAL"
+  display_name: "Partial Connector"
   path: "Components/Warps/worldport4"
   destination { x: 21 y: 0 z: -41 }
   rotation: 270
@@ -16,6 +16,7 @@ panels {
 }
 ports {
   name: "PERCEPTIVE"
+  display_name: "Perceptive Entrance"
   path: "Components/Warps/worldport12"
   destination { x: -23 y: 0 z: -11 }
   rotation: 0
@@ -1,6 +1,7 @@
 name: "Repetitive Entrance"
 ports {
   name: "REPETITIVE"
+  display_name: "Repetitive Entrance"
   path: "Components/Warps/worldport14"
   destination { x: -16 y: 0 z: -17.5 }
   rotation: 0
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "TENACIOUS"
+  display_name: "Tenacious Connector"
   path: "Components/Warps/worldport13"
   destination { x: 56 y: 0 z: -38 }
   rotation: 180
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Unkempt Connector"
   path: "Components/Warps/worldport3"
   destination { x: 34 y: 0 z: -38.5 }
   rotation: 90
@@ -194,6 +194,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Composite Room Worldport"
   path: "Components/Warps/Worldports/worldport16"
   destination { x: -84 y: 0 z: 81 }
   rotation: 270
@@ -10,6 +10,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Starting Room West Wall Middle Worldport"
   path: "Components/Warps/Worldports/worldport4"
   destination { x: -21 y: 0 z: -4 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "Hedges Tower"
 panel_display_name: "Hedges"
 ports {
   name: "TENACIOUS"
+  display_name: "Hedge Maze Tower"
   path: "Components/Warps/Worldports/worldport13"
   no_shuffle: true
 }
@@ -6,6 +6,7 @@ paintings {
 }
 ports {
   name: "HIVE"
+  display_name: "Moat Worldport"
   path: "Components/Warps/Worldports/worldport9"
   destination { x: 64 y: 1 z: 24.5 }
   rotation: 0
@@ -76,6 +76,7 @@ paintings {
 }
 ports {
   name: "REVITALIZED"
+  display_name: "Near Hedges Plum Hallway"
   path: "Components/Warps/Worldports/worldport7"
   destination { x: 45 y: 0 z: 94 }
   rotation: 270
@@ -2,6 +2,7 @@ name: "Purple Hallway From Great"
 panel_display_name: "South Area"
 ports {
   name: "GREAT"
+  display_name: "Near Sweet Purple Hallway"
   path: "Components/Warps/Worldports/worldport17"
   destination { x: -24 y: 0 z: 61 }
   rotation: 270
@@ -16,6 +16,7 @@ paintings {
 }
 ports {
   name: "QUIET"
+  display_name: "Near Planet Painting Worldport"
   path: "Components/Warps/Worldports/worldport5"
   destination { x: -32 y: 0 z: -40 }
   rotation: 90
@@ -10,6 +10,7 @@ panels {
 }
 ports {
   name: "BEARER"
+  display_name: "Rain Panel Worldport"
   path: "Components/Warps/Worldports/worldport11"
   destination { x: 93.5 y: 0 z: 27 }
   rotation: 90
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Starting Room South Wall Middle Worldport"
   path: "Components/Warps/Worldports/worldport"
   destination { x: 0 y: 0 z: 11 }
   rotation: 0
@@ -51,12 +51,14 @@ paintings {
 }
 ports {
   name: "SWEET1"
+  display_name: "Sweet East Entrance"
   path: "Components/Warps/Worldports/worldport14"
   destination { x: -27 y: 0 z: 76.5 }
   rotation: 270
 }
 ports {
   name: "SWEET2"
+  display_name: "Sweet West Entrance"
   path: "Components/Warps/Worldports/worldport15"
   destination { x: -36 y: 0 z: 76.5 }
   rotation: 90
@@ -48,6 +48,7 @@ panels {
 }
 ports {
   name: "TREE"
+  display_name: "Near Pumpkin Brown Hallway"
   path: "Components/Warps/Worldports/worldport12"
   destination { x: 41 y: 0 z: 50.5 }
   rotation: 0
@@ -2,6 +2,7 @@ name: "Unkempt Entrance"
 panel_display_name: "O2 Room"
 ports {
   name: "UNKEMPT"
+  display_name: "O2 Room Worldport"
   path: "Components/Warps/Worldports/worldport6"
   destination { x: -61 y: 0 z: 95 }
   rotation: 270
@@ -2,6 +2,7 @@ name: "White Hallway From Entry"
 panel_display_name: "Southwest Area"
 ports {
   name: "ENTRY"
+  display_name: "Near Globe White Hallway"
   path: "Components/Warps/Worldports/worldport10"
   destination { x: -46 y: 0 z: 23 }
   rotation: 90
@@ -37,6 +37,7 @@ panels {
 }
 ports {
   name: "WONDROUS"
+  display_name: "Wonderland Worldport"
   path: "Components/Warps/Worldports/worldport3"
   destination { x: -104 y: 0 z: -69 }
   rotation: 180
@@ -30,6 +30,7 @@ paintings {
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Near Yellow Worldport"
   path: "Components/Warps/Worldports/worldport8"
   destination { x: 92.5 y: 0 z: -62 }
   rotation: 90
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Examples Room Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 0 y: 0 z: -40.5 }
   rotation: 180
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "IMPRESSIVE"
+  display_name: "Intensify Room Worldport"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 6.5 }
   rotation: 0
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Synonyms Room Worldport"
   path: "Components/Warps/worldport3"
   destination { x: 20 y: 0 z: 6.5 }
   rotation: 0
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "OWL"
+  display_name: "Time Room Worldport"
   path: "Components/Warps/worldport4"
   destination { x: 20 y: 0 z: -40.5 }
   rotation: 180
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Dark Hallway"
   path: "Components/Warps/worldport2"
   destination { x: 10 y: 0 z: -84.5 }
   rotation: 180
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "UNYIELDING"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
   destination { x: 3 y: 4 z: 15 }
   rotation: 90
@@ -1,6 +1,7 @@
 name: "Tree Entrance"
 ports {
   name: "TREE"
+  display_name: "Brown Hallway"
   path: "Components/Warps/worldport3"
   destination { x: -19 y: 0 z: -83.5 }
   rotation: 180
@@ -13,12 +13,14 @@ paintings {
 }
 ports {
   name: "CC"
+  display_name: "Lavender Structure"
   path: "Components/Warps/worldport3"
   destination { x: 36 y: 0 z: 1 }
   rotation: 180
 }
 ports {
   name: "LIVELY"
+  display_name: "Near Painting Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 24 y: 0 z: 6.5 }
   rotation: 0
@@ -197,6 +197,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Salmon Hallway"
   path: "Components/Warps/worldport"
   destination { x: -1 y: 0 z: 20 }
   rotation: 90
@@ -1,6 +1,7 @@
 name: "Plaza Entrance"
 ports {
   name: "PLAZA"
+  display_name: "Trick or Treat Worldport"
   path: "Components/Warps/worldport4"
   destination { x: -38 y: 0 z: 1 }
   rotation: 180
@@ -127,6 +127,7 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Worldport"
   path: "Components/Warps/worldport"
   destination { x: -19 y: 0 z: 19 }
   rotation: 315
@@ -23,12 +23,14 @@ panels {
 }
 ports {
   name: "STURDY"
+  display_name: "North Cyan Worldport"
   path: "Components/Warps/worldport3"
   destination { x: -17 y: 0 z: -75 }
   rotation: 270
 }
 ports {
   name: "DARKROOM"
+  display_name: "South Cyan Worldport"
   path: "Components/Warps/worldport2"
   destination { x: -17 y: 0 z: -51 }
   rotation: 270
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3.5 y: 0 z: 19 }
   rotation: 270
@@ -85,6 +85,7 @@ panels {
 }
 ports {
   name: "DARKROOM"
+  display_name: "Entrance"
   path: "Components/Warps/worldport2"
   destination { x: -19 y: 0 z: 7.5 }
   rotation: 180
@@ -2,6 +2,7 @@ name: "Congruent Entrance"
 panel_display_name: "Second Room"
 ports {
   name: "CONGRUENT"
+  display_name: "Second Room Gray Hallway"
   path: "Components/Warps/worldport7"
   destination { x: 51.5 y: 0 z: 29 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "Cyan Hallway"
 panel_display_name: "First Room"
 ports {
   name: "COLORFUL"
+  display_name: "First Room Cyan Hallway"
   path: "Components/Warps/worldport8"
   destination { x: 20 y: 0 z: -12 }
   rotation: 180
@@ -2,6 +2,7 @@ name: "Double Sided Entrance"
 panel_display_name: "First Room"
 ports {
   name: "DOUBLESIDED"
+  display_name: "First Room White Hallway"
   path: "Components/Warps/worldport6"
   destination { x: 15 y: 0 z: 23 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "First Room Exit"
 panel_display_name: "First Room"
 ports {
   name: "NEXT"
+  display_name: "First Room Exit"
   path: "Components/Warps/worldport2"
   destination { x: 0 y: 0 z: -15 }
   rotation: 180
@@ -33,6 +33,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "First Room Entrance"
   path: "Components/Warps/worldport"
   destination { x: -10 y: 0 z: 10 }
   rotation: 0
@@ -2,6 +2,7 @@ name: "Second Room Exit"
 panel_display_name: "Second Room"
 ports {
   name: "NEXT"
+  display_name: "Second Room Exit"
   path: "Components/Warps/worldport4"
   destination { x: 48 y: 0 z: -15 }
   rotation: 180
@@ -38,6 +38,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Second Room Entrance"
   path: "Components/Warps/worldport3"
   destination { x: 38 y: 0 z: 10 }
   rotation: 0
@@ -65,6 +65,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Third Room Entrance"
   path: "Components/Warps/worldport5"
   destination { x: 97 y: 0 z: 10 }
   rotation: 0
@@ -1,6 +1,7 @@
 name: "Gallery Maze"
 ports {
   name: "GALLERY"
+  display_name: "Gallery Maze Worldport"
   path: "Components/Warps/worldport4"
   destination { x: -58 y: 0 z: -76 }
   rotation: 90
@@ -27,18 +27,21 @@ panels {
 }
 ports {
   name: "ENTRY1"
+  display_name: "Maze NW Worldport"
   path: "Components/Worldports/worldport3"
   destination { x: -33 y: 0 z: 28 }
   rotation: 270
 }
 ports {
   name: "ENTRY2"
+  display_name: "Maze SW Worldport"
   path: "Components/Worldports/worldport"
   destination { x: -30 y: 0 z: 51 }
   rotation: 0
 }
 ports {
   name: "ENTRY3"
+  display_name: "Maze SE Worldport"
   path: "Components/Worldports/worldport2"
   destination { x: 0 y: 0 z: 51 }
   rotation: 0
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "TREE"
+  display_name: "Brown Hallway"
   path: "Components/Worldports/worldport4"
   destination { x: -16 y: 0 z: -31 }
   rotation: 270
@@ -1,6 +1,7 @@
 name: "Unyielding Entrance"
 ports {
   name: "UNYIELDING"
+  display_name: "Blue Door Worldport"
   path: "Components/Warps/worldport5"
   destination { x: 14 y: 0 z: 5 }
   rotation: 90
@@ -15,6 +15,7 @@ panels {
 }
 ports {
   name: "DARKROOM"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3 y: 0 z: 8 }
   rotation: 270
@@ -2,6 +2,7 @@ name: "Composite Room Entrance"
 panel_display_name: "Starting Room"
 ports {
   name: "COMPOSITE"
+  display_name: "Starting Room NE Worldport"
   path: "Components/Warps/worldport12"
   destination { x: 16 y: 0 z: -20 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "Daedalus Entrance"
 panel_display_name: "Starting Room"
 ports {
   name: "DAEDALUS"
+  display_name: "Starting Room North Wall West Worldport"
   path: "Components/Warps/worldport6"
   destination { x: -16 y: 0 z: -20 }
   rotation: 270
@@ -2,6 +2,7 @@ name: "Digital Entrance"
 panel_display_name: "Starting Room"
 ports {
   name: "DIGITAL"
+  display_name: "Second Room Left Worldport"
   path: "Components/Warps/worldport"
   destination { x: -78 y: 0 z: -24 }
   rotation: 270
@@ -2,6 +2,7 @@ name: "Entry Exit"
 panel_display_name: "Starting Room"
 ports {
   name: "GREAT"
+  display_name: "Second Room Right Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 18 y: 0 z: -36 }
   rotation: 180
@@ -31,6 +31,7 @@ paintings {
 }
 ports {
   name: "LIONIZED"
+  display_name: "Eye Room Worldport"
   path: "Components/Warps/worldport10"
   destination { x: 18 y: 0 z: -88.5 }
   rotation: 180
@@ -1,6 +1,7 @@
 name: "Four Rooms Entrance"
 ports {
   name: "FOUR"
+  display_name: "Flipped Second Room Right Worldport"
   path: "Components/Warps/worldport9"
   destination { x: -41 y: 6 z: -17.5 }
   rotation: 0
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Gallery Return"
   path: "Components/Warps/worldport4"
   destination { x: -38 y: 0 z: 8.5 }
   rotation: 180
@@ -72,6 +72,7 @@ panels {
 }
 ports {
   name: "DARKROOM"
+  display_name: "Near L1 Worldport"
   path: "Components/Warps/worldport5"
   destination { x: 43 y: 0 z: -10 }
   rotation: 0
@@ -1,6 +1,7 @@
 name: "Liberated Entrance"
 ports {
   name: "BLUE"
+  display_name: "Pyramid Area Blue Worldport"
   path: "worldport8"
   destination { x: 18 y: 0 z: 55 }
   rotation: 270
@@ -1,6 +1,7 @@
 name: "Literate Entrance"
 ports {
   name: "BROWN"
+  display_name: "Pyramid Area Brown Worldport"
   path: "worldport9"
   destination { x: 39 y: 0 z: 55 }
   rotation: 90
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "PARTHENON"
+  display_name: "Parthenon Return"
   path: "Components/Warps/worldport8"
   destination { x: -5.5 y: 0 z: 18 }
   rotation: 180
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "HOLE"
+  display_name: "Rabbit Hole"
   path: "worldport4"
   destination { x: 74 y: 0 z: -43 }
   rotation: 0
@@ -2,6 +2,7 @@ name: "Repetitive Entrance"
 panel_display_name: "Starting Room"
 ports {
   name: "REPETITIVE"
+  display_name: "Starting Room West Wall North Worldport"
   path: "Components/Warps/worldport7"
   destination { x: -20 y: 0 z: -16 }
   rotation: 180
@@ -2,6 +2,7 @@ name: "Revitalized Entrance"
 panel_display_name: "Colored Doors Area"
 ports {
   name: "REVITALIZED"
+  display_name: "Plum Hallway"
   path: "worldport7"
   destination { x: -58 y: 0 z: 31.5 }
   rotation: 180
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "SHOP"
+  display_name: "Shop Entrance"
   path: "Components/Warps/worldport13"
   destination { x: 18 y: 0 z: 49 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "White Hallway To Daedalus"
 panel_display_name: "Colored Doors Area"
 ports {
   name: "DAEDALUS"
+  display_name: "White Control Center Hallway"
   path: "Components/Warps/worldport11"
   destination { x: -45 y: 0 z: 24 }
   rotation: 270
@@ -6,6 +6,7 @@ letters {
 }
 ports {
   name: "CC"
+  display_name: "Near X1 Worldport"
   path: "Components/Warps/worldport3"
   destination { x: -12.5 y: 0 z: 60 }
   rotation: 270
@@ -22,6 +22,7 @@ paintings {
 }
 ports {
   name: "GALLERY"
+  display_name: "Engine Room Worldport"
   path: "Components/Warps/worldport2"
   gravity: Z_PLUS
   # TODO: entrance shuffling for non Y axis gravity
@@ -162,6 +162,7 @@ paintings {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3.5 y: 0 z: 16 }
   rotation: 270
@@ -124,18 +124,21 @@ paintings {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Unkempt Entrance"
   path: "Meshes/Blocks/Warps/worldport5"
   destination { x: 72 y: 0 z: 10.5 }
   rotation: 180
 }
 ports {
   name: "THREEDOORS"
+  display_name: "Three Doors Entrance"
   path: "Meshes/Blocks/Warps/worldport16"
   destination { x: 77 y: 0 z: 33.5 }
   rotation: 0
 }
 ports {
   name: "TOWER"
+  display_name: "Tower Entrance"
   path: "Meshes/Blocks/Warps/worldport10"
   destination { x: 0 y: 0 z: 52 }
   rotation: 0
@@ -144,6 +147,7 @@ ports {
 }
 ports {
   name: "TREE"
+  display_name: "Tree Entrance"
   path: "Meshes/Blocks/Warps/worldport17"
   destination { x: 26 y: 0 z: 58 }
   rotation: 180
@@ -2,6 +2,7 @@ name: "Colorful Entrance"
 panel_display_name: "Pillar Room"
 ports {
   name: "COLORFUL"
+  display_name: "Pillar Room Worldport"
   path: "Meshes/Blocks/Warps/worldport13"
   destination { x: -37.5 y: 0 z: 74 }
   rotation: 270
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Daedalus Entrance"
   path: "Meshes/Blocks/Warps/worldport8"
   destination { x: 98 y: 2 z: 27.5 }
   rotation: 0
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "HIVE"
+  display_name: "Hive Entrance"
   path: "Meshes/Blocks/Warps/worldport19"
   destination { x: -91.5 y: 0 z: 37 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "Jubilant Entrance"
 panel_display_name: "West Side"
 ports {
   name: "JUBILANT"
+  display_name: "Jubilant Entrance"
   path: "Meshes/Blocks/Warps/worldport12"
   destination { x: -62 y: 0 z: -19 }
   rotation: 90
@@ -122,30 +122,35 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entry Building"
   path: "Meshes/Blocks/Warps/worldport"
   destination { x: 33 y: 0 z: 15 }
   rotation: 0
 }
 ports {
   name: "KEEN"
+  display_name: "Keen Building Front"
   path: "Meshes/Blocks/Warps/worldport6"
   destination { x: 33 y: 0 z: -21 }
   rotation: 180
 }
 ports {
   name: "ORB"
+  display_name: "Orb Building"
   path: "Meshes/Blocks/Warps/worldport3"
   destination { x: 62 y: 0 z: -13 }
   rotation: 180
 }
 ports {
   name: "LINEAR"
+  display_name: "Keen Building Back"
   path: "Meshes/Blocks/Warps/worldport15"
   destination { x: 33 y: 0 z: -42.5 }
   rotation: 0
 }
 ports {
   name: "DIGITAL"
+  display_name: "Digital Hole"
   path: "Meshes/Blocks/Warps/worldport4"
   destination { x: -6.5 y: 0 z: 7.5 }
   rotation: 0
@@ -56,6 +56,7 @@ keyholders {
 }
 ports {
   name: "INVISIBLE"
+  display_name: "Eye Worldport"
   path: "Meshes/Blocks/Warps/worldport20"
   destination { x: 33 y: 0 z: -66.5 }
   rotation: 0
@@ -2,6 +2,7 @@ name: "Purple Room"
 panel_display_name: "Main Area"
 ports {
   name: "DAEDALUS"
+  display_name: "Purple Hallway"
   path: "Meshes/Blocks/Warps/worldport18"
   destination { x: 158 y: 0 z: 14 }
   rotation: 180
@@ -2,6 +2,7 @@ name: "Salmon Room"
 panel_display_name: "Main Area"
 ports {
   name: "BETWEEN"
+  display_name: "Salmon Hallway"
   path: "Meshes/Blocks/Warps/worldport11"
   destination { x: 83 y: 0 z: -21 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "Talented Entrance"
 panel_display_name: "Question Room"
 ports {
   name: "TALENTED"
+  display_name: "Under Question Room Worldport"
   path: "Meshes/Blocks/Warps/worldport14"
   destination { x: 109 y: -6 z: -26.5 }
   rotation: 0
@@ -63,18 +63,21 @@ paintings {
 }
 ports {
   name: "IMPRESSIVE"
+  display_name: "Impressive Entrance"
   path: "Meshes/Blocks/Warps/worldport2"
   destination { x: -34 y: 0 z: 22.5 }
   rotation: 0
 }
 ports {
   name: "CC"
+  display_name: "Control Center"
   path: "Meshes/Blocks/Warps/worldport9"
   destination { x: -59 y: 0 z: -50.5 }
   rotation: 180
 }
 ports {
   name: "PARTIAL"
+  display_name: "Red Hallway"
   path: "Meshes/Blocks/Warps/worldport7"
   destination { x: -62 y: 0 z: 11 }
   rotation: 90
@@ -2,12 +2,14 @@ name: "Main Area"
 # I'm probably not going to include any of the panels in here.
 ports {
   name: "RIGHT"
+  display_name: "South Worldport"
   path: "Components/Warps/worldport"
   destination { x: 30 y: 0 z: 19 }
   rotation: 270
 }
 ports {
   name: "LEFT"
+  display_name: "North Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 30 y: 0 z: -76 }
   rotation: 270
@@ -272,24 +272,28 @@ keyholders {
 }
 ports {
   name: "DAED1"
+  display_name: "Blue Area Worldport"
   path: "Components/Warps/worldport"
   destination { x: -1.5 y: 0 z: 24 }
   rotation: 270
 }
 ports {
   name: "DAED2"
+  display_name: "Pink Area South Worldport"
   path: "Components/Warps/worldport2"
   destination { x: -26.5 y: 0 z: -22 }
   rotation: 270
 }
 ports {
   name: "DAED3"
+  display_name: "Lime Area Worldport"
   path: "Components/Warps/worldport3"
   destination { x: -44.5 y: 0 z: -13 }
   rotation: 90
 }
 ports {
   name: "GREAT"
+  display_name: "Pink Area North Worldport"
   path: "Components/Warps/worldport4"
   destination { x: -29.5 y: 0 z: -62 }
   rotation: 270
@@ -22,6 +22,7 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Green Hallway"
   path: "Components/Warps/worldport3"
   destination { x: -33 y: 0 z: 1 }
   rotation: 90
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 11.5 }
   rotation: 0
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Four Rooms Entrance"
   path: "Components/Warps/worldport2"
   destination { x: -27 y: 0 z: 25.5 }
   rotation: 0
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport2"
   destination { x: 0 y: 0 z: -57 }
   rotation: 180
@@ -5,6 +5,7 @@ masteries {
 }
 ports {
   name: "ENTRY"
+  display_name: "Exit"
   path: "Components/Warps/worldport"
   # Should this be shuffleable? It skips the maze lol.
   destination { x: 0 y: 0 z: 9.5 }
@@ -97,6 +97,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3 y: 0 z: 9 }
   rotation: 270
@@ -69,6 +69,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 7.5 }
   rotation: 0
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 7.5 }
   rotation: 0
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 7.5 }
   rotation: 0
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 6.5 }
   rotation: 0
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 7.5 }
   rotation: 0
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "BETWEEN"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 6.5 }
   rotation: 0
@@ -106,6 +106,7 @@ panels {
 }
 ports {
   name: "UNYIELDING"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3.5 y: 0 z: 21 }
   rotation: 270
@@ -10,10 +10,20 @@ connections {
 }
 connections {
   from_room: "Main Area"
-  to_room: "B Room"
+  to_room: "Middle Room"
   door { name: "B Puzzles" }
 }
 connections {
+  from_room: "Middle Room"
+  to_room: "B Room"
+  oneway: true
+}
+connections {
+  from_room: "Middle Room"
+  to_room: "Main Area"
+  oneway: true
+}
+connections {
   from_room: "B Room"
   to_room: "Main Area"
   oneway: true
@@ -9,20 +9,9 @@ paintings {
   # TODO: This is too high up to enter. It's also a hint painting.
   exit_only: true
 }
-# TODO: Should these two be independent for shuffling purposes, or always tied
-# to the Main Area's port?
-ports {
-  name: "MID"
-  path: "Components/Warps/worldport4"
-  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
-  # back to the beginning.
-}
 ports {
   name: "FINAL"
+  display_name: "Final Worldport"
   path: "Components/Warps/worldport5"
   destination { x: -69 y: 0 z: 87 }
   rotation: 90
@@ -85,6 +85,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
   destination { x: 38 y: 0 z: 39 }
   rotation: 90
@@ -0,0 +1,12 @@
+name: "Middle Room"
+# This is the room after solving the B puzzles but before getting to B1 itself.
+# It has to be a separate region because if you are shuffling worldports and you
+# warp to the B1 room port, you can't access this port if you're not able to
+# solve the B puzzles.
+ports {
+  name: "MID"
+  display_name: "Middle Worldport"
+  path: "Components/Warps/worldport4"
+  destination { x: -69 y: 0 z: 43 }
+  rotation: 90
+}
@@ -149,6 +149,7 @@ paintings {
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Four Rooms Entrance"
   path: "Components/Warps/worldport2"
   destination { x: 71.5 y: 0 z: -9 }
   rotation: 90
@@ -1,6 +1,7 @@
 name: "Magenta Hallway"
 ports {
   name: "STURDY"
+  display_name: "Magenta Hallway"
   path: "Components/Warps/worldport3"
   destination { x: 17 y: 0 z: -46 }
   rotation: 270
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Gallery Worldport"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 9 }
   rotation: 0
@@ -55,18 +55,21 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Columns Worldport"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 0 }
   rotation: 0
 }
 ports {
   name: "ENTRY"
+  display_name: "Building Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 0 y: 0 z: -21 }
   rotation: 0
 }
 ports {
   name: "REVITALIZED"
+  display_name: "Plum Hallway"
   path: "Components/Warps/worldport3"
   destination { x: -24 y: 0 z: -39 }
   rotation: 180
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport2"
   destination { x: -19 y: 0 z: 8 }
   rotation: 180
@@ -99,6 +99,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3 y: 0 z: 20 }
   rotation: 270
@@ -1,6 +1,7 @@
 name: "Main Area"
 ports {
   name: "CC"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 3 y: 0 z: 13 }
   rotation: 90
@@ -36,18 +36,21 @@ panels {
 }
 ports {
   name: "UNYIELDING"
+  display_name: "Unyielding Hallway"
   path: "Components/Warps/worldport"
   destination { x: 1 y: 0 z: 10 }
   rotation: 270
 }
 ports {
   name: "IMPRESSIVE"
+  display_name: "Impressive Hallway"
   path: "Components/Warps/worldport2"
   destination { x: 11 y: 0 z: 10 }
   rotation: 270
 }
 ports {
   name: "BETWEEN"
+  display_name: "Between Hallway"
   path: "Components/Warps/worldport3"
   destination { x: -9 y: 0 z: 10 }
   rotation: 270
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "REPETITIVE"
+  display_name: "Repetitive Entrance"
   path: "Components/Warps/worldport5"
   destination { x: -19 y: 0 z: 16 }
   rotation: 180
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "SIRENIC"
+  display_name: "Sirenic Entrance"
   path: "Components/Warps/worldport6"
   destination { x: -51 y: 0 z: -43 }
   rotation: 270
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "SYMBOLIC"
+  display_name: "Symbolic Entrance"
   path: "Components/Warps/worldport4"
   destination { x: 28 y: 0 z: 4 }
   rotation: 0
@@ -97,6 +97,7 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 3 y: 0 z: 8 }
   rotation: 90
@@ -1,6 +1,7 @@
 name: "Entry Connector"
 ports {
   name: "ENTRY"
+  display_name: "Northwest Worldport"
   path: "Components/Warps/worldport2"
   destination { x: -11 y: 0 z: 13 }
   rotation: 0
@@ -138,6 +138,7 @@ paintings {
 }
 ports {
   name: "CC"
+  display_name: "Southwest Worldport"
   path: "Components/Warps/worldport3"
   destination { x: -5.5 y: 0 z: 56 }
   rotation: 90
@@ -1,6 +1,7 @@
 name: "Plaza Connector"
 ports {
   name: "PLAZA"
+  display_name: "Northeast Worldport"
   path: "Components/Warps/worldport"
   destination { x: 15 y: 0 z: 13 }
   rotation: 0
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "PARTHENON"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 30 y: 0 z: 16 }
   rotation: 0
@@ -155,6 +155,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 4 y: 0 z: 12 }
   rotation: 90
@@ -15,6 +15,7 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 26 }
   rotation: 0
@@ -31,6 +31,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Worldport"
   path: "Components/Warps/worldport"
   destination { x: -8.5 y: 0 z: 6 }
   rotation: 270
@@ -105,12 +105,14 @@ panels {
 }
 ports {
   name: "OWL"
+  display_name: "Magenta Hallway"
   path: "Components/Warps/worldport"
   destination { x: 17 y: 0 z: 41 }
   rotation: 90
 }
 ports {
   name: "COLORFUL"
+  display_name: "Cyan Hallway"
   path: "Components/Warps/worldport2"
   destination { x: 17 y: 0 z: -33 }
   rotation: 90
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 13 }
   rotation: 0
@@ -200,12 +200,14 @@ panels {
 }
 ports {
   name: "EXIT1"
+  display_name: "South Worldport"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: -11.5 }
   rotation: 180
 }
 ports {
   name: "EXIT2"
+  display_name: "North Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 0 y: 0 z: -17.5 }
   rotation: 0
@@ -7,6 +7,7 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 2.5 }
   rotation: 0
@@ -111,6 +111,7 @@ keyholders {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3.5 y: 0 z: 21 }
   rotation: 270
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 10 }
   rotation: 0
@@ -29,12 +29,14 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Door Ways Worldport"
   path: "Components/Warps/worldport6"
   destination { x: -38 y: 0 z: 41.5 }
   rotation: 0
 }
 ports {
   name: "BEGIN2"
+  display_name: "Dead End Worldport"
   path: "Components/Warps/worldport5"
   destination { x: -38 y: 0 z: 27.5 }
   rotation: 180
@@ -29,12 +29,14 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "First Worldport"
   path: "Components/Warps/worldport"
   destination { x: -16 y: 0 z: 0.5 }
   rotation: 180
 }
 ports {
   name: "TTD"
+  display_name: "Second Worldport"
   path: "Components/Warps/worldport2"
   destination { x: -16 y: 0 z: 14.5 }
   rotation: 0
@@ -15,6 +15,7 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Loose Strings Worldport"
   path: "Components/Warps/worldport7"
   destination { x: -16 y: 0 z: 41.5 }
   rotation: 0
@@ -15,6 +15,7 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Lone Chance Worldport"
   path: "Components/Warps/worldport8"
   destination { x: -16 y: 0 z: 27.5 }
   rotation: 180
@@ -27,12 +27,14 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Third Fourth Worldport"
   path: "Components/Warps/worldport3"
   destination { x: -38 y: 0 z: 14.5 }
   rotation: 0
 }
 ports {
   name: "NEXT"
+  display_name: "Silver Portal Worldport"
   path: "Components/Warps/worldport4"
   destination { x: -38 y: 0 z: 0.5 }
   rotation: 180
@@ -97,6 +97,7 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: -0 y: 0 z: 13 }
   rotation: 0
@@ -1,6 +1,7 @@
 name: "Bearer Entrance"
 ports {
   name: "BEARER"
+  display_name: "Brown Control Center Hallway"
   path: "Components/Warps/worldport"
   destination { x: -15.5 y: 0 z: 20 }
   rotation: 270
@@ -211,6 +211,7 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "SW Worldport"
   path: "Components/Warps/worldport4"
   destination { x: -21 y: 0 z: 7 }
   rotation: 0
@@ -218,6 +219,7 @@ ports {
 }
 ports {
   name: "DIGITAL"
+  display_name: "NW Worldport"
   path: "Components/Warps/worldport5"
   destination { x: -21 y: 0 z: -7 }
   rotation: 180
@@ -225,12 +227,14 @@ ports {
 }
 ports {
   name: "GREAT"
+  display_name: "E Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 21 y: 0 z: -4 }
   rotation: 180
 }
 ports {
   name: "DAEDALUS"
+  display_name: "NE Worldport"
   path: "Components/Warps/worldport3"
   destination { x: 15.5 y: 0 z: -19 }
   rotation: 90
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport2"
   destination { x: -4.5 y: 0 z: 7 }
   rotation: 0
@@ -1,6 +1,7 @@
 name: "Daedalus Entrance"
 ports {
   name: "DAEDALUS"
+  display_name: "Orange Hallway"
   path: "Components/Warps/worldport4"
   destination { x: 33 y: 0 z: -10 }
   rotation: 90
@@ -216,18 +216,21 @@ keyholders {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
   destination { x: -3 y: 0 z: 11 }
   rotation: 270
 }
 ports {
   name: "TREE"
+  display_name: "Brown Hallway"
   path: "Components/Warps/worldport5"
   destination { x: -34 y: 0 z: 7 }
   rotation: 270
 }
 ports {
   name: "SUNTEMPLE"
+  display_name: "Sun Temple Entrance"
   path: "Components/Warps/worldport3"
   destination { x: -42 y: 0 z: -2 }
   rotation: 270
@@ -1,6 +1,7 @@
 name: "Bearer Entrance"
 ports {
   name: "BEARER"
+  display_name: "East of Yellow Worldport"
   path: "Components/Warps/worldport4"
   destination { x: 23 y: 0 z: -29 }
   rotation: 90
@@ -8,6 +8,7 @@ panels {
 }
 ports {
   name: "DIGITAL"
+  display_name: "South of Yellow Worldport"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 0 }
   rotation: 0
@@ -1,6 +1,7 @@
 name: "Nuanced Entrance"
 ports {
   name: "NUANCED"
+  display_name: "West of Yellow Worldport"
   path: "Components/Warps/worldport3"
   destination { x: -23 y: 0 z: -29 }
   rotation: 270
@@ -15,6 +15,7 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Dark Hallway"
   path: "Components/Warps/worldport5"
   destination { x: 35 y: 0 z: 44 }
   rotation: 270
@@ -7,6 +7,7 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
   destination { x: 18 y: 0 z: 41 }
   rotation: 180
@@ -57,6 +57,7 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Worldport"
   path: "Components/Warps/worldport"
   destination { x: 0 y: 0 z: 9.5 }
   rotation: 0
@@ -186,6 +186,7 @@ message Port {
   optional uint64 room_id = 2;
   optional string name = 3;
 
+  optional string display_name = 10;
   optional string path = 4;
   optional Vec3d destination = 5;
   optional double rotation = 8;
@@ -150,6 +150,7 @@ message HumanPainting {
 
 message HumanPort {
   optional string name = 1;
+  optional string display_name = 8;
   optional string path = 2;
 
   optional bool no_shuffle = 7;
@@ -239,6 +239,7 @@ class DataPacker {
     Port& port = *container_.all_objects().mutable_ports(port_id);
 
     port.set_path(h_port.path());
+    port.set_display_name(h_port.display_name());
 
     if (h_port.no_shuffle()) {
       port.set_no_shuffle(h_port.no_shuffle());