8 files changed, 131 insertions, 49 deletions

@@ -77,7 +77,10 @@ class Lingo2World(World):
         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()}
+                self.port_pairings = {
+                    self.static_logic.port_id_by_ap_id[int(fp)]: self.static_logic.port_id_by_ap_id[int(tp)]
+                    for fp, tp in slot_value.items()
+                }
 
                 connect_ports_from_ut(self.port_pairings, self)
             else:
@@ -152,7 +155,11 @@ class Lingo2World(World):
         }
 
         if self.options.shuffle_worldports:
-            slot_data["port_pairings"] = self.port_pairings
+            def get_port_ap_id(port_id):
+                return self.static_logic.objects.ports[port_id].ap_id
+
+            slot_data["port_pairings"] = {get_port_ap_id(from_id): get_port_ap_id(to_id)
+                                          for from_id, to_id in self.port_pairings.items()}
 
         return slot_data
 
@@ -15,6 +15,7 @@ var symbol_item_ids = []
 var anti_trap_ids = {}
 var location_name_by_id = {}
 var ending_display_name_by_name = {}
+var port_id_by_ap_id = {}
 
 var kSYMBOL_ITEMS
 
@@ -99,6 +100,9 @@ func load(data_bytes):
                 var map_data = port_id_by_map_node_path[map.get_name()]
                 map_data[port.get_path()] = port.get_id()
 
+                if port.has_ap_id():
+                        port_id_by_ap_id[port.get_ap_id()] = port.get_id()
+
         for progressive in objects.get_progressives():
                 progressive_id_by_ap_id[progressive.get_ap_id()] = progressive.get_id()
 
@@ -472,7 +472,9 @@ func _client_connected(slot_data):
                 var raw_pp = slot_data.get("port_pairings")
 
                 for p1 in raw_pp.keys():
-                        port_pairings[int(p1)] = int(raw_pp[p1])
+                        port_pairings[gamedata.port_id_by_ap_id[int(p1)]] = gamedata.port_id_by_ap_id[int(
+                                raw_pp[p1]
+                        )]
 
         # Set up item locks.
         _item_locks = {}
@@ -98,38 +98,72 @@ func _ready():
                         old_door.queue_free()
                         get_node("/root/scene/Components/Doors").add_child.call_deferred(new_door)
 
-        # Block off roof access in Daedalus.
-        if global.map == "daedalus" and not ap.daedalus_roof_access:
-                _set_up_invis_wall(75.5, 11, -24.5, 1, 10, 49)
-                _set_up_invis_wall(51.5, 11, -17, 16, 10, 1)
-                _set_up_invis_wall(46, 10, -9.5, 1, 10, 10)
-                _set_up_invis_wall(67.5, 11, 17, 16, 10, 1)
-                _set_up_invis_wall(50.5, 11, 14, 10, 10, 1)
-                _set_up_invis_wall(39, 10, 18.5, 1, 10, 22)
-                _set_up_invis_wall(20, 15, 18.5, 1, 10, 16)
-                _set_up_invis_wall(11.5, 15, 3, 32, 10, 1)
-                _set_up_invis_wall(11.5, 16, -20, 14, 20, 1)
-                _set_up_invis_wall(14, 16, -26.5, 1, 20, 4)
-                _set_up_invis_wall(28.5, 20.5, -26.5, 1, 15, 25)
-                _set_up_invis_wall(40.5, 20.5, -11, 30, 15, 1)
-                _set_up_invis_wall(50.5, 15, 5.5, 7, 10, 1)
-                _set_up_invis_wall(83.5, 33.5, 5.5, 1, 7, 11)
-                _set_up_invis_wall(83.5, 33.5, -5.5, 1, 7, 11)
-
-                var warp_exit_prefab = preload("res://objects/nodes/exit.tscn")
-                var warp_exit = warp_exit_prefab.instantiate()
-                warp_exit.name = "roof_access_blocker_warp_exit"
-                warp_exit.position = Vector3(58, 10, 0)
-                warp_exit.rotation_degrees.y = 90
-                get_parent().add_child.call_deferred(warp_exit)
-
-                var warp_enter_prefab = preload("res://objects/nodes/teleportAuto.tscn")
-                var warp_enter = warp_enter_prefab.instantiate()
-                warp_enter.target = warp_exit
-                warp_enter.position = Vector3(76.5, 30, 1)
-                warp_enter.scale = Vector3(4, 1.5, 1)
-                warp_enter.rotation_degrees.y = 90
-                get_parent().add_child.call_deferred(warp_enter)
+        if global.map == "daedalus":
+                # Teleport the direction panels when the stairs are there.
+                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+
+                var dir1 = get_node("/root/scene/Panels/Castle Entrance/castle_direction_1")
+                var dir1_tpl = tpl_prefab.instantiate()
+                dir1_tpl.target_path = dir1
+                dir1_tpl.teleport_point = Vector3(59.5, 8, -6.5)
+                dir1_tpl.teleport_rotate = Vector3(-45, 0, 0)
+                dir1_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_south"))
+                dir1_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_north"))
+                dir1_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_west"))
+                dir1.add_child.call_deferred(dir1_tpl)
+
+                var dir2 = get_node("/root/scene/Panels/Castle Entrance/castle_direction_2")
+                var dir2_tpl = tpl_prefab.instantiate()
+                dir2_tpl.target_path = dir2
+                dir2_tpl.teleport_point = Vector3(59.5, 8, 6.5)
+                dir2_tpl.teleport_rotate = Vector3(-45, -180, 0)
+                dir2_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_south"))
+                dir2_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_north"))
+                dir2_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_west"))
+                dir2.add_child.call_deferred(dir2_tpl)
+
+                var dir3 = get_node("/root/scene/Panels/Castle Entrance/castle_direction_3")
+                var dir3_tpl = tpl_prefab.instantiate()
+                dir3_tpl.target_path = dir3
+                dir3_tpl.teleport_point = Vector3(54, 8, 0)
+                dir3_tpl.teleport_rotate = Vector3(-45, 90, 0)
+                dir3_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_south"))
+                dir3_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_north"))
+                dir3_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_west"))
+                dir3.add_child.call_deferred(dir3_tpl)
+
+                # Block off roof access in Daedalus.
+                if not ap.daedalus_roof_access:
+                        _set_up_invis_wall(75.5, 11, -24.5, 1, 10, 49)
+                        _set_up_invis_wall(51.5, 11, -17, 16, 10, 1)
+                        _set_up_invis_wall(46, 10, -9.5, 1, 10, 10)
+                        _set_up_invis_wall(67.5, 11, 17, 16, 10, 1)
+                        _set_up_invis_wall(50.5, 11, 14, 10, 10, 1)
+                        _set_up_invis_wall(39, 10, 18.5, 1, 10, 22)
+                        _set_up_invis_wall(20, 15, 18.5, 1, 10, 16)
+                        _set_up_invis_wall(11.5, 15, 3, 32, 10, 1)
+                        _set_up_invis_wall(11.5, 16, -20, 14, 20, 1)
+                        _set_up_invis_wall(14, 16, -26.5, 1, 20, 4)
+                        _set_up_invis_wall(28.5, 20.5, -26.5, 1, 15, 25)
+                        _set_up_invis_wall(40.5, 20.5, -11, 30, 15, 1)
+                        _set_up_invis_wall(50.5, 15, 5.5, 7, 10, 1)
+                        _set_up_invis_wall(83.5, 33.5, 5.5, 1, 7, 11)
+                        _set_up_invis_wall(83.5, 33.5, -5.5, 1, 7, 11)
+
+                        var warp_exit_prefab = preload("res://objects/nodes/exit.tscn")
+                        var warp_exit = warp_exit_prefab.instantiate()
+                        warp_exit.name = "roof_access_blocker_warp_exit"
+                        warp_exit.position = Vector3(58, 10, 0)
+                        warp_exit.rotation_degrees.y = 90
+                        get_parent().add_child.call_deferred(warp_exit)
+
+                        var warp_enter_prefab = preload("res://objects/nodes/teleportAuto.tscn")
+                        var warp_enter = warp_enter_prefab.instantiate()
+                        warp_enter.target = warp_exit
+                        warp_enter.position = Vector3(76.5, 30, 1)
+                        warp_enter.scale = Vector3(4, 1.5, 1)
+                        warp_enter.rotation_degrees.y = 90
+                        get_parent().add_child.call_deferred(warp_enter)
 
         if global.map == "the_entry":
                 # Remove door behind X1.
@@ -586,6 +620,12 @@ func _ready():
                 saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
                 get_node("/root/scene").add_child.call_deferred(saver)
 
+        # Shrink the painting trigger in The Unyielding.
+        if global.map == "the_unyielding":
+                var trigger_area = get_node("/root/scene/Components/PaintingUnlocker/triggerArea")
+                trigger_area.position = Vector3(0, 0, -6)
+                trigger_area.scale = Vector3(6, 1, 6)
+
         ap.update_job_well_done_sign()
 
         # Set up door locations.
@@ -598,9 +638,12 @@ func _ready():
                         continue
 
                 if (
-                        door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
-                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
-                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
+                        not (door.has_legacy_location() and door.get_legacy_location())
+                        and (
+                                door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
+                                or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
+                                or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
+                        )
                 ):
                         continue
 
@@ -30,6 +30,16 @@ KEY_STORAGE_MAPPING = {
 REVERSE_KEY_STORAGE_MAPPING = {t: k for k, t in KEY_STORAGE_MAPPING.items()}
 
 
+# There is a distinction between an object's ID and its AP ID. The latter is stable between releases, whereas the former
+# can change and is also namespaced based on the object type. We should only store AP IDs in multiworld state (such as
+# slot data and data storage) to increase compatability between releases. The data we currently store is:
+# - Port pairings for worldport shuffle (slot data)
+# - Checked worldports for worldport shuffle (data storage)
+# - Latched doors (data storage)
+# The client generally deals in the actual object IDs rather than the stable IDs, although it does have to convert the
+# port pairing IDs when reading them from slot data. The context (this file here) does the work of converting back and
+# forth between the values. AP IDs are converted to IDs after reading them from data storage, and IDs are converted to
+# AP IDs before sending them to data storage.
 class Lingo2Manager:
     game_ctx: "Lingo2GameContext"
     client_ctx: "Lingo2ClientContext"
@@ -74,6 +84,7 @@ class Lingo2Manager:
 
         return ret
 
+    # Input should be real IDs, not AP IDs
     def update_worldports(self, new_worldports: set[int]) -> set[int]:
         ret = new_worldports.difference(self.worldports)
         self.worldports.update(new_worldports)
@@ -227,6 +238,7 @@ class Lingo2GameContext:
 
         async_start(self.send_msgs([msg]), name="update keyboard")
 
+    # Input should be real IDs, not AP IDs
     def send_update_worldports(self, worldports):
         if self.server is None:
             return
@@ -441,13 +453,15 @@ class Lingo2ClientContext(CommonContext):
             elif args["key"] == self.get_datastorage_key("keyboard2"):
                 self.handle_keyboard_update(2, args)
             elif args["key"] == self.get_datastorage_key("worldports"):
-                updates = self.manager.update_worldports(set(args["value"]))
+                port_ids = set(Lingo2World.static_logic.port_id_by_ap_id[ap_id] for ap_id in args["value"])
+                updates = self.manager.update_worldports(port_ids)
                 if len(updates) > 0:
                     self.manager.game_ctx.send_update_worldports(updates)
             elif args["key"] == self.victory_data_storage_key:
                 self.handle_status_update(args["value"])
             elif args["key"] == self.get_datastorage_key("latches"):
-                updates = self.manager.update_latches(set(args["value"]))
+                door_ids = set(Lingo2World.static_logic.door_id_by_ap_id[ap_id] for ap_id in args["value"])
+                updates = self.manager.update_latches(door_ids)
                 if len(updates) > 0:
                     self.manager.game_ctx.send_update_latches(updates)
 
@@ -515,14 +529,16 @@ class Lingo2ClientContext(CommonContext):
         if len(updates) > 0:
             self.manager.game_ctx.send_update_keyboard(updates)
 
+    # Input should be real IDs, not AP IDs
     async def update_worldports(self, updates: set[int]):
+        port_ap_ids = [Lingo2World.static_logic.objects.ports[port_id].ap_id for port_id in updates]
         await self.send_msgs([{
             "cmd": "Set",
             "key": self.get_datastorage_key("worldports"),
             "want_reply": True,
             "operations": [{
                 "operation": "update",
-                "value": updates
+                "value": port_ap_ids
             }]
         }])
 
@@ -532,13 +548,14 @@ class Lingo2ClientContext(CommonContext):
         self.manager.game_ctx.send_accessible_locations()
 
     async def update_latches(self, updates: set[int]):
+        door_ap_ids = [Lingo2World.static_logic.objects.doors[door_id].ap_id for door_id in updates]
         await self.send_msgs([{
             "cmd": "Set",
             "key": self.get_datastorage_key("latches"),
             "want_reply": True,
             "operations": [{
                 "operation": "update",
-                "value": updates
+                "value": door_ap_ids
             }]
         }])
 
@@ -590,12 +607,14 @@ async def process_game_cmd(manager: Lingo2Manager, args: dict):
             async_start(manager.client_ctx.update_keyboard(updates), name="client update keyboard")
     elif cmd == "CheckWorldport":
         port_id = args["port_id"]
+        port_ap_id = Lingo2World.static_logic.objects.ports[port_id].ap_id
         worldports = {port_id}
 
         # Also check the reverse port if it's a two-way connection.
         port_pairings = manager.client_ctx.slot_data["port_pairings"]
-        if str(port_id) in port_pairings and port_pairings.get(str(port_pairings[str(port_id)]), None) == port_id:
-            worldports.add(port_pairings[str(port_id)])
+        if str(port_ap_id) in port_pairings and\
+                port_pairings.get(str(port_pairings[str(port_ap_id)]), None) == port_ap_id:
+            worldports.add(Lingo2World.static_logic.port_id_by_ap_id[port_pairings[str(port_ap_id)]])
 
         updates = manager.update_worldports(worldports)
         if len(updates) > 0:
@@ -299,8 +299,7 @@ class Lingo2PlayerLogic:
             if door.map_id not in self.shuffled_maps:
                 continue
 
-            if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE,
-                             data_pb2.DoorType.LEGACY_LOCATION]:
+            if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
                 continue
 
             if door.id in self.item_by_door:
@@ -15,6 +15,9 @@ class Lingo2StaticLogic:
 
     letter_weights: dict[str, int]
 
+    door_id_by_ap_id: dict[int, int]
+    port_id_by_ap_id: dict[int, int]
+
     def __init__(self):
         self.item_id_to_name = {}
         self.location_id_to_name = {}
@@ -31,8 +34,7 @@ class Lingo2StaticLogic:
                 location_name = self.get_door_location_name(door)
                 self.location_id_to_name[door.ap_id] = location_name
 
-            if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE,
-                                 data_pb2.DoorType.LEGACY_LOCATION]:
+            if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
                 item_name = self.get_door_item_name(door)
                 self.item_id_to_name[door.ap_id] = item_name
 
@@ -84,6 +86,9 @@ class Lingo2StaticLogic:
             for letter in panel.answer.upper():
                 self.letter_weights[letter] = self.letter_weights.get(letter, 0) + 1
 
+        self.door_id_by_ap_id = {door.ap_id: door.id for door in self.objects.doors if door.HasField("ap_id")}
+        self.port_id_by_ap_id = {port.ap_id: port.id for port in self.objects.ports if port.HasField("ap_id")}
+
     def get_door_item_name(self, door: data_pb2.Door) -> str:
         return f"{self.get_map_object_map_name(door)} - {door.name}"
 
@@ -47,7 +47,10 @@ class Tracker:
         self.world.create_regions()
 
         if self.world.options.shuffle_worldports:
-            port_pairings = {int(fp): int(tp) for fp, tp in slot_data["port_pairings"].items()}
+            port_pairings = {
+                self.world.static_logic.port_id_by_ap_id[int(fp)]: self.world.static_logic.port_id_by_ap_id[int(tp)]
+                for fp, tp in slot_data["port_pairings"].items()
+            }
             connect_ports_from_ut(port_pairings, self.world)
 
         self.refresh_state()