13 files changed, 775 insertions, 150 deletions

@@ -59,6 +59,8 @@ class Lingo2World(World):
     item_name_groups = static_logic.item_name_groups
     location_name_groups = static_logic.location_name_groups
 
+    for_tracker: ClassVar[bool] = False
+
     player_logic: Lingo2PlayerLogic
 
     port_pairings: dict[int, int]
@@ -21,6 +21,7 @@ var _checked_locations = []
 var _received_indexes = []
 var _received_items = {}
 var _slot_data = {}
+var _accessible_locations = []
 
 signal could_not_connect
 signal connect_status
@@ -30,6 +31,9 @@ signal location_scout_received(location_id, item_name, player_name, flags, for_s
 signal text_message_received(message)
 signal item_sent_notification(message)
 signal hint_received(message)
+signal accessible_locations_updated
+signal checked_locations_updated
+signal keyboard_update_received
 
 
 func _init():
@@ -51,6 +55,7 @@ func _reset_state():
         _should_process = false
         _received_items = {}
         _received_indexes = []
+        _accessible_locations = []
 
 
 func disconnect_from_ap():
@@ -92,15 +97,26 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                         _gen_version = message["generator_version"]
                         _team = message["team"]
                         _slot = message["slot"]
-                        _checked_locations = message["checked_locations"]
                         _slot_data = message["slot_data"]
 
+                        _checked_locations = []
+                        for location in message["checked_locations"]:
+                                _checked_locations.append(int(message["checked_locations"]))
+
                         client_connected.emit(_slot_data)
 
                 elif cmd == "ConnectionRefused":
                         could_not_connect.emit(message["text"])
                         global._print("Connection to AP refused")
 
+                elif cmd == "UpdateLocations":
+                        for location in message["locations"]:
+                                var lint = int(location)
+                                if not _checked_locations.has(lint):
+                                        _checked_locations.append(lint)
+
+                        checked_locations_updated.emit()
+
                 elif cmd == "ItemReceived":
                         for item in message["items"]:
                                 var index = int(item["index"])
@@ -134,6 +150,21 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                                         int(loc["for_self"])
                                 )
 
+                elif cmd == "AccessibleLocations":
+                        _accessible_locations.clear()
+
+                        for loc in message["locations"]:
+                                _accessible_locations.append(int(loc))
+
+                        accessible_locations_updated.emit()
+
+                elif cmd == "UpdateKeyboard":
+                        var updates = {}
+                        for k in message["updates"]:
+                                updates[k] = int(message["updates"][k])
+
+                        keyboard_update_received.emit(updates)
+
 
 func connectToServer(server, un, pw):
         sendMessage([{"cmd": "Connect", "server": server, "player": un, "password": pw}])
@@ -179,19 +210,6 @@ func sendLocations(loc_ids):
         sendMessage([{"cmd": "LocationChecks", "locations": loc_ids}])
 
 
-func setValue(key, value, operation = "replace"):
-        sendMessage(
-                [
-                        {
-                                "cmd": "Set",
-                                "key": "Lingo2_%d_%s" % [_slot, key],
-                                "want_reply": false,
-                                "operations": [{"operation": operation, "value": value}]
-                        }
-                ]
-        )
-
-
 func say(textdata):
         sendMessage([{"cmd": "Say", "text": textdata}])
 
@@ -204,6 +222,14 @@ func scoutLocations(loc_ids):
         sendMessage([{"cmd": "LocationScouts", "locations": loc_ids}])
 
 
+func updateKeyboard(updates):
+        sendMessage([{"cmd": "UpdateKeyboard", "keyboard": updates}])
+
+
+func sendQuit():
+        sendMessage([{"cmd": "Quit"}])
+
+
 func hasItem(item_id):
         return _received_items.has(item_id)
 
@@ -13,6 +13,7 @@ var progressive_id_by_ap_id = {}
 var letter_id_by_ap_id = {}
 var symbol_item_ids = []
 var anti_trap_ids = {}
+var location_name_by_id = {}
 
 var kSYMBOL_ITEMS
 
@@ -70,6 +71,7 @@ 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)
 
         for painting in objects.get_paintings():
                 var room = objects.get_rooms()[painting.get_room_id()]
@@ -95,6 +97,17 @@ func load(data_bytes):
 
         for letter in objects.get_letters():
                 letter_id_by_ap_id[letter.get_ap_id()] = letter.get_id()
+                location_name_by_id[letter.get_ap_id()] = _get_letter_location_name(letter)
+
+        for mastery in objects.get_masteries():
+                location_name_by_id[mastery.get_ap_id()] = _get_mastery_location_name(mastery)
+
+        for ending in objects.get_endings():
+                location_name_by_id[ending.get_ap_id()] = _get_ending_location_name(ending)
+
+        for keyholder in objects.get_keyholders():
+                if keyholder.has_key():
+                        location_name_by_id[keyholder.get_ap_id()] = _get_keyholder_location_name(keyholder)
 
         for panel in objects.get_panels():
                 var room = objects.get_rooms()[panel.get_room_id()]
@@ -148,12 +161,118 @@ func get_door_ap_id(door_id):
                 return null
 
 
+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()]
+        return map.get_name()
+
+
 func get_door_receivers(door_id):
         var door = objects.get_doors()[door_id]
         return door.get_receivers()
 
 
-func get_door_map_name(door_id):
-        var door = objects.get_doors()[door_id]
-        var map = objects.get_maps()[door.get_map_id()]
-        return map.get_name()
+func _get_map_object_map_name(obj):
+        return objects.get_maps()[obj.get_map_id()].get_display_name()
+
+
+func _get_room_object_map_name(obj):
+        return _get_map_object_map_name(objects.get_rooms()[obj.get_room_id()])
+
+
+func _get_room_object_location_prefix(obj):
+        var room = objects.get_rooms()[obj.get_room_id()]
+        var game_map = objects.get_maps()[room.get_map_id()]
+
+        if room.has_panel_display_name():
+                return "%s (%s)" % [game_map.get_display_name(), room.get_panel_display_name()]
+        else:
+                return game_map.get_display_name()
+
+
+func _get_door_location_name(door):
+        var map_part = _get_room_object_location_prefix(door)
+
+        if door.has_location_name():
+                return "%s - %s" % [map_part, door.get_location_name()]
+
+        var generated_location_name = _get_generated_door_location_name(door)
+        if generated_location_name != null:
+                return generated_location_name
+
+        return "%s - %s" % [map_part, door.get_name()]
+
+
+func _get_generated_door_location_name(door):
+        if door.get_type() != SCRIPT_proto.DoorType.STANDARD:
+                return null
+
+        if door.get_keyholders().size() > 0 or door.get_endings().size() > 0 or door.has_complete_at():
+                return null
+
+        if door.get_panels().size() > 4:
+                return null
+
+        var map_areas = []
+        for panel_id in door.get_panels():
+                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())
+
+        if map_areas.size() > 1:
+                return null
+
+        var game_map = objects.get_maps()[door.get_map_id()]
+        var map_area = map_areas[0]
+        var map_part
+        if map_area == "":
+                map_part = game_map.get_display_name()
+        else:
+                map_part = "%s (%s)" % [game_map.get_display_name(), map_area]
+
+        var panel_names = []
+        for panel_id in door.get_panels():
+                var panel_data = objects.get_panels()[panel_id.get_panel()]
+                var panel_name
+                if panel_data.has_display_name():
+                        panel_name = panel_data.get_display_name()
+                else:
+                        panel_name = panel_data.get_name()
+
+                var location_part
+                if panel_id.has_answer():
+                        location_part = "%s/%s" % [panel_name, panel_id.get_answer().to_upper()]
+                else:
+                        location_part = panel_name
+
+                panel_names.append(location_part)
+
+        panel_names.sort()
+
+        return map_part + " - " + ", ".join(panel_names)
+
+
+func _get_letter_location_name(letter):
+        var letter_level = 2 if 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]
+
+
+func _get_mastery_location_name(mastery):
+        return "%s - Mastery" % _get_room_object_map_name(mastery)
+
+
+func _get_ending_location_name(ending):
+        return (
+                "%s - %s Ending" % [_get_room_object_map_name(ending), ending.get_name().to_pascal_case()]
+        )
+
+
+func _get_keyholder_location_name(keyholder):
+        return (
+                "%s - %s Keyholder"
+                % [_get_room_object_location_prefix(keyholder), keyholder.get_key().to_upper()]
+        )
@@ -48,6 +48,9 @@ func load_seed():
                 if localdata.size() > 2:
                         keyholder_state = localdata[2]
 
+        if not letters_saved.is_empty():
+                ap.client.updateKeyboard(letters_saved)
+
         for k in kALL_LETTERS:
                 var level = 0
 
@@ -105,10 +108,20 @@ func update_unlocks():
 
 
 func collect_local_letter(key, level):
-        if level < 0 or level > 2 or level < letters_saved.get(key, 0):
+        var ap = global.get_node("Archipelago")
+        var true_level = 0
+
+        if ap.get_letter_behavior(key, false) == ap.kLETTER_BEHAVIOR_VANILLA:
+                true_level += 1
+        if level == 2 and ap.get_letter_behavior(key, true) == ap.kLETTER_BEHAVIOR_VANILLA:
+                true_level += 1
+
+        if true_level < letters_saved.get(key, 0):
                 return
 
-        letters_saved[key] = level
+        letters_saved[key] = true_level
+
+        ap.client.updateKeyboard({key: true_level})
 
         if letters_blocked.has(key):
                 letters_blocked.erase(key)
@@ -197,3 +210,22 @@ func reset_keyholders():
         save()
 
         return cleared_anything
+
+
+func remote_keyboard_updated(updates):
+        var reverse = {}
+        var should_update = false
+
+        for k in updates:
+                if not letters_saved.has(k) or updates[k] > letters_saved[k]:
+                        letters_saved[k] = updates[k]
+                        should_update = true
+                elif updates[k] < letters_saved[k]:
+                        reverse[k] = letters_saved[k]
+
+        if should_update:
+                update_unlocks()
+
+        if not reverse.is_empty():
+                var ap = global.get_node("Archipelago")
+                ap.client.updateKeyboard(reverse)
@@ -137,6 +137,7 @@ func _connect_pressed():
 func _back_pressed():
         var ap = global.get_node("Archipelago")
         ap.disconnect_from_ap()
+        ap.client.sendQuit()
 
         get_tree().quit()
 
@@ -14,6 +14,8 @@ var ap_user = ""
 var ap_pass = ""
 var connection_history = []
 var show_compass = false
+var show_locations = false
+var show_minimap = false
 
 var client
 var keyboard
@@ -89,6 +91,12 @@ func _init():
                 if data.size() > 4:
                         show_compass = data[4]
 
+                if data.size() > 5:
+                        show_locations = data[5]
+
+                if data.size() > 6:
+                        show_minimap = data[6]
+
 
 func _ready():
         client = SCRIPT_client.new()
@@ -99,6 +107,8 @@ func _ready():
         client.text_message_received.connect(_process_text_message)
         client.item_sent_notification.connect(_process_item_sent_notification)
         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.could_not_connect.connect(_client_could_not_connect)
         client.connect_status.connect(_client_connect_status)
@@ -108,6 +118,7 @@ func _ready():
 
         keyboard = SCRIPT_keyboard.new()
         add_child(keyboard)
+        client.keyboard_update_received.connect(keyboard.remote_keyboard_updated)
 
 
 func saveSettings():
@@ -121,6 +132,8 @@ func saveSettings():
                 ap_pass,
                 connection_history,
                 show_compass,
+                show_locations,
+                show_minimap,
         ]
         file.store_var(data, true)
         file.close()
@@ -302,6 +315,18 @@ func _process_location_scout(location_id, item_name, player_name, flags, for_sel
                                 collectable.setScoutedText(item_name)
 
 
+func _on_accessible_locations_updated():
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
+func _on_checked_locations_updated():
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
 func _client_could_not_connect(message):
         could_not_connect.emit(message)
 
@@ -1,6 +1,8 @@
 extends "res://scripts/ui/pauseMenu.gd"
 
 var compass_button
+var locations_button
+var minimap_button
 
 
 func _ready():
@@ -19,6 +21,24 @@ func _ready():
         compass_button.pressed.connect(_toggle_compass)
         ap_panel.add_child(compass_button)
 
+        locations_button = CheckBox.new()
+        locations_button.text = "show locations overlay"
+        locations_button.button_pressed = ap.show_locations
+        locations_button.position = Vector2(65, 200)
+        locations_button.theme = preload("res://assets/themes/baseUI.tres")
+        locations_button.add_theme_font_size_override("font_size", 60)
+        locations_button.pressed.connect(_toggle_locations)
+        ap_panel.add_child(locations_button)
+
+        minimap_button = CheckBox.new()
+        minimap_button.text = "show minimap"
+        minimap_button.button_pressed = ap.show_minimap
+        minimap_button.position = Vector2(65, 300)
+        minimap_button.theme = preload("res://assets/themes/baseUI.tres")
+        minimap_button.add_theme_font_size_override("font_size", 60)
+        minimap_button.pressed.connect(_toggle_minimap)
+        ap_panel.add_child(minimap_button)
+
         super._ready()
 
 
@@ -32,6 +52,7 @@ func _main_menu():
         global.get_node("Archipelago").disconnect_from_ap()
         global.get_node("Messages").clear()
         global.get_node("Compass").visible = false
+        global.get_node("Textclient").reset()
 
         autosplitter.reset()
         _unpause_game()
@@ -49,3 +70,22 @@ func _toggle_compass():
 
         var compass = global.get_node("Compass")
         compass.visible = compass_button.button_pressed
+
+
+func _toggle_locations():
+        var ap = global.get_node("Archipelago")
+        ap.show_locations = locations_button.button_pressed
+        ap.saveSettings()
+
+        var textclient = global.get_node("Textclient")
+        textclient.update_locations_visibility()
+
+
+func _toggle_minimap():
+        var ap = global.get_node("Archipelago")
+        ap.show_minimap = minimap_button.button_pressed
+        ap.saveSettings()
+
+        var minimap = get_tree().get_root().get_node("scene/Minimap")
+        if minimap != null:
+                minimap.visible = ap.show_minimap
@@ -330,6 +330,7 @@ func _ready():
 
         var minimap = ap.SCRIPT_minimap.new()
         minimap.name = "Minimap"
+        minimap.visible = ap.show_minimap
         get_parent().add_child.call_deferred(minimap)
 
         super._ready()
@@ -1,35 +1,57 @@
 extends CanvasLayer
 
+var tabs
 var panel
 var label
 var entry
+var tracker_label
 var is_open = false
 
+var locations_overlay
+
 
 func _ready():
         process_mode = ProcessMode.PROCESS_MODE_ALWAYS
         layer = 2
 
-        panel = Panel.new()
-        panel.set_name("Panel")
-        panel.offset_left = 100
-        panel.offset_right = 1820
-        panel.offset_top = 100
-        panel.offset_bottom = 980
-        panel.visible = false
-        add_child(panel)
+        locations_overlay = RichTextLabel.new()
+        locations_overlay.name = "LocationsOverlay"
+        locations_overlay.offset_top = 220
+        locations_overlay.offset_bottom = 720
+        locations_overlay.offset_left = 20
+        locations_overlay.anchor_right = 1.0
+        locations_overlay.offset_right = -20
+        locations_overlay.scroll_active = false
+        locations_overlay.mouse_filter = Control.MOUSE_FILTER_IGNORE
+        add_child(locations_overlay)
+        update_locations_visibility()
+
+        tabs = TabContainer.new()
+        tabs.name = "Tabs"
+        tabs.offset_left = 100
+        tabs.offset_right = 1820
+        tabs.offset_top = 100
+        tabs.offset_bottom = 980
+        tabs.visible = false
+        tabs.theme = preload("res://assets/themes/baseUI.tres")
+        tabs.add_theme_font_size_override("font_size", 36)
+        add_child(tabs)
+
+        panel = MarginContainer.new()
+        panel.name = "Text Client"
+        panel.add_theme_constant_override("margin_top", 60)
+        panel.add_theme_constant_override("margin_left", 60)
+        panel.add_theme_constant_override("margin_right", 60)
+        panel.add_theme_constant_override("margin_bottom", 60)
+        tabs.add_child(panel)
 
         label = RichTextLabel.new()
         label.set_name("Label")
-        label.offset_left = 80
-        label.offset_right = 1640
-        label.offset_top = 80
-        label.offset_bottom = 720
         label.scroll_following = true
         label.selection_enabled = true
-        panel.add_child(label)
-
-        label.push_font(load("res://assets/fonts/Lingo2.ttf"))
+        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)
 
         var entry_style = StyleBoxFlat.new()
@@ -37,18 +59,30 @@ func _ready():
 
         entry = LineEdit.new()
         entry.set_name("Entry")
-        entry.offset_left = 80
-        entry.offset_right = 1640
-        entry.offset_top = 760
-        entry.offset_bottom = 840
-        entry.add_theme_font_override("font", load("res://assets/fonts/Lingo2.ttf"))
+        entry.add_theme_font_override("font", preload("res://assets/fonts/Lingo2.ttf"))
         entry.add_theme_font_size_override("font_size", 36)
         entry.add_theme_color_override("font_color", Color(0, 0, 0, 1))
         entry.add_theme_color_override("cursor_color", Color(0, 0, 0, 1))
         entry.add_theme_stylebox_override("focus", entry_style)
-        panel.add_child(entry)
         entry.text_submitted.connect(text_entered)
 
+        var tc_arranger = VBoxContainer.new()
+        tc_arranger.add_child(label)
+        tc_arranger.add_child(entry)
+        tc_arranger.add_theme_constant_override("separation", 40)
+        panel.add_child(tc_arranger)
+
+        var tracker_margins = MarginContainer.new()
+        tracker_margins.name = "Locations"
+        tracker_margins.add_theme_constant_override("margin_top", 60)
+        tracker_margins.add_theme_constant_override("margin_left", 60)
+        tracker_margins.add_theme_constant_override("margin_right", 60)
+        tracker_margins.add_theme_constant_override("margin_bottom", 60)
+        tabs.add_child(tracker_margins)
+
+        tracker_label = RichTextLabel.new()
+        tracker_margins.add_child(tracker_label)
+
 
 func _input(event):
         if global.loaded and event is InputEventKey and event.pressed:
@@ -57,7 +91,7 @@ func _input(event):
                                 is_open = true
                                 get_tree().paused = true
                                 Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
-                                panel.visible = true
+                                tabs.visible = true
                                 entry.grab_focus()
                                 get_viewport().set_input_as_handled()
                         else:
@@ -72,7 +106,7 @@ func dismiss():
         if is_open:
                 get_tree().paused = false
                 Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
-                panel.visible = false
+                tabs.visible = false
                 is_open = false
 
 
@@ -93,3 +127,46 @@ func text_entered(text):
                         return
 
         ap.client.say(cmd)
+
+
+func update_locations():
+        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)
+        locations_overlay.push_color(Color(0.9, 0.9, 0.9, 1))
+        locations_overlay.push_outline_color(Color(0, 0, 0, 1))
+        locations_overlay.push_outline_size(2)
+
+        var location_names = []
+        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)
+
+        location_names.sort()
+
+        var count = 0
+        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)
+                count += 1
+
+        if count > 18:
+                locations_overlay.append_text("[p align=right][lb]...[rb][/p]")
+
+
+func update_locations_visibility():
+        var ap = global.get_node("Archipelago")
+        locations_overlay.visible = ap.show_locations
+
+
+func reset():
+        locations_overlay.clear()
@@ -8,37 +8,92 @@ import websockets
 
 import Utils
 import settings
+from BaseClasses import ItemClassification
 from CommonClient import CommonContext, server_loop, gui_enabled, logger, get_base_parser, handle_url_arg
 from NetUtils import Endpoint, decode, encode
 from Utils import async_start
+from . import Lingo2World
+from .tracker import Tracker
 
-PORT = 43182
+ALL_LETTERS = "abcdefghijklmnopqrstuvwxyz"
 MESSAGE_MAX_SIZE = 16*1024*1024
+PORT = 43182
+
+KEY_STORAGE_MAPPING = {
+    "a": (1, 0), "b": (1, 1), "c": (1, 2), "d": (1, 3), "e": (1, 4), "f": (1, 5), "g": (1, 6), "h": (1, 7), "i": (1, 8),
+    "j": (1, 9), "k": (1, 10), "l": (1, 11), "m": (1, 12), "n": (2, 0), "o": (2, 1), "p": (2, 2), "q": (2, 3),
+    "r": (2, 4), "s": (2, 5), "t": (2, 6), "u": (2, 7), "v": (2, 8), "w": (2, 9), "x": (2, 10), "y": (2, 11),
+    "z": (2, 12),
+}
+
+REVERSE_KEY_STORAGE_MAPPING = {t: k for k, t in KEY_STORAGE_MAPPING.items()}
+
+
+class Lingo2Manager:
+    game_ctx: "Lingo2GameContext"
+    client_ctx: "Lingo2ClientContext"
+    tracker: Tracker
+
+    keyboard: dict[str, int]
+
+    def __init__(self, game_ctx: "Lingo2GameContext", client_ctx: "Lingo2ClientContext"):
+        self.game_ctx = game_ctx
+        self.game_ctx.manager = self
+        self.client_ctx = client_ctx
+        self.client_ctx.manager = self
+        self.tracker = Tracker(self)
+        self.keyboard = {}
+
+        self.reset()
+
+    def reset(self):
+        for k in ALL_LETTERS:
+            self.keyboard[k] = 0
+
+    def update_keyboard(self, new_keyboard: dict[str, int]) -> dict[str, int]:
+        ret: dict[str, int] = {}
+
+        for k, v in new_keyboard.items():
+            if v > self.keyboard.get(k, 0):
+                self.keyboard[k] = v
+                ret[k] = v
+
+        if len(ret) > 0:
+            self.tracker.refresh_state()
+            self.game_ctx.send_accessible_locations()
+
+        return ret
 
 
 class Lingo2GameContext:
     server: Endpoint | None
-    client: "Lingo2ClientContext"
+    manager: Lingo2Manager
 
     def __init__(self):
         self.server = None
 
     def send_connected(self):
+        if self.server is None:
+            return
+
         msg = {
             "cmd": "Connected",
-            "user": self.client.username,
-            "seed_name": self.client.seed_name,
-            "version": self.client.server_version,
-            "generator_version": self.client.generator_version,
-            "team": self.client.team,
-            "slot": self.client.slot,
-            "checked_locations": self.client.checked_locations,
-            "slot_data": self.client.slot_data,
+            "user": self.manager.client_ctx.username,
+            "seed_name": self.manager.client_ctx.seed_name,
+            "version": self.manager.client_ctx.server_version,
+            "generator_version": self.manager.client_ctx.generator_version,
+            "team": self.manager.client_ctx.team,
+            "slot": self.manager.client_ctx.slot,
+            "checked_locations": self.manager.client_ctx.checked_locations,
+            "slot_data": self.manager.client_ctx.slot_data,
         }
 
         async_start(self.send_msgs([msg]), name="game Connected")
 
     def send_item_sent_notification(self, item_name, receiver_name, item_flags):
+        if self.server is None:
+            return
+
         msg = {
             "cmd": "ItemSentNotif",
             "item_name": item_name,
@@ -49,6 +104,9 @@ class Lingo2GameContext:
         async_start(self.send_msgs([msg]), name="item sent notif")
 
     def send_hint_received(self, item_name, location_name, receiver_name, item_flags, for_self):
+        if self.server is None:
+            return
+
         msg = {
             "cmd": "HintReceived",
             "item_name": item_name,
@@ -61,6 +119,9 @@ class Lingo2GameContext:
         async_start(self.send_msgs([msg]), name="hint received notif")
 
     def send_item_received(self, items):
+        if self.server is None:
+            return
+
         msg = {
             "cmd": "ItemReceived",
             "items": items,
@@ -69,6 +130,9 @@ class Lingo2GameContext:
         async_start(self.send_msgs([msg]), name="item received")
 
     def send_location_info(self, locations):
+        if self.server is None:
+            return
+
         msg = {
             "cmd": "LocationInfo",
             "locations": locations,
@@ -77,6 +141,9 @@ class Lingo2GameContext:
         async_start(self.send_msgs([msg]), name="location info")
 
     def send_text_message(self, parts):
+        if self.server is None:
+            return
+
         msg = {
             "cmd": "TextMessage",
             "data": parts,
@@ -84,6 +151,39 @@ class Lingo2GameContext:
 
         async_start(self.send_msgs([msg]), name="notif")
 
+    def send_accessible_locations(self):
+        if self.server is None:
+            return
+
+        msg = {
+            "cmd": "AccessibleLocations",
+            "locations": list(self.manager.tracker.accessible_locations),
+        }
+
+        async_start(self.send_msgs([msg]), name="accessible locations")
+
+    def send_update_locations(self, locations):
+        if self.server is None:
+            return
+
+        msg = {
+            "cmd": "UpdateLocations",
+            "locations": locations,
+        }
+
+        async_start(self.send_msgs([msg]), name="update locations")
+
+    def send_update_keyboard(self, updates):
+        if self.server is None:
+            return
+
+        msg = {
+            "cmd": "UpdateKeyboard",
+            "updates": updates,
+        }
+
+        async_start(self.send_msgs([msg]), name="update keyboard")
+
     async def send_msgs(self, msgs: list[Any]) -> None:
         """ `msgs` JSON serializable """
         if not self.server or not self.server.socket.open or self.server.socket.closed:
@@ -92,7 +192,7 @@ class Lingo2GameContext:
 
 
 class Lingo2ClientContext(CommonContext):
-    game_ctx: Lingo2GameContext
+    manager: Lingo2Manager
 
     game = "Lingo 2"
     items_handling = 0b111
@@ -117,104 +217,201 @@ class Lingo2ClientContext(CommonContext):
         elif cmd == "Connected":
             self.slot_data = args.get("slot_data", None)
 
-            if self.game_ctx.server is not None:
-                self.game_ctx.send_connected()
+            self.manager.reset()
+
+            self.manager.game_ctx.send_connected()
+
+            self.manager.tracker.setup_slot(self.slot_data)
+            self.manager.tracker.set_checked_locations(self.checked_locations)
+            self.manager.game_ctx.send_accessible_locations()
+
+            self.set_notify(self.get_datastorage_key("keyboard1"), self.get_datastorage_key("keyboard2"))
+            async_start(self.send_msgs([{
+                "cmd": "Set",
+                "key": self.get_datastorage_key("keyboard1"),
+                "default": 0,
+                "want_reply": True,
+                "operations": [{"operation": "default", "value": 0}]
+            }, {
+                "cmd": "Set",
+                "key": self.get_datastorage_key("keyboard2"),
+                "default": 0,
+                "want_reply": True,
+                "operations": [{"operation": "default", "value": 0}]
+            }]), 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"])
         elif cmd == "ReceivedItems":
-            if self.game_ctx.server is not None:
-                cur_index = 0
-                items = []
+            self.manager.tracker.set_collected_items(self.items_received)
 
-                for item in args["items"]:
-                    index = cur_index + args["index"]
-                    cur_index += 1
+            cur_index = 0
+            items = []
 
-                    item_msg = {
-                        "id": item.item,
-                        "index": index,
-                        "flags": item.flags,
-                        "text": self.item_names.lookup_in_slot(item.item, self.slot),
-                    }
+            for item in args["items"]:
+                index = cur_index + args["index"]
+                cur_index += 1
 
-                    if item.player != self.slot:
-                        item_msg["sender"] = self.player_names.get(item.player)
+                item_msg = {
+                    "id": item.item,
+                    "index": index,
+                    "flags": item.flags,
+                    "text": self.item_names.lookup_in_slot(item.item, self.slot),
+                }
 
-                    items.append(item_msg)
+                if item.player != self.slot:
+                    item_msg["sender"] = self.player_names.get(item.player)
 
-                self.game_ctx.send_item_received(items)
-        elif cmd == "PrintJSON":
-            if self.game_ctx.server is not None:
-                if "receiving" in args and "item" in args and args["item"].player == self.slot:
-                    item_name = self.item_names.lookup_in_slot(args["item"].item, args["receiving"])
-                    location_name = self.location_names.lookup_in_slot(args["item"].location, args["item"].player)
-                    receiver_name = self.player_names.get(args["receiving"])
-
-                    if args["type"] == "Hint" and not args.get("found", False):
-                        self.game_ctx.send_hint_received(item_name, location_name, receiver_name, args["item"].flags,
-                                                         int(args["receiving"]) == self.slot)
-                    elif args["receiving"] != self.slot:
-                        self.game_ctx.send_item_sent_notification(item_name, receiver_name, args["item"].flags)
-
-                parts = []
-                for message_part in args["data"]:
-                    if "type" not in message_part and "text" in message_part:
-                        parts.append({"type": "text", "text": message_part["text"]})
-                    elif message_part["type"] == "player_id":
-                        parts.append({
-                            "type": "player",
-                            "text": self.player_names.get(int(message_part["text"])),
-                            "self": int(int(message_part["text"]) == self.slot),
-                        })
-                    elif message_part["type"] == "item_id":
-                        parts.append({
-                            "type": "item",
-                            "text": self.item_names.lookup_in_slot(int(message_part["text"]), message_part["player"]),
-                            "flags": message_part["flags"],
-                        })
-                    elif message_part["type"] == "location_id":
-                        parts.append({
-                            "type": "location",
-                            "text": self.location_names.lookup_in_slot(int(message_part["text"]),
-                                                                       message_part["player"])
-                        })
-                    elif "text" in message_part:
-                        parts.append({"type": "text", "text": message_part["text"]})
-
-                self.game_ctx.send_text_message(parts)
-        elif cmd == "LocationInfo":
-            if self.game_ctx.server is not None:
-                locations = []
-
-                for location in args["locations"]:
-                    locations.append({
-                        "id": location.location,
-                        "item": self.item_names.lookup_in_slot(location.item, location.player),
-                        "player": self.player_names.get(location.player),
-                        "flags": location.flags,
-                        "self": int(location.player) == self.slot,
-                    })
+                items.append(item_msg)
 
-                self.game_ctx.send_location_info(locations)
+            self.manager.game_ctx.send_item_received(items)
 
+            if any(ItemClassification.progression in ItemClassification(item.flags) for item in args["items"]):
+                self.manager.game_ctx.send_accessible_locations()
+        elif cmd == "PrintJSON":
+            if "receiving" in args and "item" in args and args["item"].player == self.slot:
+                item_name = self.item_names.lookup_in_slot(args["item"].item, args["receiving"])
+                location_name = self.location_names.lookup_in_slot(args["item"].location, args["item"].player)
+                receiver_name = self.player_names.get(args["receiving"])
+
+                if args["type"] == "Hint" and not args.get("found", False):
+                    self.manager.game_ctx.send_hint_received(item_name, location_name, receiver_name, args["item"].flags,
+                                                           int(args["receiving"]) == self.slot)
+                elif args["receiving"] != self.slot:
+                    self.manager.game_ctx.send_item_sent_notification(item_name, receiver_name, args["item"].flags)
+
+            parts = []
+            for message_part in args["data"]:
+                if "type" not in message_part and "text" in message_part:
+                    parts.append({"type": "text", "text": message_part["text"]})
+                elif message_part["type"] == "player_id":
+                    parts.append({
+                        "type": "player",
+                        "text": self.player_names.get(int(message_part["text"])),
+                        "self": int(int(message_part["text"]) == self.slot),
+                    })
+                elif message_part["type"] == "item_id":
+                    parts.append({
+                        "type": "item",
+                        "text": self.item_names.lookup_in_slot(int(message_part["text"]), message_part["player"]),
+                        "flags": message_part["flags"],
+                    })
+                elif message_part["type"] == "location_id":
+                    parts.append({
+                        "type": "location",
+                        "text": self.location_names.lookup_in_slot(int(message_part["text"]),
+                                                                   message_part["player"])
+                    })
+                elif "text" in message_part:
+                    parts.append({"type": "text", "text": message_part["text"]})
 
-async def pipe_loop(ctx: Lingo2GameContext):
-    while not ctx.client.exit_event.is_set():
+            self.manager.game_ctx.send_text_message(parts)
+        elif cmd == "LocationInfo":
+            locations = []
+
+            for location in args["locations"]:
+                locations.append({
+                    "id": location.location,
+                    "item": self.item_names.lookup_in_slot(location.item, location.player),
+                    "player": self.player_names.get(location.player),
+                    "flags": location.flags,
+                    "self": int(location.player) == self.slot,
+                })
+
+            self.manager.game_ctx.send_location_info(locations)
+        elif cmd == "SetReply":
+            if args["key"] == self.get_datastorage_key("keyboard1"):
+                self.handle_keyboard_update(1, args)
+            elif args["key"] == self.get_datastorage_key("keyboard2"):
+                self.handle_keyboard_update(2, args)
+
+    def get_datastorage_key(self, name: str):
+        return f"Lingo2_{self.slot}_{name}"
+
+    async def update_keyboard(self, updates: dict[str, int]):
+        kb1 = 0
+        kb2 = 0
+
+        for k, v in updates.items():
+            if v == 0:
+                continue
+
+            effect = 0
+            if v >= 1:
+                effect |= 1
+            if v == 2:
+                effect |= 2
+
+            pos = KEY_STORAGE_MAPPING[k]
+            if pos[0] == 1:
+                kb1 |= (effect << pos[1] * 2)
+            else:
+                kb2 |= (effect << pos[1] * 2)
+
+        msgs = []
+
+        if kb1 != 0:
+            msgs.append({
+                "cmd": "Set",
+                "key": self.get_datastorage_key("keyboard1"),
+                "want_reply": True,
+                "operations": [{
+                    "operation": "or",
+                    "value": kb1
+                }]
+            })
+
+        if kb2 != 0:
+            msgs.append({
+                "cmd": "Set",
+                "key": self.get_datastorage_key("keyboard2"),
+                "want_reply": True,
+                "operations": [{
+                    "operation": "or",
+                    "value": kb2
+                }]
+            })
+
+        if len(msgs) > 0:
+            print(updates)
+            print(msgs)
+            await self.send_msgs(msgs)
+
+    def handle_keyboard_update(self, field: int, args: dict[str, Any]):
+        keys = {}
+        value = args["value"]
+
+        for i in range(0, 13):
+            if (value & (1 << (i * 2))) != 0:
+                keys[REVERSE_KEY_STORAGE_MAPPING[(field, i)]] = 1
+            if (value & (1 << (i * 2 + 1))) != 0:
+                keys[REVERSE_KEY_STORAGE_MAPPING[(field, i)]] = 2
+
+        updates = self.manager.update_keyboard(keys)
+        if len(updates) > 0:
+            self.manager.game_ctx.send_update_keyboard(updates)
+
+
+async def pipe_loop(manager: Lingo2Manager):
+    while not manager.client_ctx.exit_event.is_set():
         try:
             socket = await websockets.connect("ws://localhost", port=PORT, ping_timeout=None, ping_interval=None,
                                               max_size=MESSAGE_MAX_SIZE)
-            ctx.server = Endpoint(socket)
+            manager.game_ctx.server = Endpoint(socket)
             logger.info("Connected to Lingo 2!")
-            if ctx.client.auth is not None:
-                ctx.send_connected()
-            async for data in ctx.server.socket:
+            if manager.client_ctx.auth is not None:
+                manager.game_ctx.send_connected()
+                manager.game_ctx.send_accessible_locations()
+            async for data in manager.game_ctx.server.socket:
                 for msg in decode(data):
-                    await process_game_cmd(ctx, msg)
+                    await process_game_cmd(manager, msg)
         except ConnectionRefusedError:
             logger.info("Could not connect to Lingo 2.")
         finally:
-            ctx.server = None
+            manager.game_ctx.server = None
 
 
-async def process_game_cmd(ctx: Lingo2GameContext, args: dict):
+async def process_game_cmd(manager: Lingo2Manager, args: dict):
     cmd = args["cmd"]
 
     if cmd == "Connect":
@@ -227,20 +424,29 @@ async def process_game_cmd(ctx: Lingo2GameContext, args: dict):
         else:
             server_address = f"{player}:None@{server}"
 
-        async_start(ctx.client.connect(server_address), name="client connect")
+        async_start(manager.client_ctx.connect(server_address), name="client connect")
     elif cmd == "Disconnect":
-        async_start(ctx.client.disconnect(), name="client disconnect")
+        async_start(manager.client_ctx.disconnect(), name="client disconnect")
     elif cmd in ["Sync", "LocationChecks", "Say", "StatusUpdate", "LocationScouts"]:
-        async_start(ctx.client.send_msgs([args]), name="client forward")
+        async_start(manager.client_ctx.send_msgs([args]), name="client forward")
+    elif cmd == "UpdateKeyboard":
+        updates = manager.update_keyboard(args["keyboard"])
+        if len(updates) > 0:
+            async_start(manager.client_ctx.update_keyboard(updates), name="client update keyboard")
+    elif cmd == "Quit":
+        manager.client_ctx.exit_event.set()
 
 
 async def run_game():
     exe_file = settings.get_settings().lingo2_options.exe_file
 
-    from worlds import AutoWorldRegister
-    world = AutoWorldRegister.world_types["Lingo 2"]
+    # This ensures we can use Steam features without having to open the game
+    # through steam.
+    steam_appid_path = os.path.join(os.path.dirname(exe_file), "steam_appid.txt")
+    with open(steam_appid_path, "w") as said_handle:
+        said_handle.write("2523310")
 
-    if world.zip_path is not None:
+    if Lingo2World.zip_path is not None:
         # This is a packaged apworld.
         init_scene = pkgutil.get_data(__name__, "client/run_from_apworld.tscn")
         init_path = Utils.local_path("data", "lingo2_init.tscn")
@@ -254,7 +460,7 @@ async def run_game():
                 "--scene",
                 init_path,
                 "--",
-                str(world.zip_path.absolute()),
+                str(Lingo2World.zip_path.absolute()),
             ],
             cwd=os.path.dirname(exe_file),
         )
@@ -278,9 +484,7 @@ def client_main(*launch_args: str) -> None:
 
         client_ctx = Lingo2ClientContext(args.connect, args.password)
         game_ctx = Lingo2GameContext()
-
-        client_ctx.game_ctx = game_ctx
-        game_ctx.client = client_ctx
+        manager = Lingo2Manager(game_ctx, client_ctx)
 
         client_ctx.server_task = asyncio.create_task(server_loop(client_ctx), name="ServerLoop")
 
@@ -288,7 +492,7 @@ def client_main(*launch_args: str) -> None:
             client_ctx.run_gui()
         client_ctx.run_cli()
 
-        pipe_task = asyncio.create_task(pipe_loop(game_ctx), name="GameWatcher")
+        pipe_task = asyncio.create_task(pipe_loop(manager), name="GameWatcher")
 
         try:
             await pipe_task
@@ -296,6 +500,7 @@ def client_main(*launch_args: str) -> None:
             logger.exception(e)
 
         await client_ctx.exit_event.wait()
+        client_ctx.ui.stop()
         await client_ctx.shutdown()
 
     Utils.init_logging("Lingo2Client", exception_logger="Client")
@@ -297,13 +297,14 @@ class Lingo2PlayerLogic:
                                                                                         AccessRequirements()))
             behavior = self.get_letter_behavior(letter.key, letter.level2)
             if behavior == LetterBehavior.VANILLA:
-                letter_name = f"{letter.key.upper()}{'2' if letter.level2 else '1'}"
-                event_name = f"{letter_name} (Collected)"
-                self.event_loc_item_by_room.setdefault(letter.room_id, {})[event_name] = letter.key.upper()
-
-                if letter.level2:
-                    event_name = f"{letter_name} (Double Collected)"
+                if not world.for_tracker:
+                    letter_name = f"{letter.key.upper()}{'2' if letter.level2 else '1'}"
+                    event_name = f"{letter_name} (Collected)"
                     self.event_loc_item_by_room.setdefault(letter.room_id, {})[event_name] = letter.key.upper()
+
+                    if letter.level2:
+                        event_name = f"{letter_name} (Double Collected)"
+                        self.event_loc_item_by_room.setdefault(letter.room_id, {})[event_name] = letter.key.upper()
             elif behavior == LetterBehavior.ITEM:
                 self.real_items.append(letter.key.upper())
 
@@ -2,6 +2,7 @@ from .generated import data_pb2 as data_pb2
 from .items import SYMBOL_ITEMS, ANTI_COLLECTABLE_TRAPS
 import pkgutil
 
+
 class Lingo2StaticLogic:
     item_id_to_name: dict[int, str]
     location_id_to_name: dict[int, str]
@@ -0,0 +1,95 @@
+from typing import TYPE_CHECKING
+
+from BaseClasses import MultiWorld, CollectionState, ItemClassification
+from NetUtils import NetworkItem
+from . import Lingo2World, Lingo2Item
+from .regions import connect_ports_from_ut
+from .options import Lingo2Options, ShuffleLetters
+
+if TYPE_CHECKING:
+    from .context import Lingo2Manager
+
+PLAYER_NUM = 1
+
+
+class Tracker:
+    manager: "Lingo2Manager"
+
+    multiworld: MultiWorld
+    world: Lingo2World
+
+    collected_items: dict[int, int]
+    checked_locations: set[int]
+    accessible_locations: set[int]
+
+    state: CollectionState
+
+    def __init__(self, manager: "Lingo2Manager"):
+        self.manager = manager
+        self.collected_items = {}
+        self.checked_locations = set()
+        self.accessible_locations = set()
+
+    def setup_slot(self, slot_data):
+        Lingo2World.for_tracker = True
+
+        self.multiworld = MultiWorld(players=PLAYER_NUM)
+        self.world = Lingo2World(self.multiworld, PLAYER_NUM)
+        self.multiworld.worlds[1] = self.world
+        self.world.options = Lingo2Options(**{k: t(slot_data.get(k, t.default))
+                                              for k, t in Lingo2Options.type_hints.items()})
+
+        self.world.generate_early()
+        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()}
+            connect_ports_from_ut(port_pairings, self.world)
+
+        self.refresh_state()
+
+    def set_checked_locations(self, checked_locations: set[int]):
+        self.checked_locations = checked_locations.copy()
+
+    def set_collected_items(self, network_items: list[NetworkItem]):
+        self.collected_items = {}
+
+        for item in network_items:
+            self.collected_items[item.item] = self.collected_items.get(item.item, 0) + 1
+
+        self.refresh_state()
+
+    def refresh_state(self):
+        self.state = CollectionState(self.multiworld)
+
+        for item_id, item_amount in self.collected_items.items():
+            for i in range(item_amount):
+                self.state.collect(Lingo2Item(Lingo2World.static_logic.item_id_to_name.get(item_id),
+                                              ItemClassification.progression, item_id, PLAYER_NUM), prevent_sweep=True)
+
+        for k, v in self.manager.keyboard.items():
+            # Unless all level 1 letters are pre-unlocked, H1 I1 N1 and T1 act differently between the generator and
+            # game. The generator considers them to be unlocked, which means they are not included in logic
+            # requirements, and only one item/event is needed to unlock their level 2 forms. The game considers them to
+            # be vanilla, which means you still have to pick them up in the Starting Room in order for them to appear on
+            # your keyboard. This also means that whether or not you have the level 1 forms should be synced to the
+            # multiworld. The tracker specifically should collect one fewer item for these letters in this scenario.
+            tv = v
+            if k in "hint" and self.world.options.shuffle_letters in [ShuffleLetters.option_vanilla,
+                                                                      ShuffleLetters.option_progressive]:
+                tv = max(0, v - 1)
+
+            if tv > 0:
+                for i in range(tv):
+                    self.state.collect(Lingo2Item(k.upper(), ItemClassification.progression, None, PLAYER_NUM),
+                                       prevent_sweep=True)
+
+        self.state.sweep_for_advancements()
+
+        self.accessible_locations = set()
+
+        for region in self.state.reachable_regions[PLAYER_NUM]:
+            for location in region.locations:
+                if location.address not in self.checked_locations and location.access_rule(self.state):
+                    if location.address is not None:
+                        self.accessible_locations.add(location.address)