1 files changed, 86 insertions, 16 deletions

@@ -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()