7 files changed, 263 insertions, 52 deletions

@@ -26,6 +26,7 @@ var _accessible_locations = []
 var _accessible_worldports = []
 var _goal_accessible = false
 var _latched_doors = []
+var _hinted_locations = []
 
 signal could_not_connect
 signal connect_status
@@ -38,8 +39,10 @@ signal hint_received(message)
 signal door_latched(id)
 signal accessible_locations_updated
 signal checked_locations_updated
+signal ignored_locations_updated(locations)
 signal checked_worldports_updated
 signal keyboard_update_received
+signal hinted_locations_updated
 
 
 func _init():
@@ -199,6 +202,21 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
 
                                 door_latched.emit(iid)
 
+                elif cmd == "SetIgnoredLocations":
+                        var locs = []
+                        for id in message["locations"]:
+                                locs.append(int(id))
+
+                        ignored_locations_updated.emit(locs)
+
+                elif cmd == "UpdateHintedLocations":
+                        for id in message["locations"]:
+                                var iid = int(id)
+                                if !_hinted_locations.has(iid):
+                                        _hinted_locations.append(iid)
+
+                        hinted_locations_updated.emit()
+
 
 func connectToServer(server, un, pw):
         sendMessage([{"cmd": "Connect", "server": server, "player": un, "password": pw}])
@@ -280,6 +298,14 @@ func getLogicalPath(object_type, object_id):
         sendMessage([msg])
 
 
+func addIgnoredLocation(loc_id):
+        sendMessage([{"cmd": "IgnoreLocation", "id": loc_id}])
+
+
+func removeIgnoredLocation(loc_id):
+        sendMessage([{"cmd": "UnignoreLocation", "id": loc_id}])
+
+
 func sendQuit():
         sendMessage([{"cmd": "Quit"}])
 
@@ -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()
 
@@ -51,6 +51,7 @@ func _ready():
                 installScriptExtension(runtime.load_script("saver.gd"))
                 installScriptExtension(runtime.load_script("teleport.gd"))
                 installScriptExtension(runtime.load_script("teleportListener.gd"))
+                installScriptExtension(runtime.load_script("unlockReaderListener.gd"))
                 installScriptExtension(runtime.load_script("visibilityListener.gd"))
                 installScriptExtension(runtime.load_script("worldport.gd"))
                 installScriptExtension(runtime.load_script("worldportListener.gd"))
@@ -253,6 +254,7 @@ func startGame():
         clearResourceCache("res://objects/nodes/listeners/keyHolderChecker.tscn")
         clearResourceCache("res://objects/nodes/listeners/keyHolderResetterListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/teleportListener.tscn")
+        clearResourceCache("res://objects/nodes/listeners/unlockReaderListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/visibilityListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/worldportListener.tscn")
         clearResourceCache("res://objects/nodes/panel.tscn")
@@ -29,6 +29,7 @@ var _inverse_item_locks = {}
 var _held_letters = {}
 var _letters_setup = false
 var _already_connected = false
+var _ignored_locations = []
 
 const kSHUFFLE_LETTERS_VANILLA = 0
 const kSHUFFLE_LETTERS_UNLOCKED = 1
@@ -144,6 +145,8 @@ func _ready():
         client.hint_received.connect(_process_hint_received)
         client.accessible_locations_updated.connect(_on_accessible_locations_updated)
         client.checked_locations_updated.connect(_on_checked_locations_updated)
+        client.ignored_locations_updated.connect(_on_ignored_locations_updated)
+        client.hinted_locations_updated.connect(_on_hinted_locations_updated)
         client.checked_worldports_updated.connect(_on_checked_worldports_updated)
         client.door_latched.connect(_on_door_latched)
 
@@ -384,6 +387,20 @@ func _on_checked_worldports_updated():
                 textclient_node.update_worldports()
 
 
+func _on_ignored_locations_updated(locations):
+        _ignored_locations = locations
+
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
+func _on_hinted_locations_updated():
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
 func _on_door_latched(door_id):
         var gamedata = global.get_node("Gamedata")
         if gamedata.get_door_map_name(door_id) != global.map:
@@ -472,7 +489,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 = {}
@@ -675,3 +694,10 @@ func update_job_well_done_sign():
 
                 sign2.get_node("MeshInstance3D").mesh.text = sign2.text
                 sign3.get_node("MeshInstance3D").mesh.text = sign3.text
+
+
+func toggle_ignored_location(loc_id):
+        if loc_id in _ignored_locations:
+                client.removeIgnoredLocation(loc_id)
+        else:
+                client.addIgnoredLocation(loc_id)
@@ -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.
@@ -604,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
 
@@ -16,6 +16,8 @@ var tracker_loc_tree_item_by_id = {}
 var tracker_port_tree_item_by_id = {}
 var tracker_goal_tree_item = null
 var tracker_object_by_index = {}
+var tracker_object_by_ignored_index = {}
+var tracker_ignored_group = null
 
 var worldports_tab
 var worldports_tree
@@ -99,7 +101,7 @@ func _ready():
         tabs.add_child(tracker_margins)
 
         tracker_tree = Tree.new()
-        tracker_tree.columns = 3
+        tracker_tree.columns = 4
         tracker_tree.hide_root = true
         tracker_tree.add_theme_font_size_override("font_size", 24)
         tracker_tree.add_theme_color_override("font_color", Color(0.8, 0.8, 0.8, 1))
@@ -108,7 +110,9 @@ func _ready():
         tracker_tree.set_column_expand(0, false)
         tracker_tree.set_column_expand(1, true)
         tracker_tree.set_column_expand(2, false)
+        tracker_tree.set_column_expand(3, false)
         tracker_tree.set_column_custom_minimum_width(2, 200)
+        tracker_tree.set_column_custom_minimum_width(3, 200)
         tracker_margins.add_child(tracker_tree)
 
         worldports_tab = MarginContainer.new()
@@ -208,6 +212,8 @@ func update_locations(reset_locations = true):
                                                 "name": location_name,
                                                 "type": kLocation,
                                                 "id": location_id,
+                                                "ignored": ap._ignored_locations.has(location_id),
+                                                "hint": ap.client._hinted_locations.has(location_id),
                                         }
                                 )
                         )
@@ -222,11 +228,13 @@ func update_locations(reset_locations = true):
                                                 "name": port_name,
                                                 "type": kWorldport,
                                                 "id": port_id,
+                                                "ignored": false,
+                                                "hint": false,
                                         }
                                 )
                         )
 
-        locations.sort_custom(func(a, b): return a["name"] < b["name"])
+        locations.sort_custom(_cmp_tracker_objects)
 
         if ap.client._goal_accessible:
                 var location_name = gamedata.ending_display_name_by_name[ap.kEndingNameByVictoryValue[
@@ -238,14 +246,18 @@ func update_locations(reset_locations = true):
                                 {
                                         "name": location_name,
                                         "type": kGoal,
+                                        "ignored": false,
+                                        "hint": false,
                                 }
                         )
                 )
 
         var count = 0
         for location in locations:
-                if count < 18:
+                if count < 18 and not location["ignored"]:
                         locations_overlay.push_paragraph(HORIZONTAL_ALIGNMENT_RIGHT)
+                        if location["hint"]:
+                                locations_overlay.push_color(Color("#fafad2"))
                         locations_overlay.append_text(location["name"])
                         locations_overlay.append_text(" ")
                         if location["type"] == kLocation:
@@ -254,6 +266,8 @@ func update_locations(reset_locations = true):
                                 locations_overlay.add_image(worldport_texture)
                         elif location["type"] == kGoal:
                                 locations_overlay.add_image(goal_texture)
+                        if location["hint"]:
+                                locations_overlay.pop()
                         locations_overlay.pop()
                 count += 1
 
@@ -266,17 +280,43 @@ func update_locations(reset_locations = true):
                 var root_ti = tracker_tree.create_item(null)
 
                 for location in locations:
-                        var loc_row = root_ti.create_child()
+                        var loc_row
+
+                        if location["ignored"]:
+                                if tracker_ignored_group == null:
+                                        tracker_ignored_group = root_ti.create_child()
+                                        tracker_ignored_group.set_text(1, "Ignored Locations")
+                                        tracker_ignored_group.set_selectable(0, false)
+                                        tracker_ignored_group.set_selectable(1, false)
+                                        tracker_ignored_group.set_selectable(2, false)
+                                        tracker_ignored_group.set_selectable(3, false)
+
+                                loc_row = tracker_ignored_group.create_child()
+                        else:
+                                loc_row = root_ti.create_child()
+
                         loc_row.set_cell_mode(0, TreeItem.CELL_MODE_ICON)
                         loc_row.set_selectable(0, false)
                         loc_row.set_text(1, location["name"])
                         loc_row.set_selectable(1, false)
+                        if location["hint"]:
+                                loc_row.set_custom_color(1, Color("#fafad2"))
                         loc_row.set_cell_mode(2, TreeItem.CELL_MODE_CUSTOM)
                         loc_row.set_text(2, "Show Path")
                         loc_row.set_custom_as_button(2, true)
                         loc_row.set_editable(2, true)
                         loc_row.set_selectable(2, false)
                         loc_row.set_text_alignment(2, HORIZONTAL_ALIGNMENT_CENTER)
+                        loc_row.set_selectable(3, false)
+                        if location["type"] == kLocation:
+                                loc_row.set_cell_mode(3, TreeItem.CELL_MODE_CUSTOM)
+                                if location["ignored"]:
+                                        loc_row.set_text(3, "Unignore")
+                                else:
+                                        loc_row.set_text(3, "Ignore")
+                                loc_row.set_custom_as_button(3, true)
+                                loc_row.set_editable(3, true)
+                                loc_row.set_text_alignment(3, HORIZONTAL_ALIGNMENT_CENTER)
 
                         if location["type"] == kLocation:
                                 loc_row.set_icon(0, location_texture)
@@ -288,7 +328,10 @@ func update_locations(reset_locations = true):
                                 loc_row.set_icon(0, goal_texture)
                                 tracker_goal_tree_item = loc_row
 
-                        tracker_object_by_index[loc_row.get_index()] = location
+                        if location["ignored"]:
+                                tracker_object_by_ignored_index[loc_row.get_index()] = location
+                        else:
+                                tracker_object_by_index[loc_row.get_index()] = location
         else:
                 for loc_row in tracker_tree.get_root().get_children():
                         loc_row.visible = false
@@ -310,6 +353,18 @@ func update_locations(reset_locations = true):
                 if tracker_goal_tree_item != null and ap.client._goal_accessible:
                         tracker_goal_tree_item.visible = true
 
+                if tracker_ignored_group != null:
+                        tracker_ignored_group.visible = true
+
+
+func _cmp_tracker_objects(a, b) -> bool:
+        if a["ignored"] != b["ignored"]:
+                return !a["ignored"]
+        elif a["hint"] != b["hint"]:
+                return a["hint"]
+        else:
+                return a["name"] < b["name"]
+
 
 func update_locations_visibility():
         var ap = global.get_node("Archipelago")
@@ -317,20 +372,33 @@ func update_locations_visibility():
 
 
 func _on_tracker_button_clicked():
+        var ap = global.get_node("Archipelago")
+
         var edited_item = tracker_tree.get_edited()
         var edited_index = edited_item.get_index()
 
-        if tracker_object_by_index.has(edited_index):
-                var tracker_object = tracker_object_by_index[edited_index]
-                var ap = global.get_node("Archipelago")
-                var type_str = ""
-                if tracker_object["type"] == kLocation:
-                        type_str = "location"
-                elif tracker_object["type"] == kWorldport:
-                        type_str = "worldport"
-                elif tracker_object["type"] == kGoal:
-                        type_str = "goal"
-                ap.client.getLogicalPath(type_str, tracker_object.get("id", null))
+        if edited_item.get_parent() == tracker_tree.get_root():
+                if tracker_object_by_index.has(edited_index):
+                        var tracker_object = tracker_object_by_index[edited_index]
+                        if tracker_tree.get_edited_column() == 2:
+                                var type_str = ""
+                                if tracker_object["type"] == kLocation:
+                                        type_str = "location"
+                                elif tracker_object["type"] == kWorldport:
+                                        type_str = "worldport"
+                                elif tracker_object["type"] == kGoal:
+                                        type_str = "goal"
+                                ap.client.getLogicalPath(type_str, tracker_object.get("id", null))
+                        elif tracker_tree.get_edited_column() == 3:
+                                ap.toggle_ignored_location(tracker_object["id"])
+        elif edited_item.get_parent() == tracker_ignored_group:
+                # This is the ignored locations group.
+                if (
+                        tracker_object_by_ignored_index.has(edited_index)
+                        and tracker_tree.get_edited_column() == 3
+                ):
+                        var tracker_object = tracker_object_by_ignored_index[edited_index]
+                        ap.toggle_ignored_location(tracker_object["id"])
 
 
 func display_logical_path(object_type, object_id, paths):
@@ -435,4 +503,6 @@ func reset_tracker_tab():
         tracker_port_tree_item_by_id.clear()
         tracker_goal_tree_item = null
         tracker_object_by_index.clear()
+        tracker_object_by_ignored_index.clear()
+        tracker_ignored_group = null
         tracker_tree.clear()
@@ -0,0 +1,46 @@
+extends "res://scripts/nodes/listeners/unlockReaderListener.gd"
+
+var item_id = null
+var item_amount
+
+
+func _ready():
+        var node_path = String(
+                get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names()
+        )
+
+        var gamedata = global.get_node("Gamedata")
+        var door_id = gamedata.get_door_for_map_node_path(global.map, node_path)
+        if door_id != null:
+                var ap = global.get_node("Archipelago")
+                var item_lock = ap.get_item_id_for_door(door_id)
+
+                if item_lock != null:
+                        item_id = item_lock[0]
+                        item_amount = item_lock[1]
+
+                        self.senders = []
+                        self.senderGroup = []
+                        self.nested = false
+                        self.complete_at = 0
+                        self.max_length = 0
+                        self.excludeSenders = []
+
+        super._ready()
+
+
+func _readier():
+        if item_id != null:
+                var ap = global.get_node("Archipelago")
+
+                if ap.client.getItemAmount(item_id) >= item_amount:
+                        handleTriggered()
+        else:
+                super._readier()
+
+
+func handleTriggered():
+        if item_id != null:
+                emit_signal("trigger")
+        else:
+                super.handleTriggered()