33 files changed, 1078 insertions, 468 deletions

@@ -77,7 +77,10 @@ class Lingo2World(World):
         if self.options.shuffle_worldports:
             if hasattr(self.multiworld, "re_gen_passthrough") and "Lingo 2" in self.multiworld.re_gen_passthrough:
                 slot_value = self.multiworld.re_gen_passthrough["Lingo 2"]["port_pairings"]
-                self.port_pairings = {int(fp): int(tp) for fp, tp in slot_value.items()}
+                self.port_pairings = {
+                    self.static_logic.port_id_by_ap_id[int(fp)]: self.static_logic.port_id_by_ap_id[int(tp)]
+                    for fp, tp in slot_value.items()
+                }
 
                 connect_ports_from_ut(self.port_pairings, self)
             else:
@@ -132,7 +135,9 @@ class Lingo2World(World):
             "daedalus_roof_access",
             "enable_gift_maps",
             "enable_icarus",
+            "endings_requirement",
             "keyholder_sanity",
+            "masteries_requirement",
             "shuffle_control_center_colors",
             "shuffle_doors",
             "shuffle_gallery_paintings",
@@ -150,7 +155,11 @@ class Lingo2World(World):
         }
 
         if self.options.shuffle_worldports:
-            slot_data["port_pairings"] = self.port_pairings
+            def get_port_ap_id(port_id):
+                return self.static_logic.objects.ports[port_id].ap_id
+
+            slot_data["port_pairings"] = {get_port_ap_id(from_id): get_port_ap_id(to_id)
+                                          for from_id, to_id in self.port_pairings.items()}
 
         return slot_data
 
@@ -0,0 +1,10 @@
+extends "res://scripts/nodes/allowNumbers.gd"
+
+
+func _readier():
+        var ap = global.get_node("Archipelago")
+        var gamedata = global.get_node("Gamedata")
+
+        var item_id = gamedata.objects.get_special_ids()["Numbers"]
+        if ap.client.getItemAmount(item_id) >= 1:
+                global.allow_numbers = true
@@ -15,6 +15,11 @@ func _get_true_path(path):
                 return "lingo2/client/%s" % path
 
 
+func path_exists(path):
+        var true_path = _get_true_path(path)
+        return apworld_reader.file_exists(true_path)
+
+
 func load_script(path):
         var true_path = _get_true_path(path)
 
@@ -26,6 +26,7 @@ var _accessible_locations = []
 var _accessible_worldports = []
 var _goal_accessible = false
 var _latched_doors = []
+var _hinted_locations = []
 
 signal could_not_connect
 signal connect_status
@@ -38,8 +39,10 @@ signal hint_received(message)
 signal door_latched(id)
 signal accessible_locations_updated
 signal checked_locations_updated
+signal ignored_locations_updated(locations)
 signal checked_worldports_updated
 signal keyboard_update_received
+signal hinted_locations_updated
 
 
 func _init():
@@ -199,6 +202,21 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
 
                                 door_latched.emit(iid)
 
+                elif cmd == "SetIgnoredLocations":
+                        var locs = []
+                        for id in message["locations"]:
+                                locs.append(int(id))
+
+                        ignored_locations_updated.emit(locs)
+
+                elif cmd == "UpdateHintedLocations":
+                        for id in message["locations"]:
+                                var iid = int(id)
+                                if !_hinted_locations.has(iid):
+                                        _hinted_locations.append(iid)
+
+                        hinted_locations_updated.emit()
+
 
 func connectToServer(server, un, pw):
         sendMessage([{"cmd": "Connect", "server": server, "player": un, "password": pw}])
@@ -280,6 +298,14 @@ func getLogicalPath(object_type, object_id):
         sendMessage([msg])
 
 
+func addIgnoredLocation(loc_id):
+        sendMessage([{"cmd": "IgnoreLocation", "id": loc_id}])
+
+
+func removeIgnoredLocation(loc_id):
+        sendMessage([{"cmd": "UnignoreLocation", "id": loc_id}])
+
+
 func sendQuit():
         sendMessage([{"cmd": "Quit"}])
 
@@ -15,6 +15,7 @@ var symbol_item_ids = []
 var anti_trap_ids = {}
 var location_name_by_id = {}
 var ending_display_name_by_name = {}
+var port_id_by_ap_id = {}
 
 var kSYMBOL_ITEMS
 
@@ -99,6 +100,9 @@ func load(data_bytes):
                 var map_data = port_id_by_map_node_path[map.get_name()]
                 map_data[port.get_path()] = port.get_id()
 
+                if port.has_ap_id():
+                        port_id_by_ap_id[port.get_ap_id()] = port.get_id()
+
         for progressive in objects.get_progressives():
                 progressive_id_by_ap_id[progressive.get_ap_id()] = progressive.get_id()
 
@@ -221,7 +225,11 @@ 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():
+        if (
+                door.get_keyholders().size() > 0
+                or (door.has_white_ending() and door.get_white_ending())
+                or door.has_complete_at()
+        ):
                 return null
 
         if door.get_panels().size() > 4:
@@ -6,3 +6,5 @@ func reset():
         var was_removed = ap.keyboard.reset_keyholders()
         if was_removed:
                 sfxPlayer.sfx_play("pickup")
+        
+        ap.client.requestSync()
@@ -191,9 +191,6 @@ func load_keyholders(map):
 
 
 func reset_keyholders():
-        if letters_in_keyholders.is_empty() and letters_blocked.is_empty():
-                return false
-
         var cleared_anything = not letters_in_keyholders.is_empty() or not letters_blocked.is_empty()
 
         if keyholder_state.has(global.map):
@@ -36,6 +36,7 @@ func _ready():
                 global.add_child(ap_instance)
 
                 # Let's also inject any scripts we need to inject now.
+                installScriptExtension(runtime.load_script("allowNumbers.gd"))
                 installScriptExtension(runtime.load_script("animationListener.gd"))
                 installScriptExtension(runtime.load_script("collectable.gd"))
                 installScriptExtension(runtime.load_script("door.gd"))
@@ -50,6 +51,7 @@ func _ready():
                 installScriptExtension(runtime.load_script("saver.gd"))
                 installScriptExtension(runtime.load_script("teleport.gd"))
                 installScriptExtension(runtime.load_script("teleportListener.gd"))
+                installScriptExtension(runtime.load_script("unlockReaderListener.gd"))
                 installScriptExtension(runtime.load_script("visibilityListener.gd"))
                 installScriptExtension(runtime.load_script("worldport.gd"))
                 installScriptExtension(runtime.load_script("worldportListener.gd"))
@@ -83,6 +85,13 @@ func _ready():
                 compass_overlay_instance.SCRIPT_compass = runtime.load_script("compass.gd")
                 global.add_child(compass_overlay_instance)
 
+                unlocks.data["advanced_mastery"] = ""
+                unlocks.data["charismatic_mastery"] = ""
+                unlocks.data["crystalline_mastery"] = ""
+                unlocks.data["fuzzy_mastery"] = ""
+                unlocks.data["icarus_mastery"] = ""
+                unlocks.data["stellar_mastery"] = ""
+
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
         ap.ap_connected.connect(connectionSuccessful)
@@ -237,6 +246,7 @@ func startGame():
                 settings.worldport_fades = "never"
 
         clearResourceCache("res://objects/meshes/gridDoor.tscn")
+        clearResourceCache("res://objects/nodes/allowNumbers.tscn")
         clearResourceCache("res://objects/nodes/collectable.tscn")
         clearResourceCache("res://objects/nodes/door.tscn")
         clearResourceCache("res://objects/nodes/keyHolder.tscn")
@@ -244,6 +254,7 @@ func startGame():
         clearResourceCache("res://objects/nodes/listeners/keyHolderChecker.tscn")
         clearResourceCache("res://objects/nodes/listeners/keyHolderResetterListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/teleportListener.tscn")
+        clearResourceCache("res://objects/nodes/listeners/unlockReaderListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/visibilityListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/worldportListener.tscn")
         clearResourceCache("res://objects/nodes/panel.tscn")
@@ -29,6 +29,8 @@ var _inverse_item_locks = {}
 var _held_letters = {}
 var _letters_setup = false
 var _already_connected = false
+var _ignored_locations = []
+var _map_scripts = {}
 
 const kSHUFFLE_LETTERS_VANILLA = 0
 const kSHUFFLE_LETTERS_UNLOCKED = 1
@@ -65,7 +67,9 @@ var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var enable_gift_maps = []
 var enable_icarus = false
+var endings_requirement = 0
 var keyholder_sanity = false
+var masteries_requirement = 0
 var port_pairings = {}
 var shuffle_control_center_colors = false
 var shuffle_doors = false
@@ -142,6 +146,8 @@ func _ready():
         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.ignored_locations_updated.connect(_on_ignored_locations_updated)
+        client.hinted_locations_updated.connect(_on_hinted_locations_updated)
         client.checked_worldports_updated.connect(_on_checked_worldports_updated)
         client.door_latched.connect(_on_door_latched)
 
@@ -259,6 +265,9 @@ func _process_item(item, amount):
         if item_id == gamedata.objects.get_special_ids()["A Job Well Done"]:
                 update_job_well_done_sign()
 
+        if item_id == gamedata.objects.get_special_ids()["Numbers"] and global.map == "the_fuzzy":
+                global.allow_numbers = true
+
         # Show a message about the item if it's new.
         if int(item["index"]) > _last_new_item:
                 _last_new_item = int(item["index"])
@@ -379,6 +388,20 @@ func _on_checked_worldports_updated():
                 textclient_node.update_worldports()
 
 
+func _on_ignored_locations_updated(locations):
+        _ignored_locations = locations
+
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
+func _on_hinted_locations_updated():
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
 func _on_door_latched(door_id):
         var gamedata = global.get_node("Gamedata")
         if gamedata.get_door_map_name(door_id) != global.map:
@@ -443,7 +466,9 @@ func _client_connected(slot_data):
         daedalus_roof_access = bool(slot_data.get("daedalus_roof_access", false))
         enable_gift_maps = slot_data.get("enable_gift_maps", [])
         enable_icarus = bool(slot_data.get("enable_icarus", false))
+        endings_requirement = int(slot_data.get("endings_requirement", 0))
         keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
+        masteries_requirement = int(slot_data.get("masteries_requirement", 0))
         shuffle_control_center_colors = bool(slot_data.get("shuffle_control_center_colors", false))
         shuffle_doors = bool(slot_data.get("shuffle_doors", false))
         shuffle_gallery_paintings = bool(slot_data.get("shuffle_gallery_paintings", false))
@@ -465,7 +490,9 @@ func _client_connected(slot_data):
                 var raw_pp = slot_data.get("port_pairings")
 
                 for p1 in raw_pp.keys():
-                        port_pairings[int(p1)] = int(raw_pp[p1])
+                        port_pairings[gamedata.port_id_by_ap_id[int(p1)]] = gamedata.port_id_by_ap_id[int(
+                                raw_pp[p1]
+                        )]
 
         # Set up item locks.
         _item_locks = {}
@@ -668,3 +695,23 @@ func update_job_well_done_sign():
 
                 sign2.get_node("MeshInstance3D").mesh.text = sign2.text
                 sign3.get_node("MeshInstance3D").mesh.text = sign3.text
+
+
+func toggle_ignored_location(loc_id):
+        if loc_id in _ignored_locations:
+                client.removeIgnoredLocation(loc_id)
+        else:
+                client.addIgnoredLocation(loc_id)
+
+
+func get_map_script(map_name):
+        if !_map_scripts.has(map_name):
+                var runtime = global.get_node("Runtime")
+                var script_path = "maps/%s.gd" % map_name
+                if runtime.path_exists(script_path):
+                        var script = runtime.load_script(script_path)
+                        _map_scripts[map_name] = script.new()
+                else:
+                        _map_scripts[map_name] = null
+
+        return _map_scripts[map_name]
@@ -0,0 +1,85 @@
+func on_map_load(root):
+        var ap = global.get_node("Archipelago")
+
+        # Remove the door blocking the trophy case.
+        root.get_node("/root/scene/Components/Doors/entry_18").queue_free()
+
+        # Set up mastery listeners for extra maps.
+        _set_up_mastery_listener(root, "advanced")
+        _set_up_mastery_listener(root, "charismatic")
+        _set_up_mastery_listener(root, "crystalline")
+        _set_up_mastery_listener(root, "fuzzy")
+        _set_up_mastery_listener(root, "icarus")
+        _set_up_mastery_listener(root, "stellar")
+
+        if ap.endings_requirement != 12 or ap.masteries_requirement != 0:
+                # Set up listeners for the potential White Ending requirements.
+                var merging_prefab = preload("res://objects/nodes/listeners/mergingListener.tscn")
+
+                var old_door = root.get_node("/root/scene/Components/Doors/entry_19")
+                var new_door = old_door.duplicate()
+                new_door.name = "entry_19_new"
+                new_door.senders.clear()
+                new_door.senderGroup.clear()
+                new_door.excludeSenders.clear()
+
+                if ap.endings_requirement == 12:
+                        new_door.senderGroup.append(NodePath("/root/scene/Meshes/Trophies/Listeners"))
+                elif ap.endings_requirement > 0:
+                        if ap.masteries_requirement == 0:
+                                new_door.senderGroup.append(NodePath("/root/scene/Meshes/Trophies/Listeners"))
+                                new_door.complete_at = ap.endings_requirement
+                        else:
+                                var endings_merge = merging_prefab.instantiate()
+                                endings_merge.name = "EndingsMerge"
+                                endings_merge.senderGroup.append(NodePath("/root/scene/Meshes/Trophies/Listeners"))
+                                endings_merge.complete_at = ap.endings_requirement
+                                root.get_node("/root/scene/Components").add_child.call_deferred(endings_merge)
+                                new_door.senders.append(NodePath("/root/scene/Components/EndingsMerge"))
+
+                var max_masteries = 13 + ap.enable_gift_maps.size()
+                if ap.enable_icarus:
+                        max_masteries += 1
+
+                if ap.masteries_requirement == max_masteries:
+                        new_door.senderGroup.append(NodePath("/root/scene/Meshes/Trophies/MasteryListeners"))
+                        new_door.excludeSenders.append(
+                                NodePath("/root/scene/Meshes/Trophies/MasteryListeners/unlockReaderListenerWhite")
+                        )
+                elif ap.masteries_requirement > 0:
+                        if ap.endings_requirement == 0:
+                                new_door.senderGroup.append(
+                                        NodePath("/root/scene/Meshes/Trophies/MasteryListeners")
+                                )
+                                new_door.excludeSenders.append(
+                                        NodePath(
+                                                "/root/scene/Meshes/Trophies/MasteryListeners/unlockReaderListenerWhite"
+                                        )
+                                )
+                                new_door.complete_at = ap.masteries_requirement
+                        else:
+                                var masteries_merge = merging_prefab.instantiate()
+                                masteries_merge.name = "MasteriesMerge"
+                                masteries_merge.senderGroup.append(
+                                        NodePath("/root/scene/Meshes/Trophies/MasteryListeners")
+                                )
+                                masteries_merge.excludeSenders.append(
+                                        NodePath(
+                                                "/root/scene/Meshes/Trophies/MasteryListeners/unlockReaderListenerWhite"
+                                        )
+                                )
+                                masteries_merge.complete_at = ap.masteries_requirement
+                                root.get_node("/root/scene/Components").add_child.call_deferred(masteries_merge)
+                                new_door.senders.append(NodePath("/root/scene/Components/MasteriesMerge"))
+
+                old_door.queue_free()
+                root.get_node("/root/scene/Components/Doors").add_child.call_deferred(new_door)
+
+
+func _set_up_mastery_listener(root, name):
+        var prefab = preload("res://objects/nodes/listeners/unlockReaderListener.tscn")
+        var url = prefab.instantiate()
+        url.name = "unlockReaderListenerMastery_%s" % name
+        url.key = "%s_mastery" % name
+        url.value = "unlocked"
+        root.get_node("/root/scene/Meshes/Trophies/MasteryListeners").add_child.call_deferred(url)
@@ -0,0 +1,85 @@
+func on_map_load(root):
+        var ap = global.get_node("Archipelago")
+
+        # Teleport the direction panels when the stairs are there.
+        var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+
+        var dir1 = root.get_node("/root/scene/Panels/Castle Entrance/castle_direction_1")
+        var dir1_tpl = tpl_prefab.instantiate()
+        dir1_tpl.target_path = dir1
+        dir1_tpl.teleport_point = Vector3(59.5, 8, -6.5)
+        dir1_tpl.teleport_rotate = Vector3(-45, 0, 0)
+        dir1_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_south"))
+        dir1_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_north"))
+        dir1_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_west"))
+        dir1.add_child.call_deferred(dir1_tpl)
+
+        var dir2 = root.get_node("/root/scene/Panels/Castle Entrance/castle_direction_2")
+        var dir2_tpl = tpl_prefab.instantiate()
+        dir2_tpl.target_path = dir2
+        dir2_tpl.teleport_point = Vector3(59.5, 8, 6.5)
+        dir2_tpl.teleport_rotate = Vector3(-45, -180, 0)
+        dir2_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_south"))
+        dir2_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_north"))
+        dir2_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_west"))
+        dir2.add_child.call_deferred(dir2_tpl)
+
+        var dir3 = root.get_node("/root/scene/Panels/Castle Entrance/castle_direction_3")
+        var dir3_tpl = tpl_prefab.instantiate()
+        dir3_tpl.target_path = dir3
+        dir3_tpl.teleport_point = Vector3(54, 8, 0)
+        dir3_tpl.teleport_rotate = Vector3(-45, 90, 0)
+        dir3_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_south"))
+        dir3_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_north"))
+        dir3_tpl.senders.append(NodePath("/root/scene/Panels/Castle Entrance/castle_west"))
+        dir3.add_child.call_deferred(dir3_tpl)
+
+        # Block off roof access in Daedalus.
+        if not ap.daedalus_roof_access:
+                _set_up_invis_wall(root, 75.5, 11, -24.5, 1, 10, 49)
+                _set_up_invis_wall(root, 51.5, 11, -17, 16, 10, 1)
+                _set_up_invis_wall(root, 46, 10, -9.5, 1, 10, 10)
+                _set_up_invis_wall(root, 67.5, 11, 17, 16, 10, 1)
+                _set_up_invis_wall(root, 50.5, 11, 14, 10, 10, 1)
+                _set_up_invis_wall(root, 39, 10, 18.5, 1, 10, 22)
+                _set_up_invis_wall(root, 20, 15, 18.5, 1, 10, 16)
+                _set_up_invis_wall(root, 11.5, 15, 3, 32, 10, 1)
+                _set_up_invis_wall(root, 11.5, 16, -20, 14, 20, 1)
+                _set_up_invis_wall(root, 14, 16, -26.5, 1, 20, 4)
+                _set_up_invis_wall(root, 28.5, 20.5, -26.5, 1, 15, 25)
+                _set_up_invis_wall(root, 40.5, 20.5, -11, 30, 15, 1)
+                _set_up_invis_wall(root, 50.5, 15, 5.5, 7, 10, 1)
+                _set_up_invis_wall(root, 83.5, 33.5, 5.5, 1, 7, 11)
+                _set_up_invis_wall(root, 83.5, 33.5, -5.5, 1, 7, 11)
+
+                var warp_exit_prefab = preload("res://objects/nodes/exit.tscn")
+                var warp_exit = warp_exit_prefab.instantiate()
+                warp_exit.name = "roof_access_blocker_warp_exit"
+                warp_exit.position = Vector3(58, 10, 0)
+                warp_exit.rotation_degrees.y = 90
+                root.get_node("/root/scene").add_child.call_deferred(warp_exit)
+
+                var warp_enter_prefab = preload("res://objects/nodes/teleportAuto.tscn")
+                var warp_enter = warp_enter_prefab.instantiate()
+                warp_enter.target = warp_exit
+                warp_enter.position = Vector3(76.5, 30, 1)
+                warp_enter.scale = Vector3(4, 1.5, 1)
+                warp_enter.rotation_degrees.y = 90
+                root.get_node("/root/scene").add_child.call_deferred(warp_enter)
+
+
+func _set_up_invis_wall(root, x, y, z, sx, sy, sz):
+        var prefab = preload("res://objects/nodes/block.tscn")
+        var newwall = prefab.instantiate()
+        newwall.position.x = x
+        newwall.position.y = y
+        newwall.position.z = z
+        newwall.scale.x = sz
+        newwall.scale.y = sy
+        newwall.scale.z = sx
+        newwall.set_surface_override_material(0, preload("res://assets/materials/blackMatte.material"))
+        newwall.visibility_range_end = 3
+        newwall.visibility_range_end_margin = 1
+        newwall.visibility_range_fade_mode = RenderingServer.VISIBILITY_RANGE_FADE_SELF
+        newwall.skeleton = ".."
+        root.get_node("/root/scene").add_child.call_deferred(newwall)
@@ -0,0 +1,38 @@
+func on_map_load(root):
+        var ap = global.get_node("Archipelago")
+
+        # Add the mastery to Icarus.
+        if ap.enable_icarus:
+                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
+                var saver_prefab = preload("res://objects/nodes/saver.tscn")
+                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+                var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
+
+                var mastery = collectable_prefab.instantiate()
+                mastery.name = "collectable"
+                mastery.position = Vector3(0, -2000, 0)
+                mastery.unlock_type = "smiley"
+                mastery.material_override = load("res://assets/materials/gold.material")
+                root.get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
+
+                var tpl = tpl_prefab.instantiate()
+                tpl.teleport_point = Vector3(56.25, 0, -5.5)
+                tpl.teleport_rotate = Vector3(0, 0, 0)
+                tpl.target_path = mastery
+                tpl.name = "Teleport"
+                tpl.senderGroup.append(NodePath("/root/scene/Panels"))
+                tpl.nested = true
+                mastery.add_child.call_deferred(tpl)
+
+                var usl = usl_prefab.instantiate()
+                usl.name = "unlockSetterListenerMastery"
+                usl.key = "icarus_mastery"
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+                root.get_node("/root/scene/Components").add_child.call_deferred(usl)
+
+                var saver = saver_prefab.instantiate()
+                saver.name = "saver_collectables"
+                saver.type = "collectables"
+                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
+                root.get_node("/root/scene").add_child.call_deferred(saver)
@@ -0,0 +1,36 @@
+func on_map_load(root):
+        # Add the mastery to The Advanced.
+        var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
+        var saver_prefab = preload("res://objects/nodes/saver.tscn")
+        var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+        var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
+
+        var mastery = collectable_prefab.instantiate()
+        mastery.name = "collectable"
+        mastery.position = Vector3(0, -200, -5)
+        mastery.unlock_type = "smiley"
+        mastery.material_override = load("res://assets/materials/gold.material")
+        root.get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
+
+        var tpl = tpl_prefab.instantiate()
+        tpl.teleport_point = Vector3(0, 2, -5)
+        tpl.teleport_rotate = Vector3(0, 0, 0)
+        tpl.target_path = mastery
+        tpl.name = "Teleport"
+        tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_29"))
+        tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_30"))
+        tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_31"))
+        mastery.add_child.call_deferred(tpl)
+
+        var usl = usl_prefab.instantiate()
+        usl.name = "unlockSetterListenerMastery"
+        usl.key = "advanced_mastery"
+        usl.value = "unlocked"
+        usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+        root.get_node("/root/scene/Components").add_child.call_deferred(usl)
+
+        var saver = saver_prefab.instantiate()
+        saver.name = "saver_collectables"
+        saver.type = "collectables"
+        saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
+        root.get_node("/root/scene").add_child.call_deferred(saver)
@@ -0,0 +1,26 @@
+func on_map_load(root):
+        # Add the mastery to The Charismatic.
+        var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
+        var saver_prefab = preload("res://objects/nodes/saver.tscn")
+        var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
+
+        var mastery = collectable_prefab.instantiate()
+        mastery.name = "collectable"
+        mastery.position = Vector3(-17, 2, -29)
+        mastery.rotation_degrees = Vector3(0, 45, 0)
+        mastery.unlock_type = "smiley"
+        mastery.material_override = load("res://assets/materials/gold.material")
+        root.get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
+
+        var usl = usl_prefab.instantiate()
+        usl.name = "unlockSetterListenerMastery"
+        usl.key = "charismatic_mastery"
+        usl.value = "unlocked"
+        usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+        root.get_node("/root/scene/Components").add_child.call_deferred(usl)
+
+        var saver = saver_prefab.instantiate()
+        saver.name = "saver_collectables"
+        saver.type = "collectables"
+        saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
+        root.get_node("/root/scene").add_child.call_deferred(saver)
@@ -0,0 +1,34 @@
+func on_map_load(root):
+        # Add the mastery to The Crystalline.
+        var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
+        var saver_prefab = preload("res://objects/nodes/saver.tscn")
+        var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+        var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
+
+        var mastery = collectable_prefab.instantiate()
+        mastery.name = "collectable"
+        mastery.position = Vector3(0, 13, 37)
+        mastery.unlock_type = "smiley"
+        mastery.material_override = load("res://assets/materials/gold.material")
+        root.get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
+
+        var tpl = tpl_prefab.instantiate()
+        tpl.teleport_point = Vector3(0, 11.5, -20)
+        tpl.teleport_rotate = Vector3(0, 0, 180)
+        tpl.target_path = mastery
+        tpl.name = "Teleport"
+        tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_3"))
+        mastery.add_child.call_deferred(tpl)
+
+        var usl = usl_prefab.instantiate()
+        usl.name = "unlockSetterListenerMastery"
+        usl.key = "crystalline_mastery"
+        usl.value = "unlocked"
+        usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+        root.get_node("/root/scene/Components").add_child.call_deferred(usl)
+
+        var saver = saver_prefab.instantiate()
+        saver.name = "saver_collectables"
+        saver.type = "collectables"
+        saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
+        root.get_node("/root/scene").add_child.call_deferred(saver)
@@ -0,0 +1,156 @@
+func on_map_load(root):
+        var ap = global.get_node("Archipelago")
+
+        # Remove door behind X1.
+        var door_node = root.get_node("/root/scene/Components/Doors/exit_1")
+        door_node.handleTriggered()
+
+        # Display win condition.
+        var sign_prefab = preload("res://objects/nodes/sign.tscn")
+        var sign1 = sign_prefab.instantiate()
+        sign1.position = Vector3(-7, 5, -15.01)
+        sign1.text = "victory"
+        root.get_node("/root/scene").add_child.call_deferred(sign1)
+
+        var sign2 = sign_prefab.instantiate()
+        sign2.position = Vector3(-7, 4, -15.01)
+        sign2.text = "%s ending" % ap.kEndingNameByVictoryValue.get(ap.victory_condition, "?")
+
+        var sign2_color = ap.kEndingNameByVictoryValue.get(ap.victory_condition, "coral").to_lower()
+        if sign2_color == "white":
+                sign2_color = "silver"
+
+        sign2.material = load("res://assets/materials/%s.material" % sign2_color)
+        root.get_node("/root/scene").add_child.call_deferred(sign2)
+
+        # Add the gift map entry panel if needed.
+        if not ap.enable_gift_maps.is_empty():
+                var panel_prefab = preload("res://objects/nodes/panel.tscn")
+                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+                var wpl_prefab = preload("res://objects/nodes/listeners/worldportListener.tscn")
+
+                var giftmap_parent = Node.new()
+                giftmap_parent.name = "GiftMapEntrance"
+                root.get_node("/root/scene/Components").add_child.call_deferred(giftmap_parent)
+
+                var symbolless_player = ""
+                for i in range(ap.client.ap_user.length()):
+                        if "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".contains(
+                                ap.client.ap_user[i]
+                        ):
+                                symbolless_player = symbolless_player + ap.client.ap_user[i].to_lower()
+
+                var giftmap_panel = panel_prefab.instantiate()
+                giftmap_panel.name = "Panel"
+                giftmap_panel.position = Vector3(33.5, -190, 5.5)
+                giftmap_panel.rotation_degrees = Vector3(-45, 0, 0)
+                giftmap_panel.clue = "player"
+                giftmap_panel.answer = symbolless_player
+
+                if ap.enable_gift_maps.has("The Advanced"):
+                        var icely_panel = panel_prefab.instantiate()
+                        icely_panel.name = "IcelyPanel"
+                        icely_panel.answer = "icely"
+                        icely_panel.position = Vector3(33.5, -200, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../IcelyPanel"))
+                        giftmap_parent.add_child.call_deferred(icely_panel)
+
+                        var icely_wpl = wpl_prefab.instantiate()
+                        icely_wpl.name = "IcelyWpl"
+                        icely_wpl.exit = "the_advanced"
+                        icely_wpl.senders.append(NodePath("../IcelyPanel"))
+                        giftmap_parent.add_child.call_deferred(icely_wpl)
+
+                if ap.enable_gift_maps.has("The Charismatic"):
+                        var souvey_panel = panel_prefab.instantiate()
+                        souvey_panel.name = "SouveyPanel"
+                        souvey_panel.answer = "souvey"
+                        souvey_panel.position = Vector3(33.5, -210, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../SouveyPanel"))
+                        giftmap_parent.add_child.call_deferred(souvey_panel)
+
+                        var souvey_wpl = wpl_prefab.instantiate()
+                        souvey_wpl.name = "SouveyWpl"
+                        souvey_wpl.exit = "the_charismatic"
+                        souvey_wpl.senders.append(NodePath("../SouveyPanel"))
+                        giftmap_parent.add_child.call_deferred(souvey_wpl)
+
+                if ap.enable_gift_maps.has("The Crystalline"):
+                        var q_panel = panel_prefab.instantiate()
+                        q_panel.name = "QPanel"
+                        q_panel.answer = "q"
+                        q_panel.position = Vector3(33.5, -220, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../QPanel"))
+                        giftmap_parent.add_child.call_deferred(q_panel)
+
+                        var q_wpl = wpl_prefab.instantiate()
+                        q_wpl.name = "QWpl"
+                        q_wpl.exit = "the_crystalline"
+                        q_wpl.senders.append(NodePath("../QPanel"))
+                        giftmap_parent.add_child.call_deferred(q_wpl)
+
+                if ap.enable_gift_maps.has("The Fuzzy"):
+                        var gongus_panel = panel_prefab.instantiate()
+                        gongus_panel.name = "GongusPanel"
+                        gongus_panel.answer = "gongus"
+                        gongus_panel.position = Vector3(33.5, -260, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../GongusPanel"))
+                        giftmap_parent.add_child.call_deferred(gongus_panel)
+
+                        var kiwi_panel = panel_prefab.instantiate()
+                        kiwi_panel.name = "KiwiPanel"
+                        kiwi_panel.answer = "kiwi"
+                        kiwi_panel.position = Vector3(33.5, -270, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../KiwiPanel"))
+                        giftmap_parent.add_child.call_deferred(kiwi_panel)
+
+                        var fuzzy_wpl = wpl_prefab.instantiate()
+                        fuzzy_wpl.name = "FuzzyWpl"
+                        fuzzy_wpl.exit = "the_fuzzy"
+                        fuzzy_wpl.senders.append(NodePath("../GongusPanel"))
+                        fuzzy_wpl.senders.append(NodePath("../KiwiPanel"))
+                        fuzzy_wpl.complete_at = 1
+                        giftmap_parent.add_child.call_deferred(fuzzy_wpl)
+
+                if ap.enable_gift_maps.has("The Stellar"):
+                        var hatkirby_panel = panel_prefab.instantiate()
+                        hatkirby_panel.name = "HatkirbyPanel"
+                        hatkirby_panel.answer = "hatkirby"
+                        hatkirby_panel.position = Vector3(33.5, -230, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../HatkirbyPanel"))
+                        giftmap_parent.add_child.call_deferred(hatkirby_panel)
+
+                        var kirby_panel = panel_prefab.instantiate()
+                        kirby_panel.name = "KirbyPanel"
+                        kirby_panel.answer = "kirby"
+                        kirby_panel.position = Vector3(33.5, -240, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../KirbyPanel"))
+                        giftmap_parent.add_child.call_deferred(kirby_panel)
+
+                        var star_panel = panel_prefab.instantiate()
+                        star_panel.name = "StarPanel"
+                        star_panel.answer = "star"
+                        star_panel.position = Vector3(33.5, -250, 5.5)
+                        giftmap_panel.proxies.append(NodePath("../StarPanel"))
+                        giftmap_parent.add_child.call_deferred(star_panel)
+
+                        var stellar_wpl = wpl_prefab.instantiate()
+                        stellar_wpl.name = "StellarWpl"
+                        stellar_wpl.exit = "the_stellar"
+                        stellar_wpl.senders.append(NodePath("../HatkirbyPanel"))
+                        stellar_wpl.senders.append(NodePath("../KirbyPanel"))
+                        stellar_wpl.senders.append(NodePath("../StarPanel"))
+                        stellar_wpl.complete_at = 1
+                        giftmap_parent.add_child.call_deferred(stellar_wpl)
+
+                giftmap_parent.add_child.call_deferred(giftmap_panel)
+
+                var giftmap_tpl = tpl_prefab.instantiate()
+                giftmap_tpl.name = "PanelTeleporter"
+                giftmap_tpl.teleport_point = Vector3(33.5, 1, 5.5)
+                giftmap_tpl.teleport_rotate = Vector3(-45, 0, 0)
+                giftmap_tpl.target_path = giftmap_panel
+                giftmap_tpl.senders.append(
+                        NodePath("/root/scene/Components/Listeners/unlockReaderListenerDoubles")
+                )
+                giftmap_parent.add_child.call_deferred(giftmap_tpl)
@@ -0,0 +1,25 @@
+func on_map_load(root):
+        # Add the mastery to The Fuzzy.
+        var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
+        var saver_prefab = preload("res://objects/nodes/saver.tscn")
+        var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
+
+        var mastery = collectable_prefab.instantiate()
+        mastery.name = "collectable"
+        mastery.position = Vector3(0, 2, -20)
+        mastery.unlock_type = "smiley"
+        mastery.material_override = load("res://assets/materials/gold.material")
+        root.get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
+
+        var usl = usl_prefab.instantiate()
+        usl.name = "unlockSetterListenerMastery"
+        usl.key = "fuzzy_mastery"
+        usl.value = "unlocked"
+        usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+        root.get_node("/root/scene/Components").add_child.call_deferred(usl)
+
+        var saver = saver_prefab.instantiate()
+        saver.name = "saver_collectables"
+        saver.type = "collectables"
+        saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
+        root.get_node("/root/scene").add_child.call_deferred(saver)
@@ -0,0 +1,51 @@
+func on_map_load(root):
+        var ap = global.get_node("Archipelago")
+
+        # Add the strict cyan ending validation.
+        if ap.strict_cyan_ending:
+                var panel_prefab = preload("res://objects/nodes/panel.tscn")
+                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+                var reverse_prefab = preload("res://objects/nodes/listeners/reversingListener.tscn")
+
+                var previous_panel = null
+                var next_y = -100
+                var words = ["quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog"]
+                for word in words:
+                        var panel = panel_prefab.instantiate()
+                        panel.position = Vector3(0, next_y, 0)
+                        next_y -= 10
+                        panel.clue = word
+                        panel.symbol = "."
+                        panel.answer = "%s%s" % [word, word]
+                        panel.name = "EndCheck_%s" % word
+
+                        var tpl = tpl_prefab.instantiate()
+                        tpl.teleport_point = Vector3(0, 1, -11)
+                        tpl.teleport_rotate = Vector3(-45, 0, 0)
+                        tpl.target_path = panel
+                        tpl.name = "Teleport"
+
+                        if previous_panel == null:
+                                tpl.senderGroup.append(NodePath("/root/scene/Panels/Rulers"))
+                        else:
+                                tpl.senders.append(NodePath("../../%s" % previous_panel.name))
+
+                        var reversing = reverse_prefab.instantiate()
+                        reversing.senders.append(NodePath(".."))
+                        reversing.name = "Reversing"
+                        tpl.senders.append(NodePath("../Reversing"))
+
+                        panel.add_child.call_deferred(tpl)
+                        panel.add_child.call_deferred(reversing)
+                        root.get_node("/root/scene/Panels").add_child.call_deferred(panel)
+
+                        previous_panel = panel
+
+                # Duplicate the door that usually waits on the rulers. We can't set the
+                # senders here for some reason so we actually set them in the door ready
+                # function.
+                var entry1 = root.get_node("/root/scene/Components/Doors/entry_1")
+                var entry12 = entry1.duplicate()
+                entry12.name = "spe_entry_1"
+                entry1.get_parent().add_child.call_deferred(entry12)
+                entry1.queue_free()
@@ -0,0 +1,4 @@
+func on_map_load(root):
+        # Move the Plaza RTE trigger outside of the turtle.
+        var rte_trigger = root.get_node("/root/scene/Components/Warps/triggerArea")
+        rte_trigger.position.z = 0
@@ -0,0 +1,30 @@
+func on_map_load(root):
+        # Add the mastery to The Stellar.
+        var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
+        var saver_prefab = preload("res://objects/nodes/saver.tscn")
+        var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
+
+        var collectables = Node.new()
+        collectables.name = "Collectables"
+
+        var mastery = collectable_prefab.instantiate()
+        mastery.name = "collectable"
+        mastery.position = Vector3(2, 2, -31)
+        mastery.rotation_degrees = Vector3(0, 90, 0)
+        mastery.unlock_type = "smiley"
+        mastery.material_override = load("res://assets/materials/gold.material")
+        collectables.add_child.call_deferred(mastery)
+        root.get_node("/root/scene/Components").add_child.call_deferred(collectables)
+
+        var usl = usl_prefab.instantiate()
+        usl.name = "unlockSetterListenerMastery"
+        usl.key = "stellar_mastery"
+        usl.value = "unlocked"
+        usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+        root.get_node("/root/scene/Components").add_child.call_deferred(usl)
+
+        var saver = saver_prefab.instantiate()
+        saver.name = "saver_collectables"
+        saver.type = "collectables"
+        saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
+        root.get_node("/root/scene").add_child.call_deferred(saver)
@@ -0,0 +1,56 @@
+func on_map_load(root):
+        var ap = global.get_node("Archipelago")
+
+        # Add the strict purple ending validation.
+        if ap.strict_purple_ending:
+                var panel_prefab = preload("res://objects/nodes/panel.tscn")
+                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+                var reverse_prefab = preload("res://objects/nodes/listeners/reversingListener.tscn")
+
+                var previous_panel = null
+                var next_y = -100
+                var words = ["quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog"]
+                for word in words:
+                        var panel = panel_prefab.instantiate()
+                        panel.position = Vector3(0, next_y, 0)
+                        next_y -= 10
+                        panel.clue = word
+                        panel.symbol = ""
+                        panel.answer = word
+                        panel.name = "EndCheck_%s" % word
+
+                        var tpl = tpl_prefab.instantiate()
+                        tpl.teleport_point = Vector3(0, 1, 0)
+                        tpl.teleport_rotate = Vector3(-45, 180, 0)
+                        tpl.target_path = panel
+                        tpl.name = "Teleport"
+
+                        if previous_panel == null:
+                                tpl.senders.append(NodePath("/root/scene/Panels/End/panel_24"))
+                        else:
+                                tpl.senders.append(NodePath("../../%s" % previous_panel.name))
+
+                        var reversing = reverse_prefab.instantiate()
+                        reversing.senders.append(NodePath(".."))
+                        reversing.name = "Reversing"
+                        tpl.senders.append(NodePath("../Reversing"))
+
+                        panel.add_child.call_deferred(tpl)
+                        panel.add_child.call_deferred(reversing)
+                        root.get_node("/root/scene/Panels").add_child.call_deferred(panel)
+
+                        previous_panel = panel
+
+                # Duplicate the doors that usually wait on EQUINOX. We can't set the senders
+                # here for some reason so we actually set them in the door ready function.
+                var endplat = root.get_node("/root/scene/Components/Doors/EndPlatform")
+                var endplat2 = endplat.duplicate()
+                endplat2.name = "spe_EndPlatform"
+                endplat.get_parent().add_child.call_deferred(endplat2)
+                endplat.queue_free()
+
+                var entry2 = root.get_node("/root/scene/Components/Doors/entry_2")
+                var entry22 = entry2.duplicate()
+                entry22.name = "spe_entry_2"
+                entry2.get_parent().add_child.call_deferred(entry22)
+                entry2.queue_free()
@@ -0,0 +1,4 @@
+func on_map_load(root):
+        # Prevent the COLOR panel from disappearing.
+        var color_tpl = root.get_node("/root/scene/Panels/Assorted/panel_1/teleportListener")
+        color_tpl.target_path = color_tpl
@@ -0,0 +1,5 @@
+func on_map_load(root):
+        # Shrink the painting trigger in The Unyielding.
+        var trigger_area = root.get_node("/root/scene/Components/PaintingUnlocker/triggerArea")
+        trigger_area.position = Vector3(0, 0, -6)
+        trigger_area.scale = Vector3(6, 1, 6)
@@ -19,404 +19,10 @@ func _ready():
 
         ap.start_batching_locations()
 
-        # Block off roof access in Daedalus.
-        if global.map == "daedalus" and not ap.daedalus_roof_access:
-                _set_up_invis_wall(75.5, 11, -24.5, 1, 10, 49)
-                _set_up_invis_wall(51.5, 11, -17, 16, 10, 1)
-                _set_up_invis_wall(46, 10, -9.5, 1, 10, 10)
-                _set_up_invis_wall(67.5, 11, 17, 16, 10, 1)
-                _set_up_invis_wall(50.5, 11, 14, 10, 10, 1)
-                _set_up_invis_wall(39, 10, 18.5, 1, 10, 22)
-                _set_up_invis_wall(20, 15, 18.5, 1, 10, 16)
-                _set_up_invis_wall(11.5, 15, 3, 32, 10, 1)
-                _set_up_invis_wall(11.5, 16, -20, 14, 20, 1)
-                _set_up_invis_wall(14, 16, -26.5, 1, 20, 4)
-                _set_up_invis_wall(28.5, 20.5, -26.5, 1, 15, 25)
-                _set_up_invis_wall(40.5, 20.5, -11, 30, 15, 1)
-                _set_up_invis_wall(50.5, 15, 5.5, 7, 10, 1)
-                _set_up_invis_wall(83.5, 33.5, 5.5, 1, 7, 11)
-                _set_up_invis_wall(83.5, 33.5, -5.5, 1, 7, 11)
-
-                var warp_exit_prefab = preload("res://objects/nodes/exit.tscn")
-                var warp_exit = warp_exit_prefab.instantiate()
-                warp_exit.name = "roof_access_blocker_warp_exit"
-                warp_exit.position = Vector3(58, 10, 0)
-                warp_exit.rotation_degrees.y = 90
-                get_parent().add_child.call_deferred(warp_exit)
-
-                var warp_enter_prefab = preload("res://objects/nodes/teleportAuto.tscn")
-                var warp_enter = warp_enter_prefab.instantiate()
-                warp_enter.target = warp_exit
-                warp_enter.position = Vector3(76.5, 30, 1)
-                warp_enter.scale = Vector3(4, 1.5, 1)
-                warp_enter.rotation_degrees.y = 90
-                get_parent().add_child.call_deferred(warp_enter)
-
-        if global.map == "the_entry":
-                # Remove door behind X1.
-                var door_node = get_tree().get_root().get_node("/root/scene/Components/Doors/exit_1")
-                door_node.handleTriggered()
-
-                # Display win condition.
-                var sign_prefab = preload("res://objects/nodes/sign.tscn")
-                var sign1 = sign_prefab.instantiate()
-                sign1.position = Vector3(-7, 5, -15.01)
-                sign1.text = "victory"
-                get_parent().add_child.call_deferred(sign1)
-
-                var sign2 = sign_prefab.instantiate()
-                sign2.position = Vector3(-7, 4, -15.01)
-                sign2.text = "%s ending" % ap.kEndingNameByVictoryValue.get(ap.victory_condition, "?")
-
-                var sign2_color = ap.kEndingNameByVictoryValue.get(ap.victory_condition, "coral").to_lower()
-                if sign2_color == "white":
-                        sign2_color = "silver"
-
-                sign2.material = load("res://assets/materials/%s.material" % sign2_color)
-                get_parent().add_child.call_deferred(sign2)
-
-                # Add the gift map entry panel if needed.
-                if not ap.enable_gift_maps.is_empty():
-                        var panel_prefab = preload("res://objects/nodes/panel.tscn")
-                        var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-                        var wpl_prefab = preload("res://objects/nodes/listeners/worldportListener.tscn")
-
-                        var giftmap_parent = Node.new()
-                        giftmap_parent.name = "GiftMapEntrance"
-                        get_node("/root/scene/Components").add_child.call_deferred(giftmap_parent)
-
-                        var symbolless_player = ""
-                        for i in range(ap.client.ap_user.length()):
-                                if "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".contains(
-                                        ap.client.ap_user[i]
-                                ):
-                                        symbolless_player = symbolless_player + ap.client.ap_user[i].to_lower()
-
-                        var giftmap_panel = panel_prefab.instantiate()
-                        giftmap_panel.name = "Panel"
-                        giftmap_panel.position = Vector3(33.5, -190, 5.5)
-                        giftmap_panel.rotation_degrees = Vector3(-45, 0, 0)
-                        giftmap_panel.clue = "player"
-                        giftmap_panel.answer = symbolless_player
-
-                        if ap.enable_gift_maps.has("The Advanced"):
-                                var icely_panel = panel_prefab.instantiate()
-                                icely_panel.name = "IcelyPanel"
-                                icely_panel.answer = "icely"
-                                icely_panel.position = Vector3(33.5, -200, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../IcelyPanel"))
-                                giftmap_parent.add_child.call_deferred(icely_panel)
-
-                                var icely_wpl = wpl_prefab.instantiate()
-                                icely_wpl.name = "IcelyWpl"
-                                icely_wpl.exit = "the_advanced"
-                                icely_wpl.senders.append(NodePath("../IcelyPanel"))
-                                giftmap_parent.add_child.call_deferred(icely_wpl)
-
-                        if ap.enable_gift_maps.has("The Charismatic"):
-                                var souvey_panel = panel_prefab.instantiate()
-                                souvey_panel.name = "SouveyPanel"
-                                souvey_panel.answer = "souvey"
-                                souvey_panel.position = Vector3(33.5, -210, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../SouveyPanel"))
-                                giftmap_parent.add_child.call_deferred(souvey_panel)
-
-                                var souvey_wpl = wpl_prefab.instantiate()
-                                souvey_wpl.name = "SouveyWpl"
-                                souvey_wpl.exit = "the_charismatic"
-                                souvey_wpl.senders.append(NodePath("../SouveyPanel"))
-                                giftmap_parent.add_child.call_deferred(souvey_wpl)
-
-                        if ap.enable_gift_maps.has("The Crystalline"):
-                                var q_panel = panel_prefab.instantiate()
-                                q_panel.name = "QPanel"
-                                q_panel.answer = "q"
-                                q_panel.position = Vector3(33.5, -220, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../QPanel"))
-                                giftmap_parent.add_child.call_deferred(q_panel)
-
-                                var q_wpl = wpl_prefab.instantiate()
-                                q_wpl.name = "QWpl"
-                                q_wpl.exit = "the_crystalline"
-                                q_wpl.senders.append(NodePath("../QPanel"))
-                                giftmap_parent.add_child.call_deferred(q_wpl)
-
-                        if ap.enable_gift_maps.has("The Stellar"):
-                                var hatkirby_panel = panel_prefab.instantiate()
-                                hatkirby_panel.name = "HatkirbyPanel"
-                                hatkirby_panel.answer = "hatkirby"
-                                hatkirby_panel.position = Vector3(33.5, -230, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../HatkirbyPanel"))
-                                giftmap_parent.add_child.call_deferred(hatkirby_panel)
-
-                                var kirby_panel = panel_prefab.instantiate()
-                                kirby_panel.name = "KirbyPanel"
-                                kirby_panel.answer = "kirby"
-                                kirby_panel.position = Vector3(33.5, -240, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../KirbyPanel"))
-                                giftmap_parent.add_child.call_deferred(kirby_panel)
-
-                                var star_panel = panel_prefab.instantiate()
-                                star_panel.name = "StarPanel"
-                                star_panel.answer = "star"
-                                star_panel.position = Vector3(33.5, -250, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../StarPanel"))
-                                giftmap_parent.add_child.call_deferred(star_panel)
-
-                                var stellar_wpl = wpl_prefab.instantiate()
-                                stellar_wpl.name = "StellarWpl"
-                                stellar_wpl.exit = "the_stellar"
-                                stellar_wpl.senders.append(NodePath("../HatkirbyPanel"))
-                                stellar_wpl.senders.append(NodePath("../KirbyPanel"))
-                                stellar_wpl.senders.append(NodePath("../StarPanel"))
-                                stellar_wpl.complete_at = 1
-                                giftmap_parent.add_child.call_deferred(stellar_wpl)
-
-                        giftmap_parent.add_child.call_deferred(giftmap_panel)
-
-                        var giftmap_tpl = tpl_prefab.instantiate()
-                        giftmap_tpl.name = "PanelTeleporter"
-                        giftmap_tpl.teleport_point = Vector3(33.5, 1, 5.5)
-                        giftmap_tpl.teleport_rotate = Vector3(-45, 0, 0)
-                        giftmap_tpl.target_path = giftmap_panel
-                        giftmap_tpl.senders.append(
-                                NodePath("/root/scene/Components/Listeners/unlockReaderListenerDoubles")
-                        )
-                        giftmap_parent.add_child.call_deferred(giftmap_tpl)
-
-        # Add the strict purple ending validation.
-        if global.map == "the_sun_temple" and ap.strict_purple_ending:
-                var panel_prefab = preload("res://objects/nodes/panel.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-                var reverse_prefab = preload("res://objects/nodes/listeners/reversingListener.tscn")
-
-                var previous_panel = null
-                var next_y = -100
-                var words = ["quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog"]
-                for word in words:
-                        var panel = panel_prefab.instantiate()
-                        panel.position = Vector3(0, next_y, 0)
-                        next_y -= 10
-                        panel.clue = word
-                        panel.symbol = ""
-                        panel.answer = word
-                        panel.name = "EndCheck_%s" % word
-
-                        var tpl = tpl_prefab.instantiate()
-                        tpl.teleport_point = Vector3(0, 1, 0)
-                        tpl.teleport_rotate = Vector3(-45, 180, 0)
-                        tpl.target_path = panel
-                        tpl.name = "Teleport"
-
-                        if previous_panel == null:
-                                tpl.senders.append(NodePath("/root/scene/Panels/End/panel_24"))
-                        else:
-                                tpl.senders.append(NodePath("../../%s" % previous_panel.name))
-
-                        var reversing = reverse_prefab.instantiate()
-                        reversing.senders.append(NodePath(".."))
-                        reversing.name = "Reversing"
-                        tpl.senders.append(NodePath("../Reversing"))
-
-                        panel.add_child.call_deferred(tpl)
-                        panel.add_child.call_deferred(reversing)
-                        get_parent().get_node("Panels").add_child.call_deferred(panel)
-
-                        previous_panel = panel
-
-                # Duplicate the doors that usually wait on EQUINOX. We can't set the senders
-                # here for some reason so we actually set them in the door ready function.
-                var endplat = get_node("/root/scene/Components/Doors/EndPlatform")
-                var endplat2 = endplat.duplicate()
-                endplat2.name = "spe_EndPlatform"
-                endplat.get_parent().add_child.call_deferred(endplat2)
-                endplat.queue_free()
-
-                var entry2 = get_node("/root/scene/Components/Doors/entry_2")
-                var entry22 = entry2.duplicate()
-                entry22.name = "spe_entry_2"
-                entry2.get_parent().add_child.call_deferred(entry22)
-                entry2.queue_free()
-
-        # Add the strict cyan ending validation.
-        if global.map == "the_parthenon" and ap.strict_cyan_ending:
-                var panel_prefab = preload("res://objects/nodes/panel.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-                var reverse_prefab = preload("res://objects/nodes/listeners/reversingListener.tscn")
-
-                var previous_panel = null
-                var next_y = -100
-                var words = ["quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog"]
-                for word in words:
-                        var panel = panel_prefab.instantiate()
-                        panel.position = Vector3(0, next_y, 0)
-                        next_y -= 10
-                        panel.clue = word
-                        panel.symbol = "."
-                        panel.answer = "%s%s" % [word, word]
-                        panel.name = "EndCheck_%s" % word
-
-                        var tpl = tpl_prefab.instantiate()
-                        tpl.teleport_point = Vector3(0, 1, -11)
-                        tpl.teleport_rotate = Vector3(-45, 0, 0)
-                        tpl.target_path = panel
-                        tpl.name = "Teleport"
-
-                        if previous_panel == null:
-                                tpl.senderGroup.append(NodePath("/root/scene/Panels/Rulers"))
-                        else:
-                                tpl.senders.append(NodePath("../../%s" % previous_panel.name))
-
-                        var reversing = reverse_prefab.instantiate()
-                        reversing.senders.append(NodePath(".."))
-                        reversing.name = "Reversing"
-                        tpl.senders.append(NodePath("../Reversing"))
-
-                        panel.add_child.call_deferred(tpl)
-                        panel.add_child.call_deferred(reversing)
-                        get_parent().get_node("Panels").add_child.call_deferred(panel)
-
-                        previous_panel = panel
-
-                # Duplicate the door that usually waits on the rulers. We can't set the
-                # senders here for some reason so we actually set them in the door ready
-                # function.
-                var entry1 = get_node("/root/scene/Components/Doors/entry_1")
-                var entry12 = entry1.duplicate()
-                entry12.name = "spe_entry_1"
-                entry1.get_parent().add_child.call_deferred(entry12)
-                entry1.queue_free()
-
-        # Move the Plaza RTE trigger outside of the turtle.
-        if global.map == "the_plaza":
-                var rte_trigger = get_node("/root/scene/Components/Warps/triggerArea")
-                rte_trigger.position.z = 0
-
-        # Add the mastery to Icarus.
-        if global.map == "icarus" and ap.enable_icarus:
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(0, -2000, 0)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var tpl = tpl_prefab.instantiate()
-                tpl.teleport_point = Vector3(56.25, 0, -5.5)
-                tpl.teleport_rotate = Vector3(0, 0, 0)
-                tpl.target_path = mastery
-                tpl.name = "Teleport"
-                tpl.senderGroup.append(NodePath("/root/scene/Panels"))
-                tpl.nested = true
-                mastery.add_child.call_deferred(tpl)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Advanced.
-        if global.map == "the_advanced":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(0, -200, -5)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var tpl = tpl_prefab.instantiate()
-                tpl.teleport_point = Vector3(0, 2, -5)
-                tpl.teleport_rotate = Vector3(0, 0, 0)
-                tpl.target_path = mastery
-                tpl.name = "Teleport"
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_29"))
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_30"))
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_31"))
-                mastery.add_child.call_deferred(tpl)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Charismatic.
-        if global.map == "the_charismatic":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(-17, 2, -29)
-                mastery.rotation_degrees = Vector3(0, 45, 0)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Crystalline.
-        if global.map == "the_crystalline":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(0, 13, 37)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var tpl = tpl_prefab.instantiate()
-                tpl.teleport_point = Vector3(0, 11.5, -20)
-                tpl.teleport_rotate = Vector3(0, 0, 180)
-                tpl.target_path = mastery
-                tpl.name = "Teleport"
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_3"))
-                mastery.add_child.call_deferred(tpl)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Stellar.
-        if global.map == "the_stellar":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-
-                var collectables = Node.new()
-                collectables.name = "Collectables"
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(2, 2, -31)
-                mastery.rotation_degrees = Vector3(0, 90, 0)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                collectables.add_child.call_deferred(mastery)
-                get_node("/root/scene/Components").add_child.call_deferred(collectables)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
+        # Run map-specific initialization.
+        var map_script = ap.get_map_script(global.map)
+        if map_script != null:
+                map_script.on_map_load(get_tree().get_root())
 
         ap.update_job_well_done_sign()
 
@@ -430,9 +36,12 @@ func _ready():
                         continue
 
                 if (
-                        door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
-                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
-                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
+                        not (door.has_legacy_location() and door.get_legacy_location())
+                        and (
+                                door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
+                                or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
+                                or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
+                        )
                 ):
                         continue
 
@@ -568,22 +177,5 @@ func _ready():
         ap.stop_batching_locations()
 
 
-func _set_up_invis_wall(x, y, z, sx, sy, sz):
-        var prefab = preload("res://objects/nodes/block.tscn")
-        var newwall = prefab.instantiate()
-        newwall.position.x = x
-        newwall.position.y = y
-        newwall.position.z = z
-        newwall.scale.x = sz
-        newwall.scale.y = sy
-        newwall.scale.z = sx
-        newwall.set_surface_override_material(0, preload("res://assets/materials/blackMatte.material"))
-        newwall.visibility_range_end = 3
-        newwall.visibility_range_end_margin = 1
-        newwall.visibility_range_fade_mode = RenderingServer.VISIBILITY_RANGE_FADE_SELF
-        newwall.skeleton = ".."
-        get_parent().add_child.call_deferred(newwall)
-
-
 func _process(_dt):
         compass.update_rotation(global_rotation.y)
@@ -7,6 +7,10 @@ func _init(path):
         source_path = path
 
 
+func path_exists(path):
+        return FileAccess.file_exists("%s/%s" % [source_path, path])
+
+
 func load_script(path):
         return ResourceLoader.load("%s/%s" % [source_path, path])
 
@@ -16,6 +16,8 @@ var tracker_loc_tree_item_by_id = {}
 var tracker_port_tree_item_by_id = {}
 var tracker_goal_tree_item = null
 var tracker_object_by_index = {}
+var tracker_object_by_ignored_index = {}
+var tracker_ignored_group = null
 
 var worldports_tab
 var worldports_tree
@@ -99,7 +101,7 @@ func _ready():
         tabs.add_child(tracker_margins)
 
         tracker_tree = Tree.new()
-        tracker_tree.columns = 3
+        tracker_tree.columns = 4
         tracker_tree.hide_root = true
         tracker_tree.add_theme_font_size_override("font_size", 24)
         tracker_tree.add_theme_color_override("font_color", Color(0.8, 0.8, 0.8, 1))
@@ -108,7 +110,9 @@ func _ready():
         tracker_tree.set_column_expand(0, false)
         tracker_tree.set_column_expand(1, true)
         tracker_tree.set_column_expand(2, false)
+        tracker_tree.set_column_expand(3, false)
         tracker_tree.set_column_custom_minimum_width(2, 200)
+        tracker_tree.set_column_custom_minimum_width(3, 200)
         tracker_margins.add_child(tracker_tree)
 
         worldports_tab = MarginContainer.new()
@@ -208,6 +212,8 @@ func update_locations(reset_locations = true):
                                                 "name": location_name,
                                                 "type": kLocation,
                                                 "id": location_id,
+                                                "ignored": ap._ignored_locations.has(location_id),
+                                                "hint": ap.client._hinted_locations.has(location_id),
                                         }
                                 )
                         )
@@ -222,11 +228,13 @@ func update_locations(reset_locations = true):
                                                 "name": port_name,
                                                 "type": kWorldport,
                                                 "id": port_id,
+                                                "ignored": false,
+                                                "hint": false,
                                         }
                                 )
                         )
 
-        locations.sort_custom(func(a, b): return a["name"] < b["name"])
+        locations.sort_custom(_cmp_tracker_objects)
 
         if ap.client._goal_accessible:
                 var location_name = gamedata.ending_display_name_by_name[ap.kEndingNameByVictoryValue[
@@ -238,14 +246,18 @@ func update_locations(reset_locations = true):
                                 {
                                         "name": location_name,
                                         "type": kGoal,
+                                        "ignored": false,
+                                        "hint": false,
                                 }
                         )
                 )
 
         var count = 0
         for location in locations:
-                if count < 18:
+                if count < 18 and not location["ignored"]:
                         locations_overlay.push_paragraph(HORIZONTAL_ALIGNMENT_RIGHT)
+                        if location["hint"]:
+                                locations_overlay.push_color(Color("#fafad2"))
                         locations_overlay.append_text(location["name"])
                         locations_overlay.append_text(" ")
                         if location["type"] == kLocation:
@@ -254,6 +266,8 @@ func update_locations(reset_locations = true):
                                 locations_overlay.add_image(worldport_texture)
                         elif location["type"] == kGoal:
                                 locations_overlay.add_image(goal_texture)
+                        if location["hint"]:
+                                locations_overlay.pop()
                         locations_overlay.pop()
                 count += 1
 
@@ -266,17 +280,43 @@ func update_locations(reset_locations = true):
                 var root_ti = tracker_tree.create_item(null)
 
                 for location in locations:
-                        var loc_row = root_ti.create_child()
+                        var loc_row
+
+                        if location["ignored"]:
+                                if tracker_ignored_group == null:
+                                        tracker_ignored_group = root_ti.create_child()
+                                        tracker_ignored_group.set_text(1, "Ignored Locations")
+                                        tracker_ignored_group.set_selectable(0, false)
+                                        tracker_ignored_group.set_selectable(1, false)
+                                        tracker_ignored_group.set_selectable(2, false)
+                                        tracker_ignored_group.set_selectable(3, false)
+
+                                loc_row = tracker_ignored_group.create_child()
+                        else:
+                                loc_row = root_ti.create_child()
+
                         loc_row.set_cell_mode(0, TreeItem.CELL_MODE_ICON)
                         loc_row.set_selectable(0, false)
                         loc_row.set_text(1, location["name"])
                         loc_row.set_selectable(1, false)
+                        if location["hint"]:
+                                loc_row.set_custom_color(1, Color("#fafad2"))
                         loc_row.set_cell_mode(2, TreeItem.CELL_MODE_CUSTOM)
                         loc_row.set_text(2, "Show Path")
                         loc_row.set_custom_as_button(2, true)
                         loc_row.set_editable(2, true)
                         loc_row.set_selectable(2, false)
                         loc_row.set_text_alignment(2, HORIZONTAL_ALIGNMENT_CENTER)
+                        loc_row.set_selectable(3, false)
+                        if location["type"] == kLocation:
+                                loc_row.set_cell_mode(3, TreeItem.CELL_MODE_CUSTOM)
+                                if location["ignored"]:
+                                        loc_row.set_text(3, "Unignore")
+                                else:
+                                        loc_row.set_text(3, "Ignore")
+                                loc_row.set_custom_as_button(3, true)
+                                loc_row.set_editable(3, true)
+                                loc_row.set_text_alignment(3, HORIZONTAL_ALIGNMENT_CENTER)
 
                         if location["type"] == kLocation:
                                 loc_row.set_icon(0, location_texture)
@@ -288,7 +328,10 @@ func update_locations(reset_locations = true):
                                 loc_row.set_icon(0, goal_texture)
                                 tracker_goal_tree_item = loc_row
 
-                        tracker_object_by_index[loc_row.get_index()] = location
+                        if location["ignored"]:
+                                tracker_object_by_ignored_index[loc_row.get_index()] = location
+                        else:
+                                tracker_object_by_index[loc_row.get_index()] = location
         else:
                 for loc_row in tracker_tree.get_root().get_children():
                         loc_row.visible = false
@@ -310,6 +353,18 @@ func update_locations(reset_locations = true):
                 if tracker_goal_tree_item != null and ap.client._goal_accessible:
                         tracker_goal_tree_item.visible = true
 
+                if tracker_ignored_group != null:
+                        tracker_ignored_group.visible = true
+
+
+func _cmp_tracker_objects(a, b) -> bool:
+        if a["ignored"] != b["ignored"]:
+                return !a["ignored"]
+        elif a["hint"] != b["hint"]:
+                return a["hint"]
+        else:
+                return a["name"] < b["name"]
+
 
 func update_locations_visibility():
         var ap = global.get_node("Archipelago")
@@ -317,20 +372,33 @@ func update_locations_visibility():
 
 
 func _on_tracker_button_clicked():
+        var ap = global.get_node("Archipelago")
+
         var edited_item = tracker_tree.get_edited()
         var edited_index = edited_item.get_index()
 
-        if tracker_object_by_index.has(edited_index):
-                var tracker_object = tracker_object_by_index[edited_index]
-                var ap = global.get_node("Archipelago")
-                var type_str = ""
-                if tracker_object["type"] == kLocation:
-                        type_str = "location"
-                elif tracker_object["type"] == kWorldport:
-                        type_str = "worldport"
-                elif tracker_object["type"] == kGoal:
-                        type_str = "goal"
-                ap.client.getLogicalPath(type_str, tracker_object.get("id", null))
+        if edited_item.get_parent() == tracker_tree.get_root():
+                if tracker_object_by_index.has(edited_index):
+                        var tracker_object = tracker_object_by_index[edited_index]
+                        if tracker_tree.get_edited_column() == 2:
+                                var type_str = ""
+                                if tracker_object["type"] == kLocation:
+                                        type_str = "location"
+                                elif tracker_object["type"] == kWorldport:
+                                        type_str = "worldport"
+                                elif tracker_object["type"] == kGoal:
+                                        type_str = "goal"
+                                ap.client.getLogicalPath(type_str, tracker_object.get("id", null))
+                        elif tracker_tree.get_edited_column() == 3:
+                                ap.toggle_ignored_location(tracker_object["id"])
+        elif edited_item.get_parent() == tracker_ignored_group:
+                # This is the ignored locations group.
+                if (
+                        tracker_object_by_ignored_index.has(edited_index)
+                        and tracker_tree.get_edited_column() == 3
+                ):
+                        var tracker_object = tracker_object_by_ignored_index[edited_index]
+                        ap.toggle_ignored_location(tracker_object["id"])
 
 
 func display_logical_path(object_type, object_id, paths):
@@ -435,4 +503,6 @@ func reset_tracker_tab():
         tracker_port_tree_item_by_id.clear()
         tracker_goal_tree_item = null
         tracker_object_by_index.clear()
+        tracker_object_by_ignored_index.clear()
+        tracker_ignored_group = null
         tracker_tree.clear()
@@ -0,0 +1,46 @@
+extends "res://scripts/nodes/listeners/unlockReaderListener.gd"
+
+var item_id = null
+var item_amount
+
+
+func _ready():
+        var node_path = String(
+                get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names()
+        )
+
+        var gamedata = global.get_node("Gamedata")
+        var door_id = gamedata.get_door_for_map_node_path(global.map, node_path)
+        if door_id != null:
+                var ap = global.get_node("Archipelago")
+                var item_lock = ap.get_item_id_for_door(door_id)
+
+                if item_lock != null:
+                        item_id = item_lock[0]
+                        item_amount = item_lock[1]
+
+                        self.senders = []
+                        self.senderGroup = []
+                        self.nested = false
+                        self.complete_at = 0
+                        self.max_length = 0
+                        self.excludeSenders = []
+
+        super._ready()
+
+
+func _readier():
+        if item_id != null:
+                var ap = global.get_node("Archipelago")
+
+                if ap.client.getItemAmount(item_id) >= item_amount:
+                        handleTriggered()
+        else:
+                super._readier()
+
+
+func handleTriggered():
+        if item_id != null:
+                emit_signal("trigger")
+        else:
+                super.handleTriggered()
@@ -30,6 +30,16 @@ KEY_STORAGE_MAPPING = {
 REVERSE_KEY_STORAGE_MAPPING = {t: k for k, t in KEY_STORAGE_MAPPING.items()}
 
 
+# There is a distinction between an object's ID and its AP ID. The latter is stable between releases, whereas the former
+# can change and is also namespaced based on the object type. We should only store AP IDs in multiworld state (such as
+# slot data and data storage) to increase compatability between releases. The data we currently store is:
+# - Port pairings for worldport shuffle (slot data)
+# - Checked worldports for worldport shuffle (data storage)
+# - Latched doors (data storage)
+# The client generally deals in the actual object IDs rather than the stable IDs, although it does have to convert the
+# port pairing IDs when reading them from slot data. The context (this file here) does the work of converting back and
+# forth between the values. AP IDs are converted to IDs after reading them from data storage, and IDs are converted to
+# AP IDs before sending them to data storage.
 class Lingo2Manager:
     game_ctx: "Lingo2GameContext"
     client_ctx: "Lingo2ClientContext"
@@ -39,6 +49,7 @@ class Lingo2Manager:
     worldports: set[int]
     goaled: bool
     latches: set[int]
+    hinted_locations: set[int]
 
     def __init__(self, game_ctx: "Lingo2GameContext", client_ctx: "Lingo2ClientContext"):
         self.game_ctx = game_ctx
@@ -47,8 +58,6 @@ class Lingo2Manager:
         self.client_ctx.manager = self
         self.tracker = Tracker(self)
         self.keyboard = {}
-        self.worldports = set()
-        self.latches = set()
 
         self.reset()
 
@@ -59,6 +68,7 @@ class Lingo2Manager:
         self.worldports = set()
         self.goaled = False
         self.latches = set()
+        self.hinted_locations = set()
 
     def update_keyboard(self, new_keyboard: dict[str, int]) -> dict[str, int]:
         ret: dict[str, int] = {}
@@ -74,6 +84,7 @@ class Lingo2Manager:
 
         return ret
 
+    # Input should be real IDs, not AP IDs
     def update_worldports(self, new_worldports: set[int]) -> set[int]:
         ret = new_worldports.difference(self.worldports)
         self.worldports.update(new_worldports)
@@ -90,6 +101,12 @@ class Lingo2Manager:
 
         return ret
 
+    def update_hinted_locations(self, new_locs: set[int]) -> set[int]:
+        ret = new_locs.difference(self.hinted_locations)
+        self.hinted_locations.update(new_locs)
+
+        return ret
+
 
 class Lingo2GameContext:
     server: Endpoint | None
@@ -227,6 +244,7 @@ class Lingo2GameContext:
 
         async_start(self.send_msgs([msg]), name="update keyboard")
 
+    # Input should be real IDs, not AP IDs
     def send_update_worldports(self, worldports):
         if self.server is None:
             return
@@ -264,6 +282,28 @@ class Lingo2GameContext:
 
         async_start(self.send_msgs([msg]), name="update latches")
 
+    def send_ignored_locations(self, ignored_locations):
+        if self.server is None:
+            return
+
+        msg = {
+            "cmd": "SetIgnoredLocations",
+            "locations": ignored_locations,
+        }
+
+        async_start(self.send_msgs([msg]), name="set ignored locations")
+
+    def send_update_hinted_locations(self, hinted_locations):
+        if self.server is None:
+            return
+
+        msg = {
+            "cmd": "UpdateHintedLocations",
+            "locations": hinted_locations,
+        }
+
+        async_start(self.send_msgs([msg]), name="update hinted locations")
+
     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:
@@ -278,6 +318,7 @@ class Lingo2ClientContext(CommonContext):
     items_handling = 0b111
 
     slot_data: dict[str, Any] | None
+    hints_data_storage_key: str
     victory_data_storage_key: str
 
     def __init__(self, server_address: str | None = None, password: str | None = None):
@@ -315,10 +356,12 @@ class Lingo2ClientContext(CommonContext):
             self.manager.tracker.set_checked_locations(self.checked_locations)
             self.manager.game_ctx.send_accessible_locations()
 
+            self.hints_data_storage_key = f"_read_hints_{self.team}_{self.slot}"
             self.victory_data_storage_key = f"_read_client_status_{self.team}_{self.slot}"
 
             self.set_notify(self.get_datastorage_key("keyboard1"), self.get_datastorage_key("keyboard2"),
-                            self.victory_data_storage_key, self.get_datastorage_key("latches"))
+                            self.victory_data_storage_key, self.get_datastorage_key("latches"),
+                            self.get_datastorage_key("ignored_locations"))
             msg_batch = [{
                 "cmd": "Set",
                 "key": self.get_datastorage_key("keyboard1"),
@@ -337,6 +380,12 @@ class Lingo2ClientContext(CommonContext):
                 "default": [],
                 "want_reply": True,
                 "operations": [{"operation": "default", "value": []}]
+            }, {
+                "cmd": "Set",
+                "key": self.get_datastorage_key("ignored_locations"),
+                "default": [],
+                "want_reply": True,
+                "operations": [{"operation": "default", "value": []}]
             }]
 
             if self.slot_data.get("shuffle_worldports", False):
@@ -435,21 +484,29 @@ class Lingo2ClientContext(CommonContext):
             for k, v in args["keys"].items():
                 if k == self.victory_data_storage_key:
                     self.handle_status_update(v)
+                elif k == self.hints_data_storage_key:
+                    self.update_hints()
         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)
             elif args["key"] == self.get_datastorage_key("worldports"):
-                updates = self.manager.update_worldports(set(args["value"]))
+                port_ids = set(Lingo2World.static_logic.port_id_by_ap_id[ap_id] for ap_id in args["value"])
+                updates = self.manager.update_worldports(port_ids)
                 if len(updates) > 0:
                     self.manager.game_ctx.send_update_worldports(updates)
             elif args["key"] == self.victory_data_storage_key:
                 self.handle_status_update(args["value"])
             elif args["key"] == self.get_datastorage_key("latches"):
-                updates = self.manager.update_latches(set(args["value"]))
+                door_ids = set(Lingo2World.static_logic.door_id_by_ap_id[ap_id] for ap_id in args["value"])
+                updates = self.manager.update_latches(door_ids)
                 if len(updates) > 0:
                     self.manager.game_ctx.send_update_latches(updates)
+            elif args["key"] == self.get_datastorage_key("ignored_locations"):
+                self.manager.game_ctx.send_ignored_locations(args["value"])
+            elif args["key"] == self.hints_data_storage_key:
+                self.update_hints()
 
     def get_datastorage_key(self, name: str):
         return f"Lingo2_{self.slot}_{name}"
@@ -515,14 +572,16 @@ class Lingo2ClientContext(CommonContext):
         if len(updates) > 0:
             self.manager.game_ctx.send_update_keyboard(updates)
 
+    # Input should be real IDs, not AP IDs
     async def update_worldports(self, updates: set[int]):
+        port_ap_ids = [Lingo2World.static_logic.objects.ports[port_id].ap_id for port_id in updates]
         await self.send_msgs([{
             "cmd": "Set",
             "key": self.get_datastorage_key("worldports"),
             "want_reply": True,
             "operations": [{
                 "operation": "update",
-                "value": updates
+                "value": port_ap_ids
             }]
         }])
 
@@ -532,16 +591,47 @@ class Lingo2ClientContext(CommonContext):
         self.manager.game_ctx.send_accessible_locations()
 
     async def update_latches(self, updates: set[int]):
+        door_ap_ids = [Lingo2World.static_logic.objects.doors[door_id].ap_id for door_id in updates]
         await self.send_msgs([{
             "cmd": "Set",
             "key": self.get_datastorage_key("latches"),
             "want_reply": True,
             "operations": [{
                 "operation": "update",
-                "value": updates
+                "value": door_ap_ids
+            }]
+        }])
+
+    async def add_ignored_location(self, loc_id: int):
+        await self.send_msgs([{
+            "cmd": "Set",
+            "key": self.get_datastorage_key("ignored_locations"),
+            "want_reply": True,
+            "operations": [{
+                "operation": "update",
+                "value": [loc_id]
             }]
         }])
 
+    async def remove_ignored_location(self, loc_id: int):
+        await self.send_msgs([{
+            "cmd": "Set",
+            "key": self.get_datastorage_key("ignored_locations"),
+            "want_reply": True,
+            "operations": [{
+                "operation": "remove",
+                "value": loc_id
+            }]
+        }])
+
+    def update_hints(self):
+        hints = self.stored_data.get(self.hints_data_storage_key, [])
+
+        hinted_locations = set(hint["location"] for hint in hints if hint["finding_player"] == self.slot)
+        updates = self.manager.update_hinted_locations(hinted_locations)
+        if len(updates) > 0:
+            self.manager.game_ctx.send_update_hinted_locations(updates)
+
 
 async def pipe_loop(manager: Lingo2Manager):
     while not manager.client_ctx.exit_event.is_set():
@@ -590,12 +680,14 @@ async def process_game_cmd(manager: Lingo2Manager, args: dict):
             async_start(manager.client_ctx.update_keyboard(updates), name="client update keyboard")
     elif cmd == "CheckWorldport":
         port_id = args["port_id"]
+        port_ap_id = Lingo2World.static_logic.objects.ports[port_id].ap_id
         worldports = {port_id}
 
         # Also check the reverse port if it's a two-way connection.
         port_pairings = manager.client_ctx.slot_data["port_pairings"]
-        if str(port_id) in port_pairings and port_pairings.get(str(port_pairings[str(port_id)]), None) == port_id:
-            worldports.add(port_pairings[str(port_id)])
+        if str(port_ap_id) in port_pairings and\
+                port_pairings.get(str(port_pairings[str(port_ap_id)]), None) == port_ap_id:
+            worldports.add(Lingo2World.static_logic.port_id_by_ap_id[port_pairings[str(port_ap_id)]])
 
         updates = manager.update_worldports(worldports)
         if len(updates) > 0:
@@ -616,6 +708,10 @@ async def process_game_cmd(manager: Lingo2Manager, args: dict):
         updates = manager.update_latches({args["door"]})
         if len(updates) > 0:
             async_start(manager.client_ctx.update_latches(updates), name="client update latches")
+    elif cmd == "IgnoreLocation":
+        async_start(manager.client_ctx.add_ignored_location(args["id"]), name="client ignore loc")
+    elif cmd == "UnignoreLocation":
+        async_start(manager.client_ctx.remove_ignored_location(args["id"]), name="client unignore loc")
     elif cmd == "Quit":
         manager.client_ctx.exit_event.set()
 
@@ -181,6 +181,26 @@ class VictoryCondition(Choice):
     option_white_ending = 12
 
 
+class EndingsRequirement(Range):
+    """The number of endings required to unlock White Ending."""
+    display_name = "Endings Requirement"
+    range_start = 0
+    range_end = 12
+    default = 12
+
+
+class MasteriesRequirement(Range):
+    """The number of masteries required to unlock White Ending.
+
+    There are only 13 masteries in the base game, but some of the other slot options may add more masteries to the
+    world. If the chosen number of masteries is higher than the total in your world, it will be automatically lowered to
+    the maximum."""
+    display_name = "Masteries Requirement"
+    range_start = 0
+    range_end = 19
+    default = 0
+
+
 class TrapPercentage(Range):
     """Replaces junk items with traps, at the specified rate."""
     display_name = "Trap Percentage"
@@ -205,4 +225,6 @@ class Lingo2Options(PerGameCommonOptions):
     strict_purple_ending: StrictPurpleEnding
     strict_cyan_ending: StrictCyanEnding
     victory_condition: VictoryCondition
+    endings_requirement: EndingsRequirement
+    masteries_requirement: MasteriesRequirement
     trap_percentage: TrapPercentage
@@ -241,6 +241,8 @@ class Lingo2PlayerLogic:
                     return "The Charismatic" in world.options.enable_gift_maps.value
                 elif game_map.name == "the_crystalline":
                     return "The Crystalline" in world.options.enable_gift_maps.value
+                elif game_map.name == "the_fuzzy":
+                    return "The Fuzzy" in world.options.enable_gift_maps.value
                 elif game_map.name == "the_stellar":
                     return "The Stellar" in world.options.enable_gift_maps.value
 
@@ -249,6 +251,16 @@ class Lingo2PlayerLogic:
         self.shuffled_maps = set(game_map.id for game_map in world.static_logic.objects.maps
                                  if should_shuffle_map(game_map))
 
+        maximum_masteries = 13 + len(world.options.enable_gift_maps.value)
+        if world.options.enable_icarus:
+            maximum_masteries += 1
+
+        if world.options.masteries_requirement > maximum_masteries:
+            world.options.masteries_requirement.value = maximum_masteries
+
+        if "The Fuzzy" in world.options.enable_gift_maps.value:
+            self.real_items.append("Numbers")
+
         if self.world.options.shuffle_doors:
             for progressive in world.static_logic.objects.progressives:
                 for i in range(0, len(progressive.doors)):
@@ -362,24 +374,29 @@ class Lingo2PlayerLogic:
             self.locations_by_room.setdefault(mastery.room_id, []).append(PlayerLocation(mastery.ap_id,
                                                                                          AccessRequirements()))
 
+            if world.options.masteries_requirement > 0:
+                event_name = f"{world.static_logic.get_room_object_map_name(mastery)} - Mastery (Collected)"
+                self.event_loc_item_by_room.setdefault(mastery.room_id, {})[event_name] = "Mastery"
+
         for ending in world.static_logic.objects.endings:
             if world.static_logic.get_room_object_map_id(ending) not in self.shuffled_maps:
                 continue
 
-            # Don't create a location for your selected ending, and never create a location for White Ending.
+            # Don't create a location for your selected ending. Also don't create a location for White Ending if it's
+            # necessarily in the postgame, i.e. it requires all 12 other endings.
             if world.options.victory_condition.current_key.removesuffix("_ending").upper() != ending.name\
-                    and ending.name != "WHITE":
+                    and (ending.name != "WHITE" or world.options.endings_requirement < 12):
                 self.locations_by_room.setdefault(ending.room_id, []).append(PlayerLocation(ending.ap_id,
                                                                                             AccessRequirements()))
 
-            event_name = f"{ending.name.capitalize()} Ending (Achieved)"
-            item_name = event_name
-
             if world.options.victory_condition.current_key.removesuffix("_ending").upper() == ending.name:
-                item_name = "Victory"
+                event_name = f"{ending.name.capitalize()} Ending (Goal)"
+                self.event_loc_item_by_room.setdefault(ending.room_id, {})[event_name] = "Victory"
                 self.goal_room_id = ending.room_id
 
-            self.event_loc_item_by_room.setdefault(ending.room_id, {})[event_name] = item_name
+            if ending.name != "WHITE":
+                event_name = f"{ending.name.capitalize()} Ending (Achieved)"
+                self.event_loc_item_by_room.setdefault(ending.room_id, {})[event_name] = "Ending"
 
         if self.world.options.keyholder_sanity:
             for keyholder in world.static_logic.objects.keyholders:
@@ -494,7 +511,6 @@ class Lingo2PlayerLogic:
                 reqs.possibilities.append(panel_reqs)
 
         if door.HasField("control_center_color"):
-            # TODO: Logic for ensuring two CC states aren't needed at once.
             reqs.rooms.add("Control Center - Main Area")
             self.add_solution_reqs(reqs, door.control_center_color)
 
@@ -520,13 +536,12 @@ class Lingo2PlayerLogic:
         for room in door.rooms:
             reqs.rooms.add(self.world.static_logic.get_room_region_name(room))
 
-        for ending_id in door.endings:
-            ending = self.world.static_logic.objects.endings[ending_id]
+        if door.white_ending:
+            if self.world.options.endings_requirement > 0:
+                reqs.progressives["Ending"] = self.world.options.endings_requirement.value
 
-            if self.world.options.victory_condition.current_key.removesuffix("_ending").upper() == ending.name:
-                reqs.items.add("Victory")
-            else:
-                reqs.items.add(f"{ending.name.capitalize()} Ending (Achieved)")
+            if self.world.options.masteries_requirement > 0:
+                reqs.progressives["Mastery"] = self.world.options.masteries_requirement.value
 
         for sub_door_id in door.doors:
             sub_reqs = self.get_door_open_reqs(sub_door_id)
@@ -588,3 +603,6 @@ class Lingo2PlayerLogic:
 
             if needed > 0:
                 reqs.letters[l] = max(reqs.letters.get(l, 0), needed)
+
+        if any(l.isnumeric() for l in solution):
+            reqs.items.add("Numbers")
@@ -1 +1 @@
-protobuf==3.20.3
+protobuf
@@ -15,6 +15,9 @@ class Lingo2StaticLogic:
 
     letter_weights: dict[str, int]
 
+    door_id_by_ap_id: dict[int, int]
+    port_id_by_ap_id: dict[int, int]
+
     def __init__(self):
         self.item_id_to_name = {}
         self.location_id_to_name = {}
@@ -68,6 +71,7 @@ class Lingo2StaticLogic:
                 self.location_name_groups.setdefault("Keyholders", []).append(location_name)
 
         self.item_id_to_name[self.objects.special_ids["A Job Well Done"]] = "A Job Well Done"
+        self.item_id_to_name[self.objects.special_ids["Numbers"]] = "Numbers"
 
         for symbol_name in SYMBOL_ITEMS.values():
             self.item_id_to_name[self.objects.special_ids[symbol_name]] = symbol_name
@@ -80,7 +84,11 @@ class Lingo2StaticLogic:
 
         for panel in self.objects.panels:
             for letter in panel.answer.upper():
-                self.letter_weights[letter] = self.letter_weights.get(letter, 0) + 1
+                if letter.isalpha():
+                    self.letter_weights[letter] = self.letter_weights.get(letter, 0) + 1
+
+        self.door_id_by_ap_id = {door.ap_id: door.id for door in self.objects.doors if door.HasField("ap_id")}
+        self.port_id_by_ap_id = {port.ap_id: port.id for port in self.objects.ports if port.HasField("ap_id")}
 
     def get_door_item_name(self, door: data_pb2.Door) -> str:
         return f"{self.get_map_object_map_name(door)} - {door.name}"
@@ -105,7 +113,7 @@ class Lingo2StaticLogic:
         if door.type != data_pb2.DoorType.STANDARD:
             return None
 
-        if len(door.keyholders) > 0 or len(door.endings) > 0 or door.HasField("complete_at"):
+        if len(door.keyholders) > 0 or door.white_ending or door.HasField("complete_at"):
             return None
 
         if len(door.panels) > 4:
@@ -47,7 +47,10 @@ class Tracker:
         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()}
+            port_pairings = {
+                self.world.static_logic.port_id_by_ap_id[int(fp)]: self.world.static_logic.port_id_by_ap_id[int(tp)]
+                for fp, tp in slot_data["port_pairings"].items()
+            }
             connect_ports_from_ut(port_pairings, self.world)
 
         self.refresh_state()
@@ -93,6 +96,7 @@ class Tracker:
                                           PLAYER_NUM), prevent_sweep=True)
 
         self.state.sweep_for_advancements()
+        self.state.update_reachable_regions(PLAYER_NUM)
 
         self.accessible_locations = set()
         self.accessible_worldports = set()