7 files changed, 227 insertions, 50 deletions

@@ -108,7 +108,7 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
 
                         _checked_locations = []
                         for location in message["checked_locations"]:
-                                _checked_locations.append(int(message["checked_locations"]))
+                                _checked_locations.append(int(location))
 
                         client_connected.emit(_slot_data)
 
@@ -158,11 +158,7 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                 elif cmd == "LocationInfo":
                         for loc in message["locations"]:
                                 location_scout_received.emit(
-                                        int(loc["id"]),
-                                        loc["item"],
-                                        loc["player"],
-                                        int(loc["flags"]),
-                                        int(loc["for_self"])
+                                        int(loc["id"]), loc["item"], loc["player"], int(loc["flags"]), int(loc["self"])
                                 )
 
                 elif cmd == "AccessibleLocations":
@@ -187,6 +183,12 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
 
                         keyboard_update_received.emit(updates)
 
+                elif cmd == "PathReply":
+                        var textclient = global.get_node("Textclient")
+                        textclient.display_logical_path(
+                                message["type"], int(message.get("id", null)), message["path"]
+                        )
+
 
 func connectToServer(server, un, pw):
         sendMessage([{"cmd": "Connect", "server": server, "player": un, "password": pw}])
@@ -253,6 +255,14 @@ func checkWorldport(port_id):
                 sendMessage([{"cmd": "CheckWorldport", "port_id": port_id}])
 
 
+func getLogicalPath(object_type, object_id):
+        var msg = {"cmd": "GetPath", "type": object_type}
+        if object_id != null:
+                msg["id"] = object_id
+
+        sendMessage([msg])
+
+
 func sendQuit():
         sendMessage([{"cmd": "Quit"}])
 
@@ -72,7 +72,13 @@ func load(data_bytes):
 
                 if door.has_ap_id():
                         door_id_by_ap_id[door.get_ap_id()] = door.get_id()
-                        location_name_by_id[door.get_ap_id()] = _get_door_location_name(door)
+
+                        if (
+                                door.get_type() == SCRIPT_proto.DoorType.STANDARD
+                                or door.get_type() == SCRIPT_proto.DoorType.LOCATION_ONLY
+                                or door.get_type() == SCRIPT_proto.DoorType.GRAVESTONE
+                        ):
+                                location_name_by_id[door.get_ap_id()] = _get_door_location_name(door)
 
         for painting in objects.get_paintings():
                 var room = objects.get_rooms()[painting.get_room_id()]
@@ -166,8 +172,7 @@ func get_door_ap_id(door_id):
 
 func get_door_map_name(door_id):
         var door = objects.get_doors()[door_id]
-        var room = objects.get_rooms()[door.get_room_id()]
-        var map = objects.get_maps()[room.get_map_id()]
+        var map = objects.get_maps()[door.get_map_id()]
         return map.get_name()
 
 
@@ -227,8 +232,11 @@ func _get_generated_door_location_name(door):
                 var panel = objects.get_panels()[panel_id.get_panel()]
                 var panel_room = objects.get_rooms()[panel.get_room_id()]
                 # It's okay if panel_display_name is not present because then it's coalesced with other unnamed areas.
-                if not map_areas.has(panel_room.get_panel_display_name()):
-                        map_areas.append(panel_room.get_panel_display_name())
+                var panel_display_name = ""
+                if panel_room.has_panel_display_name():
+                        panel_display_name = panel_room.get_panel_display_name()
+                if not map_areas.has(panel_display_name):
+                        map_areas.append(panel_display_name)
 
         if map_areas.size() > 1:
                 return null
@@ -264,7 +272,7 @@ func _get_generated_door_location_name(door):
 
 
 func _get_letter_location_name(letter):
-        var letter_level = 2 if letter.get_level2() else 1
+        var letter_level = 2 if (letter.has_level2() and letter.get_level2()) else 1
         var letter_name = "%s%d" % [letter.get_key().to_upper(), letter_level]
         return "%s - %s" % [_get_room_object_map_name(letter), letter_name]
 
@@ -237,6 +237,9 @@ func _process_item(item, amount):
                 if player != null:
                         player.evaluate_solvability.emit()
 
+        if item_id == gamedata.objects.get_special_ids()["A Job Well Done"]:
+                update_job_well_done_sign()
+
         # Show a message about the item if it's new.
         if int(item["index"]) > _last_new_item:
                 _last_new_item = int(item["index"])
@@ -347,7 +350,7 @@ func _on_accessible_locations_updated():
 func _on_checked_locations_updated():
         var textclient_node = global.get_node("Textclient")
         if textclient_node != null:
-                textclient_node.update_locations()
+                textclient_node.update_locations(false)
 
 
 func _on_checked_worldports_updated():
@@ -503,6 +506,9 @@ func start_batching_locations():
 
 
 func send_location(loc_id):
+        if client._checked_locations.has(loc_id):
+                return
+
         if _batch_locations:
                 _held_locations.append(loc_id)
         else:
@@ -601,3 +607,29 @@ func _process_key_item(key, level):
                 level += 1
 
         keyboard.collect_remote_letter(key, level)
+
+
+func update_job_well_done_sign():
+        if global.map != "daedalus":
+                return
+
+        var gamedata = global.get_node("Gamedata")
+        var job_item = gamedata.objects.get_special_ids()["A Job Well Done"]
+        var jobs_done = client.getItemAmount(job_item)
+
+        var sign2 = get_tree().get_root().get_node_or_null("scene/Meshes/Miscellaneous/sign2")
+        var sign3 = get_tree().get_root().get_node_or_null("scene/Meshes/Miscellaneous/sign3")
+
+        if sign2 != null and sign3 != null:
+                if jobs_done == 0:
+                        sign2.text = "what are you doing"
+                        sign3.text = "?"
+                elif jobs_done == 1:
+                        sign2.text = "a job well done"
+                        sign3.text = "is its own reward"
+                else:
+                        sign2.text = "%d jobs well done" % jobs_done
+                        sign3.text = "are their own reward"
+
+                sign2.get_node("MeshInstance3D").mesh.text = sign2.text
+                sign3.get_node("MeshInstance3D").mesh.text = sign3.text
@@ -31,6 +31,7 @@ func _ready():
                 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
                 ):
                         continue
 
@@ -312,6 +313,8 @@ func _ready():
                 entry1.get_parent().add_child.call_deferred(entry12)
                 entry1.queue_free()
 
+        ap.update_job_well_done_sign()
+
         var minimap = ap.SCRIPT_minimap.new()
         minimap.name = "Minimap"
         minimap.visible = ap.show_minimap
@@ -100,7 +100,7 @@ func _ready():
         server_box.offset_top = 295.0
         server_box.offset_right = 1144.0
         server_box.offset_bottom = 445.0
-        server_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        server_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         server_box.caret_blink = true
         panel.add_child(server_box)
 
@@ -110,7 +110,7 @@ func _ready():
         player_box.offset_top = 477.0
         player_box.offset_right = 1144.0
         player_box.offset_bottom = 627.0
-        player_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        player_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         player_box.caret_blink = true
         panel.add_child(player_box)
 
@@ -120,20 +120,16 @@ func _ready():
         password_box.offset_top = 659.0
         password_box.offset_right = 1144.0
         password_box.offset_bottom = 809.0
-        password_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        password_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         password_box.caret_blink = true
         panel.add_child(password_box)
 
         var accept_dialog = AcceptDialog.new()
         accept_dialog.name = "AcceptDialog"
-        accept_dialog.offset_right = 83.0
-        accept_dialog.offset_bottom = 58.0
         panel.add_child(accept_dialog)
 
         var version_mismatch = ConfirmationDialog.new()
         version_mismatch.name = "VersionMismatch"
-        version_mismatch.offset_right = 83.0
-        version_mismatch.offset_bottom = 58.0
         panel.add_child(version_mismatch)
 
         var connection_history = MenuButton.new()
@@ -4,7 +4,6 @@ var tabs
 var panel
 var label
 var entry
-var tracker_label
 var is_open = false
 
 var locations_overlay
@@ -12,11 +11,21 @@ var location_texture
 var worldport_texture
 var goal_texture
 
+var tracker_tree
+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 worldports_tab
 var worldports_tree
 var port_tree_item_by_map = {}
 var port_tree_item_by_map_port = {}
 
+const kLocation = 0
+const kWorldport = 1
+const kGoal = 2
+
 
 func _ready():
         process_mode = ProcessMode.PROCESS_MODE_ALWAYS
@@ -61,7 +70,7 @@ func _ready():
         label.size_flags_horizontal = Control.SIZE_EXPAND_FILL
         label.size_flags_vertical = Control.SIZE_EXPAND_FILL
         label.push_font(preload("res://assets/fonts/Lingo2.ttf"))
-        label.push_font_size(36)
+        label.push_font_size(30)
 
         var entry_style = StyleBoxFlat.new()
         entry_style.bg_color = Color(0.9, 0.9, 0.9, 1)
@@ -89,8 +98,18 @@ func _ready():
         tracker_margins.add_theme_constant_override("margin_bottom", 60)
         tabs.add_child(tracker_margins)
 
-        tracker_label = RichTextLabel.new()
-        tracker_margins.add_child(tracker_label)
+        tracker_tree = Tree.new()
+        tracker_tree.columns = 3
+        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))
+        tracker_tree.add_theme_constant_override("v_separation", 1)
+        tracker_tree.item_edited.connect(_on_tracker_button_clicked)
+        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_custom_minimum_width(2, 200)
+        tracker_margins.add_child(tracker_tree)
 
         worldports_tab = MarginContainer.new()
         worldports_tab.name = "Worldports"
@@ -167,14 +186,10 @@ func text_entered(text):
         ap.client.say(cmd)
 
 
-func update_locations():
+func update_locations(reset_locations = true):
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
 
-        tracker_label.clear()
-        tracker_label.push_font(preload("res://assets/fonts/Lingo2.ttf"))
-        tracker_label.push_font_size(24)
-
         locations_overlay.clear()
         locations_overlay.push_font(preload("res://assets/fonts/Lingo2.ttf"))
         locations_overlay.push_font_size(24)
@@ -182,45 +197,62 @@ 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
-        const kGoal = 2
-
-        var location_names = []
-        var type_by_name = {}
+        var locations = []
         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
+                        (
+                                locations
+                                . append(
+                                        {
+                                                "name": location_name,
+                                                "type": kLocation,
+                                                "id": location_id,
+                                        }
+                                )
+                        )
 
         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()
+                        (
+                                locations
+                                . append(
+                                        {
+                                                "name": port_name,
+                                                "type": kWorldport,
+                                                "id": port_id,
+                                        }
+                                )
+                        )
+
+        locations.sort_custom(func(a, b): return a["name"] < b["name"])
 
         if ap.client._goal_accessible:
                 var location_name = gamedata.ending_display_name_by_name[ap.kEndingNameByVictoryValue[
                         ap.victory_condition
                 ]]
-                location_names.push_front(location_name)
-                type_by_name[location_name] = kGoal
+                (
+                        locations
+                        . push_front(
+                                {
+                                        "name": location_name,
+                                        "type": kGoal,
+                                }
+                        )
+                )
 
         var count = 0
-        for location_name in location_names:
-                tracker_label.append_text("[p]%s[/p]" % location_name)
+        for location in locations:
                 if count < 18:
                         locations_overlay.push_paragraph(HORIZONTAL_ALIGNMENT_RIGHT)
-                        locations_overlay.append_text(location_name)
+                        locations_overlay.append_text(location["name"])
                         locations_overlay.append_text(" ")
-                        if type_by_name[location_name] == kLocation:
+                        if location["type"] == kLocation:
                                 locations_overlay.add_image(location_texture)
-                        elif type_by_name[location_name] == kWorldport:
+                        elif location["type"] == kWorldport:
                                 locations_overlay.add_image(worldport_texture)
-                        elif type_by_name[location_name] == kGoal:
+                        elif location["type"] == kGoal:
                                 locations_overlay.add_image(goal_texture)
                         locations_overlay.pop()
                 count += 1
@@ -228,12 +260,99 @@ func update_locations():
         if count > 18:
                 locations_overlay.append_text("[p align=right][lb]...[rb][/p]")
 
+        if reset_locations:
+                reset_tracker_tab()
+
+                var root_ti = tracker_tree.create_item(null)
+
+                for location in locations:
+                        var 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)
+                        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)
+
+                        if location["type"] == kLocation:
+                                loc_row.set_icon(0, location_texture)
+                                tracker_loc_tree_item_by_id[location["id"]] = loc_row
+                        elif location["type"] == kWorldport:
+                                loc_row.set_icon(0, worldport_texture)
+                                tracker_port_tree_item_by_id[location["id"]] = loc_row
+                        elif location["type"] == kGoal:
+                                loc_row.set_icon(0, goal_texture)
+                                tracker_goal_tree_item = loc_row
+
+                        tracker_object_by_index[loc_row.get_index()] = location
+        else:
+                for loc_row in tracker_tree.get_root().get_children():
+                        loc_row.visible = false
+
+                for location_id in tracker_loc_tree_item_by_id.keys():
+                        if (
+                                ap.client._accessible_locations.has(location_id)
+                                and not ap.client._checked_locations.has(location_id)
+                        ):
+                                tracker_loc_tree_item_by_id[location_id].visible = true
+
+                for port_id in tracker_port_tree_item_by_id.keys():
+                        if (
+                                ap.client._accessible_worldports.has(port_id)
+                                and not ap.client._checked_worldports.has(port_id)
+                        ):
+                                tracker_port_tree_item_by_id[port_id].visible = true
+
+                if tracker_goal_tree_item != null and ap.client._goal_accessible:
+                        tracker_goal_tree_item.visible = true
+
 
 func update_locations_visibility():
         var ap = global.get_node("Archipelago")
         locations_overlay.visible = ap.show_locations
 
 
+func _on_tracker_button_clicked():
+        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))
+
+
+func display_logical_path(object_type, object_id, paths):
+        var ap = global.get_node("Archipelago")
+        var gamedata = global.get_node("Gamedata")
+
+        var location_name = "(Unknown)"
+        if object_type == "location" and object_id != null:
+                location_name = gamedata.location_name_by_id.get(object_id, "(Unknown)")
+        elif object_type == "worldport" and object_id != null:
+                location_name = gamedata.get_worldport_display_name(object_id)
+        elif object_type == "goal":
+                location_name = gamedata.ending_display_name_by_name[ap.kEndingNameByVictoryValue[
+                        ap.victory_condition
+                ]]
+
+        label.append_text("[p]Path to %s:[/p]" % location_name)
+        label.append_text("[ol]" + "\n".join(paths) + "[/ol]")
+
+        panel.visible = true
+
+
 func setup_worldports():
         tabs.set_tab_hidden(2, false)
 
@@ -308,3 +427,12 @@ func reset():
         port_tree_item_by_map.clear()
         port_tree_item_by_map_port.clear()
         worldports_tree.clear()
+        reset_tracker_tab()
+
+
+func reset_tracker_tab():
+        tracker_loc_tree_item_by_id.clear()
+        tracker_port_tree_item_by_id.clear()
+        tracker_goal_tree_item = null
+        tracker_object_by_index.clear()
+        tracker_tree.clear()
@@ -2,7 +2,7 @@ extends "res://scripts/nodes/listeners/worldportListener.gd"
 
 
 func handleTriggered():
-        if exit == "menus/credits":
+        if exit.begins_with("menus/credits"):
                 return
 
         super.handleTriggered()