8 files changed, 133 insertions, 7 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()
@@ -280,8 +280,9 @@ class Lingo2ClientContext(CommonContext):
 
             async_start(self.send_msgs(msg_batch), name="default keys")
         elif cmd == "RoomUpdate":
-            self.manager.tracker.set_checked_locations(self.checked_locations)
-            self.manager.game_ctx.send_update_locations(args["checked_locations"])
+            if "checked_locations" in args:
+                self.manager.tracker.set_checked_locations(self.checked_locations)
+                self.manager.game_ctx.send_update_locations(args["checked_locations"])
         elif cmd == "ReceivedItems":
             self.manager.tracker.set_collected_items(self.items_received)
 
@@ -495,6 +496,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()