11 files changed, 511 insertions, 79 deletions

@@ -5,10 +5,10 @@ var SCRIPT_effects
 var SCRIPT_location
 var SCRIPT_multiplayer
 var SCRIPT_mypainting
-var SCRIPT_notifier
 var SCRIPT_panel
 var SCRIPT_pilgrimage_terminator
 var SCRIPT_textclient
+var SCRIPT_tracker
 var SCRIPT_uuid
 
 var ap_server = ""
@@ -19,12 +19,12 @@ var enable_multiplayer = false
 var track_player = false
 var connection_history = []
 
-const my_version = "4.2.0"
-const ap_version = {"major": 0, "minor": 5, "build": 0, "class": "Version"}
+const my_version = "5.4.0"
+const ap_version = {"major": 0, "minor": 5, "build": 1, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
 ]
-const progressive_items = {
+const door_progressive_items = {
         "Progressive Orange Tower":
         ["Second Floor", "Third Floor", "Fourth Floor", "Fifth Floor", "Sixth Floor", "Seventh Floor"],
         "Progressive Art Gallery":
@@ -36,6 +36,15 @@ const progressive_items = {
         "Progressive Pilgrimage":
         ["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"]
 }
+const panel_progressive_items = {
+        "Progressive Hallway Room": ["First Door", "Second Door", "Third Door", "Fourth Door"],
+        "Progressive Colorful":
+        ["White", "Black", "Red", "Yellow", "Blue", "Purple", "Orange", "Green", "Brown", "Gray"],
+        "Progressive Number Hunt":
+        ["Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Zero"],
+        "Progressive Symmetry Room": ["Near Far", "Warts Straw", "Leaf Feel"],
+        "Progressive Suits Area": ["Words Sword", "Lost", "Amen Name"]
+}
 
 const kTHE_END = 0
 const kTHE_MASTER = 1
@@ -90,6 +99,7 @@ var _localdata_file = ""
 var _death_link = false
 var _victory_condition = 0  # THE END, THE MASTER, LEVEL 2
 var _door_shuffle = false
+var _panel_door_shuffle = false
 var _color_shuffle = false
 var _panel_shuffle = 0  # none, rearrange
 var _painting_shuffle = false
@@ -121,6 +131,17 @@ var _cached_atbash = 0
 var _cached_speed_boosts = 0
 var _geronimo_skip = false
 var _checked_paintings = []
+var _hints_key = ""
+var _hinted_locations = []
+var _batch_messages = false
+var _held_messages = {}
+var _held_panels = []
+var _held_synced_panels = []
+var _solved_panels = []
+
+var _panelsBySolveIndex = {}
+const kPANEL_BITFIELDS = 17  # 800 / 48
+const kPANEL_BITFIELD_LENGTH = 48
 
 signal could_not_connect
 signal connect_status
@@ -176,6 +197,8 @@ func _reset_state():
         _authenticated = false
         _map_loaded = false
         _try_wss = false
+        _panelsBySolveIndex = {}
+        _solved_panels = []
 
 
 func _errored():
@@ -278,9 +301,15 @@ func _on_data():
                                 _color_shuffle = _slot_data["shuffle_colors"]
 
                         if _slot_data.has("shuffle_doors"):
-                                _door_shuffle = (_slot_data["shuffle_doors"] > 0)
+                                if _slot_data.has("group_doors"):
+                                        _door_shuffle = (_slot_data["shuffle_doors"] == 2)
+                                        _panel_door_shuffle = (_slot_data["shuffle_doors"] == 1)
+                                else:
+                                        _door_shuffle = (_slot_data["shuffle_doors"] > 0)
+                                        _panel_door_shuffle = false
                         else:
                                 _door_shuffle = false
+                                _panel_door_shuffle = false
 
                         if _slot_data.has("shuffle_paintings"):
                                 _painting_shuffle = _slot_data["shuffle_paintings"]
@@ -391,17 +420,33 @@ func _on_data():
 
                         requestSync()
 
-                        sendMessage(
-                                [
-                                        {
-                                                "cmd": "Set",
-                                                "key": "Lingo_%d_Paintings" % [_slot],
-                                                "default": [],
-                                                "want_reply": true,
-                                                "operations": [{"operation": "default", "value": []}]
-                                        }
-                                ]
-                        )
+                        _hints_key = "_read_hints_%d_%d" % [_team, _slot]
+
+                        var cmds = [
+                                {
+                                        "cmd": "Set",
+                                        "key": "Lingo_%d_Paintings" % [_slot],
+                                        "default": [],
+                                        "want_reply": true,
+                                        "operations": [{"operation": "default", "value": []}]
+                                },
+                                {"cmd": "Get", "keys": [_hints_key]}
+                        ]
+                        
+                        var set_notifies = [_hints_key]
+                        for k in range(0, kPANEL_BITFIELDS):
+                                var panel_key = "Lingo_%d_Panels_%d" % [_slot, k]
+                                set_notifies.append(panel_key)
+                                cmds.append({
+                                        "cmd": "Set",
+                                        "key": panel_key,
+                                        "default": 0,
+                                        "operations": [{"operation": "default", "value": 0}]
+                                })
+
+                        cmds.append({"cmd": "SetNotify", "keys": set_notifies})
+
+                        sendMessage(cmds)
 
                         emit_signal("client_connected")
 
@@ -500,9 +545,12 @@ func _on_data():
                                         )
                         else:
                                 if message["receiving"] != _slot:
-                                        messages.showMessage(
+                                        var sentMsg = (
                                                 "Sent [color=%s]%s[/color] to %s" % [item_color, item_name, player_name]
                                         )
+                                        if _hinted_locations.has(message["item"]["location"]):
+                                                sentMsg += " ([color=#fafad2]Hinted![/color])"
+                                        messages.showMessage(sentMsg)
 
                 elif cmd == "Bounced":
                         if (
@@ -523,8 +571,22 @@ func _on_data():
                                 get_tree().get_root().get_node("Spatial/player/pause_menu")._reload()
 
                 elif cmd == "SetReply":
-                        if message.has("key") and message["key"] == ("Lingo_%d_Paintings" % _slot):
-                                _checked_paintings = message["value"]
+                        if message.has("key"):
+                                if message["key"] == ("Lingo_%d_Paintings" % _slot):
+                                        _checked_paintings = message["value"]
+                                elif message["key"] == _hints_key:
+                                        parseHints(message["value"])
+                                elif message["key"].begins_with("Lingo_%d_Panels_" % _slot):
+                                        var key_index = int(message["key"].substr(("Lingo_%d_Panels_" % _slot).length()))
+                                        var field_value = int(message["value"])
+                                        for k in range(0, kPANEL_BITFIELD_LENGTH):
+                                                if field_value & (1 << k) != 0:
+                                                        var panel_index = key_index * kPANEL_BITFIELD_LENGTH + k
+                                                        syncSolvedPanel(panel_index)
+
+                elif cmd == "Retrieved":
+                        if message.has("keys") and message["keys"].has(_hints_key):
+                                parseHints(message["keys"][_hints_key])
 
 
 func _process(_delta):
@@ -715,14 +777,53 @@ func mapFinishedLoading():
                 _has_colors = ["white"]
                 emit_signal("evaluate_solvability")
 
+                messages.showMessage("Press TAB to open the text client.")
+
+                _held_messages.clear()
+                _batch_messages = true
                 for item in _held_items:
                         processItem(item["item"], item["index"], item["from"], item["flags"])
+                _batch_messages = false
+
+                for item_name in _held_messages:
+                        if _held_messages[item_name][1].size() > 1:
+                                messages.showMessage(
+                                        (
+                                                "Received [color=%s]%s[/color] (x%d)"
+                                                % [
+                                                        _held_messages[item_name][0],
+                                                        item_name,
+                                                        _held_messages[item_name][1].size()
+                                                ]
+                                        )
+                                )
+                        else:
+                                messages.showMessage(_held_messages[item_name][1][0])
 
                 sendMessage([{"cmd": "LocationChecks", "locations": _held_locations}])
 
+                var panel_data = []
+                for k in range(0, kPANEL_BITFIELDS):
+                        panel_data.append(0)
+                
+                for panel_index in _held_panels:
+                        var key_index = panel_index / kPANEL_BITFIELD_LENGTH
+                        var field_slot = panel_index % kPANEL_BITFIELD_LENGTH
+                        panel_data[key_index] = panel_data[key_index] | (1 << field_slot)
+
+                for k in range(0, kPANEL_BITFIELDS):
+                        if panel_data[k] != 0:
+                                setValue("Panels_%d" % k, panel_data[k], "or")
+
                 _map_loaded = true
+
+                for synced in _held_synced_panels:
+                        syncSolvedPanel(synced)
+
                 _held_items = []
                 _held_locations = []
+                _held_panels = []
+                _held_synced_panels = []
 
 
 func processItem(item, index, from, flags):
@@ -745,6 +846,18 @@ func processItem(item, index, from, flags):
                 for door_id in gamedata.door_ids_by_item_id[int(item)]:
                         doorsNode.get_node(door_id).openDoor()
 
+        if gamedata.panel_ids_by_item_id.has(int(item)):
+                var panel_ids = gamedata.panel_ids_by_item_id[int(item)]
+                if wasGeneratedOnVersion(0, 5, 1):
+                        var extradata = get_node("Extradata")
+                        if extradata.panels_mode_051_panel_fixes.has(int(item)):
+                                panel_ids = extradata.panels_mode_051_panel_fixes[int(item)]
+
+                var panelsNode = get_tree().get_root().get_node("Spatial/Panels")
+                for panel_id in panel_ids:
+                        panelsNode.get_node(panel_id).get_node("AP_Panel").locked = false
+                emit_signal("evaluate_solvability")
+
         if gamedata.painting_ids_by_item_id.has(int(item)):
                 var real_parent_node = get_tree().get_root().get_node("Spatial/Decorations/Paintings")
                 var fake_parent_node = get_tree().get_root().get_node_or_null("Spatial/AP_Paintings")
@@ -765,19 +878,38 @@ func processItem(item, index, from, flags):
                         warpsNode.get_node(warp_id).unlock_warp()
 
         # Handle progressive items.
-        if int(item) in gamedata.items_by_progressive_id.keys():
+        var is_progressive_door = int(item) in gamedata.door_items_by_progressive_id
+        var is_progressive_panel = int(item) in gamedata.panel_items_by_progressive_id
+        var progitems = null
+        var prognames = null
+
+        if is_progressive_door and is_progressive_panel:
+                if _door_shuffle:
+                        progitems = gamedata.door_items_by_progressive_id[int(item)]
+                        prognames = door_progressive_items
+                else:
+                        progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                        prognames = panel_progressive_items
+        elif is_progressive_door:
+                progitems = gamedata.door_items_by_progressive_id[int(item)]
+                prognames = door_progressive_items
+        elif is_progressive_panel:
+                progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                prognames = panel_progressive_items
+
+        if progitems != null:
                 if not int(item) in _progressive_progress:
                         _progressive_progress[int(item)] = 0
 
-                if _progressive_progress[int(item)] < gamedata.items_by_progressive_id[int(item)].size():
-                        var subitems = gamedata.items_by_progressive_id[int(item)]
-                        var subitem_id = subitems[_progressive_progress[int(item)]]
+                if _progressive_progress[int(item)] < progitems.size():
+                        var subitem_id = progitems[_progressive_progress[int(item)]]
                         global._print("Subitem: %d" % subitem_id)
                         processItem(subitem_id, null, null, null)
+                        item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]]
                         _progressive_progress[int(item)] += 1
 
-        if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][item]):
-                var lcol = _item_id_to_name["Lingo"][item].to_lower()
+        if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][float(item)]):
+                var lcol = _item_id_to_name["Lingo"][float(item)].to_lower()
                 if not _has_colors.has(lcol):
                         _has_colors.append(lcol)
                         emit_signal("evaluate_solvability")
@@ -787,31 +919,36 @@ func processItem(item, index, from, flags):
                 _last_new_item = index
                 saveLocaldata()
 
-                if item_name in progressive_items:
-                        var subitem = progressive_items[item_name][_progressive_progress[int(item)] - 1]
-                        item_name += " (%s)" % subitem
-
                 var player_name = "Unknown"
                 if _player_name_by_slot.has(from):
                         player_name = _player_name_by_slot[from]
 
                 var item_color = colorForItemType(flags)
 
+                var message
                 if from == _slot:
-                        messages.showMessage("Found [color=%s]%s[/color]" % [item_color, item_name])
+                        message = "Found [color=%s]%s[/color]" % [item_color, item_name]
                 else:
-                        messages.showMessage(
-                                "Received [color=%s]%s[/color] from %s" % [item_color, item_name, player_name]
-                        )
+                        message = "Received [color=%s]%s[/color] from %s" % [item_color, item_name, player_name]
+
+                global._print(message)
+
+                if _batch_messages:
+                        if _held_messages.has(item_name):
+                                _held_messages[item_name][1].append(message)
+                        else:
+                                _held_messages[item_name] = [item_color, [message]]
+                else:
+                        messages.showMessage(message)
 
                 var effects_node = get_tree().get_root().get_node("Spatial/AP_Effects")
-                if item_name == "Slowness Trap":
+                if item_name == "Slowness Trap" and !_speed_boost_mode:
                         effects_node.trigger_slowness_trap()
                 if item_name == "Iceland Trap":
                         effects_node.trigger_iceland_trap()
                 if item_name == "Atbash Trap":
                         effects_node.trigger_atbash_trap()
-                if item_name == "Speed Boost":
+                if item_name == "Speed Boost" and _speed_boost_mode:
                         effects_node.trigger_speed_boost()
                 if item_name == "Puzzle Skip":
                         _puzzle_skips += 1
@@ -819,6 +956,24 @@ func processItem(item, index, from, flags):
                         saveLocaldata()
 
 
+func syncSolvedPanel(panel_index):
+        if _solved_panels.has(panel_index):
+                return
+
+        if _map_loaded:
+                var panel_name = _panelsBySolveIndex[panel_index]
+                global._print("Synced solved panel %d: %s" % [panel_index, panel_name])
+
+                if !panel_name.begins_with("EndPanel"):
+                        var the_panel = get_tree().get_root().get_node("Spatial/Panels").get_node(panel_name)
+
+                        if !the_panel.is_complete:
+                                the_panel.get_node("AP_Panel").solved_remotely = true
+                                the_panel.get_node("Viewport/GUI/Panel/TextEdit").complete()
+        else:
+                _held_synced_panels.append(panel_index)
+
+
 func doorIsVanilla(door):
         return !$Gamedata.mentioned_doors.has(door)
 
@@ -863,10 +1018,35 @@ func checkPainting(painting_id):
         setValue("Paintings", [painting_id], "add")
 
 
+func solvePanel(panel_index, solved_remotely=false):
+        _solved_panels.append(panel_index)
+        
+        if solved_remotely:
+                return
+
+        if _map_loaded:
+                var key_index = panel_index / kPANEL_BITFIELD_LENGTH
+                var field_slot = panel_index % kPANEL_BITFIELD_LENGTH
+                setValue("Panels_%d" % key_index, 1 << field_slot, "or")
+        else:
+                _held_panels.append(panel_index)
+
+
+func parseHints(hints):
+        _hinted_locations.clear()
+
+        for hint in hints:
+                if hint["finding_player"] == int(_slot):
+                        _hinted_locations.append(hint["location"])
+
+
 func colorForItemType(flags):
         var int_flags = int(flags)
         if int_flags & 1:  # progression
-                return "#bc51e0"
+                if int_flags & 2: # proguseful
+                        return "#f0d200"
+                else:
+                        return "#bc51e0"
         elif int_flags & 2:  # useful
                 return "#2b67ff"
         elif int_flags & 4:  # trap
@@ -928,3 +1108,11 @@ func compareVersion(lhs, rhs):
 
 func wasGeneratedBeforeVersion(major, minor, build):
         return compareVersion(_gen_version, {"major": major, "minor": minor, "build": build})
+
+
+func wasGeneratedOnVersion(major, minor, build):
+        return (
+                _gen_version["major"] == major
+                and _gen_version["minor"] == minor
+                and _gen_version["build"] == build
+        )
@@ -93,3 +93,102 @@ var proxies = {
         "Open Areas/Panel_rise_horizon": ["Open Areas/Panel_son_horizon"],
         "Open Areas/Panel_son_sunrise": ["Open Areas/Panel_rise_sunrise"]
 }
+
+var panels_mode_051_panel_fixes = {
+        444647:
+        [
+                "Backside Room/Panel_three_three",
+                "Backside Room/Panel_three_three_2",
+                "Backside Room/Panel_three_three_3",
+                "Backside Room/Panel_four_four_3",
+                "Backside Room/Panel_four_four_2",
+                "Backside Room/Panel_four_four_4"
+        ],
+        444648:
+        [
+                "Backside Room/Panel_four_four",
+                "Backside Room/Panel_five_five_5",
+                "Backside Room/Panel_five_five_4"
+        ],
+        444649:
+        [
+                "Backside Room/Panel_five_five",
+                "Backside Room/Panel_five_five_3",
+                "Backside Room/Panel_five_five_2",
+                "Backside Room/Panel_six_six_4"
+        ],
+        444650:
+        [
+                "Backside Room/Panel_six_six",
+                "Backside Room/Panel_six_six_3",
+                "Backside Room/Panel_six_six_2",
+                "Backside Room/Panel_six_six_5",
+                "Backside Room/Panel_six_six_6",
+                "Backside Room/Panel_seven_seven_5",
+                "Backside Room/Panel_seven_seven_6"
+        ],
+        444651:
+        [
+                "Backside Room/Panel_seven_seven",
+                "Backside Room/Panel_seven_seven_2",
+                "Backside Room/Panel_seven_seven_7",
+                "Backside Room/Panel_seven_seven_3",
+                "Backside Room/Panel_seven_seven_4",
+                "Backside Room/Panel_eight_eight_8",
+                "Backside Room/Panel_eight_eight_5",
+                "Backside Room/Panel_eight_eight_3",
+                "Backside Room/Panel_eight_eight_7"
+        ],
+        444652:
+        [
+                "Backside Room/Panel_eight_eight",
+                "Backside Room/Panel_eight_eight_2",
+                "Backside Room/Panel_eight_eight_4",
+                "Backside Room/Panel_eight_eight_6",
+                "Backside Room/Panel_nine_nine_3",
+                "Backside Room/Panel_nine_nine_8",
+                "Backside Room/Panel_nine_nine_4",
+                "Backside Room/Panel_nine_nine_5",
+                "Backside Room/Panel_nine_nine_2"
+        ],
+        444653:
+        [
+                "Backside Room/Panel_nine_nine",
+                "Backside Room/Panel_nine_nine_6",
+                "Backside Room/Panel_nine_nine_8",
+                "Backside Room/Panel_nine_nine_9",
+                "Backside Room/Panel_nine_nine_7"
+        ]
+}
+
+var panels_mode_051_door_fixes = {
+        "Door_four_hider": ["Door_four_hider_3", "Door_four_hider_4", "Door_four_hider_2"],
+        "Door_five_hider": ["Door_five_hider_4", "Door_five_hider_5"],
+        "Door_six_hider": ["Door_six_hider_4"],
+        "Door_seven_hider": ["Door_seven_hider_6", "Door_seven_hider_5"],
+        "Door_eight_hider":
+        ["Door_eight_hider_7", "Door_eight_hider_8", "Door_eight_hider_3", "Door_eight_hider_5"],
+        "Door_nine_hider":
+        [
+                "Door_nine_hider_3",
+                "Door_nine_hider_8",
+                "Door_nine_hider_4",
+                "Door_nine_hider_5",
+                "Door_nine_hider_2"
+        ]
+}
+
+var pilgrimage_061_painting_fixes = [
+        "outside2",
+        "outside_2",
+        "outside_3",
+        "outside_4",
+        "north2",
+        "south2",
+        "west2",
+        "east_enter",
+        "owl_painting_4",
+        "garden_painting",
+        "yinyang_painting",
+        "fruitbowl_painting2"
+]
@@ -120,6 +120,7 @@ func _load():
         new_master_cdp.translation = old_master_cdp.translation
         new_master_cdp.rotation = old_master_cdp.rotation
         get_node("CountdownPanels").add_child(new_master_cdp)
+        old_master_cdp.total = 5000
         old_master_cdp.queue_free()
 
         # Configure AN OTHER WAY.
@@ -513,23 +514,6 @@ func _load():
                 fearless_door.name = "Door_hider_new1"
                 fearless_door.translation.y = 5
                 get_node("Doors/Naps Room Doors").add_child(fearless_door)
-
-        # Set up notifiers for each achievement panel, for the tracker.
-        var notifier_script = apclient.SCRIPT_notifier
-        for panel in gamedata.panels:
-                if "achievement" in panel:
-                        var panel_node = panels_parent.get_node(panel["id"])
-                        var script_instance = notifier_script.new()
-                        script_instance.name = "Achievement_Notifier"
-                        script_instance.key = "Achievement|%s" % panel["achievement"]
-                        panel_node.add_child(script_instance)
-
-                if "hunt" in panel and panel["hunt"] and not (gamedata.classification_by_location_id[panel["loc"]] & apclient._location_classification_bit):
-                        var panel_node = panels_parent.get_node(panel["id"])
-                        var script_instance = notifier_script.new()
-                        script_instance.name = "Hunt_Notifier"
-                        script_instance.key = "Hunt|%d" % panel["loc"]
-                        panel_node.add_child(script_instance)
         
         # Make stack/double puzzles into proxies, unless panelsanity is on.
         if apclient._location_classification_bit != apclient.kCLASSIFICATION_LOCAL_INSANITY:
@@ -551,6 +535,20 @@ func _load():
                                 proxynode.exact_proxy = true
                                 proxynode.request_ready()
                                 oldparent.add_child(proxynode)
+        
+        # If the world was generated on 0.5.1, apply the hotfix for the number hunt doors.
+        if apclient._panel_door_shuffle && apclient.wasGeneratedOnVersion(0, 5, 1):
+                var number_hunt_parent = get_node("Doors/Count Up Room Area Doors")
+                var extradata_051_fix = apclient.get_node("Extradata").panels_mode_051_door_fixes
+                for template_door_path in extradata_051_fix:
+                        var template_door = number_hunt_parent.get_node(template_door_path)
+                        var impacted_doors = extradata_051_fix[template_door_path]
+                        for impacted_door_path in impacted_doors:
+                                var impacted_door = number_hunt_parent.get_node(impacted_door_path)
+                                var copied_door = impacted_door.duplicate()
+                                copied_door.panels = template_door.panels
+                                number_hunt_parent.add_child(copied_door)
+                                impacted_door.queue_free()
 
         # Attach a script to every panel so that we can do things like conditionally
         # disable them.
@@ -564,9 +562,14 @@ func _load():
                 var script_instance = panel_script.new()
                 script_instance.name = "AP_Panel"
                 script_instance.data = panel
+                script_instance.solve_index = panel["solve_index"]
+                if apclient._panel_door_shuffle and gamedata.mentioned_panels.has(panel["id"]):
+                        script_instance.locked = true
                 panel_node.add_child(script_instance)
                 apclient.connect("evaluate_solvability", script_instance, "evaluate_solvability")
 
+                apclient._panelsBySolveIndex[panel["solve_index"]] = panel["id"]
+
         # Hook up the goal panel.
         if apclient._victory_condition == apclient.kTHE_MASTER:
                 var the_master = self.get_node("Panels/Countdown Panels/Panel_master_master")
@@ -676,6 +679,12 @@ func _load():
                 multiplayer_node.ghost_mode = true
                 add_child(multiplayer_node)
         
+        # Create the autotracker node.
+        var autotracker_script = apclient.SCRIPT_tracker
+        var autotracker = autotracker_script.new()
+        autotracker.set_name("AP_Tracker")
+        self.add_child(autotracker)
+        
         # Hook up Geronimo handler.
         $player.connect("player_jumped", apclient, "geronimo")
 
@@ -43,7 +43,7 @@ func _update_lobby_members():
                 var member_id: int = Steam.getLobbyMemberByIndex(active_lobby_id, i)
                 if member_id != player_steam_id and member_id in active_lobby_members:
                         var slot_name = Steam.getLobbyMemberData(active_lobby_id, member_id, "slot_name")
-                        active_lobby_members[member_id].steam_name = slot_name
+                        active_lobby_members[member_id].steam_name = "%s\n%s" % [slot_name, Steam.getFriendPersonaName(member_id)]
 
 
 func say(text):
@@ -1,14 +0,0 @@
-extends Node
-
-var key
-
-
-func _ready():
-        self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").connect(
-                "answer_correct", self, "handle_correct"
-        )
-
-
-func handle_correct():
-        var apclient = global.get_node("Archipelago")
-        apclient.setValue(key, true)
@@ -1,10 +1,26 @@
 extends "res://scripts/painting.gd"
 
-func _looked_at(var body, var painting):
-    ._looked_at(body, painting)
-    
-    if body.is_in_group("player") && (painting.get_name() == self.get_name()):
-        var apclient = global.get_node("Archipelago")
-        if !apclient._pilgrimage_allows_paintings:
-            global.sunwarp = 1
-            body.get_node("pivot/camera/sunwarp_background").visible = false
+var breaks_pilgrimage = false
+
+
+func _ready():
+        var apclient = global.get_node("Archipelago")
+        if !apclient._pilgrimage_allows_paintings:
+                if apclient.wasGeneratedBeforeVersion(0, 6, 2):
+                        var extradata = apclient.get_node("Extradata")
+                        if not extradata.pilgrimage_061_painting_fixes.has(get_name()):
+                                breaks_pilgrimage = true
+                else:
+                        breaks_pilgrimage = true
+
+
+func _looked_at(body, painting):
+        ._looked_at(body, painting)
+
+        if (
+                breaks_pilgrimage
+                and body.is_in_group("player")
+                and (painting.get_name() == self.get_name())
+        ):
+                global.sunwarp = 1
+                body.get_node("pivot/camera/sunwarp_background").visible = false
@@ -5,6 +5,9 @@ var orig_text = ""
 var atbash_text = ""
 var orig_color = Color(0, 0, 0, 0)
 var solvable = true
+var locked = false
+var solve_index = null
+var solved_remotely = false
 
 const kAtbashPre = "abcdefghijklmnopqrstuvwxyz1234567890+-"
 const kAtbashPost = "zyxwvutsrqponmlkjihgfedcba0987654321-+"
@@ -31,6 +34,10 @@ func answer_correct():
         var effects = get_tree().get_root().get_node("Spatial/AP_Effects")
         effects.deactivate_atbash_trap()
 
+        if solve_index != null:
+                var apclient = global.get_node("Archipelago")
+                apclient.solvePanel(solve_index, solved_remotely)
+
 
 func evaluate_solvability():
         var apclient = global.get_node("Archipelago")
@@ -39,7 +46,9 @@ func evaluate_solvability():
         solvable = true
         var missing = []
 
-        if apclient._color_shuffle:
+        if locked:
+                solvable = false
+        elif apclient._color_shuffle:
                 for color in data["color"]:
                         if not apclient._has_colors.has(color):
                                 missing.append(color)
@@ -52,6 +61,12 @@ func evaluate_solvability():
                         self.get_parent().get_node("Viewport/GUI/Panel/Label").text = orig_text
                 self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").editable = true
                 self.get_parent().get_node("Quad").get_surface_material(0).albedo_color = orig_color
+        elif locked:
+                self.get_parent().get_node("Viewport/GUI/Panel/Label").text = "Locked"
+                self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").editable = false
+                self.get_parent().get_node("Quad").get_surface_material(0).albedo_color = Color(
+                        0.2, 0.7, 0.7
+                )
         else:
                 var missing_text = "Missing: "
                 for thing in missing:
@@ -2,12 +2,16 @@ extends "res://scripts/player.gd"
 
 
 var _oldpos = Vector3(0, -200, 0)
+var _oldpos_fine = Vector3(0, -200, 0)
 
 
 func _ready():
         _oldpos = translation
         _oldpos.y = 0
 
+        _oldpos_fine = translation
+        _oldpos_fine.y = 0
+
         var apclient = global.get_node("Archipelago")
         if apclient.track_player:
                 var tracking_timer = Timer.new()
@@ -17,8 +21,19 @@ func _ready():
                 tracking_timer.connect("timeout", self, "_tick_tracking")
                 tracking_timer.start()
 
+                var tracking_timer_fine = Timer.new()
+                tracking_timer_fine.name = "TrackingTimerFine"
+                tracking_timer_fine.wait_time = 0.5
+                add_child(tracking_timer_fine)
+                tracking_timer_fine.connect("timeout", self, "_tick_tracking_fine")
+                tracking_timer_fine.start()
+
 
 func _tick_tracking():
+        var tracker = get_tree().get_root().get_node("Spatial/AP_Tracker")
+        if tracker.has_connection():
+                return
+
         var newpos = translation
         newpos.y = 0
         
@@ -29,6 +44,20 @@ func _tick_tracking():
                 apclient.setValue("PlayerPos", {"x": int(_oldpos.x), "z": int(_oldpos.z)})
 
 
+func _tick_tracking_fine():
+        var tracker = get_tree().get_root().get_node("Spatial/AP_Tracker")
+        if !tracker.has_connection():
+                return
+
+        var newpos = translation
+        newpos.y = 0
+        
+        if newpos != _oldpos_fine && newpos.distance_to(_oldpos_fine) > 0.5:
+                _oldpos_fine = newpos
+
+                tracker.update_position(int(_oldpos_fine.x), int(_oldpos_fine.z))
+
+
 func _solving():
         ._solving()
 
@@ -28,11 +28,11 @@ func _ready():
                 apclient_instance.SCRIPT_location = load("user://maps/Archipelago/location.gd")
                 apclient_instance.SCRIPT_multiplayer = load("user://maps/Archipelago/multiplayer.gd")
                 apclient_instance.SCRIPT_mypainting = load("user://maps/Archipelago/mypainting.gd")
-                apclient_instance.SCRIPT_notifier = load("user://maps/Archipelago/notifier.gd")
                 apclient_instance.SCRIPT_panel = load("user://maps/Archipelago/panel.gd")
                 var pilg_term = load("user://maps/Archipelago/pilgrimage_terminator.gd")
                 apclient_instance.SCRIPT_pilgrimage_terminator = pilg_term
                 apclient_instance.SCRIPT_textclient = load("user://maps/Archipelago/textclient.gd")
+                apclient_instance.SCRIPT_tracker = load("user://maps/Archipelago/tracker.gd")
                 apclient_instance.SCRIPT_uuid = load("user://maps/Archipelago/vendor/uuid.gd")
 
                 var apdata = ResourceLoader.load("user://maps/Archipelago/gamedata.gd")
@@ -25,6 +25,7 @@ func _ready():
         label.margin_top = 80
         label.margin_bottom = 720
         label.scroll_following = true
+        label.selection_enabled = true
         panel.add_child(label)
 
         var dynamic_font = DynamicFont.new()
@@ -51,7 +52,7 @@ func _ready():
 
 func _input(event):
         if event is InputEventKey and event.pressed:
-                if event.scancode == KEY_TAB:
+                if event.scancode == KEY_TAB and !Input.is_key_pressed(KEY_SHIFT):
                         if !get_tree().paused:
                                 is_open = true
                                 get_tree().paused = true
@@ -0,0 +1,89 @@
+extends Node
+
+var autotracker_port = 41253
+
+var _server = WebSocketServer.new()
+var _peers = []
+
+
+func _ready():
+        _server.bind_ip = "127.0.0.1"
+        _server.connect("client_connected", self, "_connection_established")
+        _server.connect("client_disconnected", self, "_connection_dropped")
+        _server.connect("data_received", self, "_data_received")
+        _server.listen(autotracker_port)
+
+
+func _process(_delta):
+        _server.poll()
+
+
+func _connection_established(id, _protocol):
+        _peers.append(id)
+
+        var apclient = global.get_node("Archipelago")
+
+        var msg = {
+                "cmd": "Connect",
+                "slot":
+                {"server": apclient.ap_server, "player": apclient.ap_user, "password": apclient.ap_pass}
+        }
+
+        var peer = _server.get_peer(id)
+        peer.set_write_mode(WebSocketPeer.WRITE_MODE_TEXT)
+        peer.put_packet(JSON.print(msg).to_utf8())
+
+
+func _connection_dropped(id, _was_clean_close):
+        _peers.erase(id)
+
+
+func _data_received(id):
+        var peer = _server.get_peer(id)
+        peer.set_write_mode(WebSocketPeer.WRITE_MODE_TEXT)
+
+        var packet_text = peer.get_packet().get_string_from_utf8()
+        global._print("Got data from tracker: " + packet_text)
+        var data = JSON.parse(packet_text)
+        if data.error != OK:
+                global._print("Error parsing packet from Tracker: " + data.error_string)
+                return
+
+        var apclient = global.get_node("Archipelago")
+        var msg = data.result
+
+        if msg["cmd"] == "Sync":
+                var resp = {}
+
+                if apclient.track_player:
+                        var player = get_tree().get_root().get_node("Spatial/player")
+                        resp = {
+                                "cmd": "UpdatePosition",
+                                "position": {"x": int(player._oldpos_fine.x), "z": int(player._oldpos_fine.z)}
+                        }
+
+                        peer.put_packet(JSON.print(resp).to_utf8())
+
+
+func _broadcast(msg):
+        var to_remove = []
+        var serialized = JSON.print(msg).to_utf8()
+
+        for peer_id in _peers:
+                if _server.has_peer(peer_id):
+                        var peer = _server.get_peer(peer_id)
+                        peer.set_write_mode(WebSocketPeer.WRITE_MODE_TEXT)
+                        peer.put_packet(serialized)
+                else:
+                        to_remove.append(peer_id)
+
+        for peer_id in to_remove:
+                _peers.erase(peer_id)
+
+
+func has_connection():
+        return _peers.size() > 0
+
+
+func update_position(x, z):
+        _broadcast({"cmd": "UpdatePosition", "position": {"x": x, "z": z}})