16 files changed, 472 insertions, 16 deletions

@@ -47,6 +47,8 @@ signal location_scout_received(item_id, location_id, player, flags)
 func _init():
         set_process_mode(Node.PROCESS_MODE_ALWAYS)
 
+        _ws.inbound_buffer_size = 8388608
+
         global._print("Instantiated APClient")
 
         # Read AP datapackages from file, if there are any
@@ -225,7 +227,7 @@ func _process(_delta):
                                                         error_message = "Unknown error."
 
                                                 _initiated_disconnect = true
-                                                _ws.disconnect_from_host()
+                                                _ws.close()
 
                                                 emit_signal("could_not_connect", error_message)
                                                 global._print("Connection to AP refused")
@@ -309,7 +311,7 @@ func connectToServer(server, un, pw):
                                 % err
                         )
                 )
-                global._print("Could not connect to AP: " + err)
+                global._print("Could not connect to AP: %d" % err)
                 return
         _should_process = true
 
@@ -0,0 +1,66 @@
+extends Node2D
+
+const RADIUS = 48
+
+var _font
+
+
+func _ready():
+        _font = load("res://assets/fonts/Lingo2.ttf")
+
+
+func _draw():
+        draw_circle(Vector2.ZERO, RADIUS, Color(1.0, 1.0, 1.0, 0.8), true)
+        draw_circle(Vector2.ZERO, RADIUS, Color.BLACK, false)
+        draw_string(
+                _font,
+                Vector2(-4, -RADIUS * 3.0 / 4.0),
+                "N",
+                HorizontalAlignment.HORIZONTAL_ALIGNMENT_LEFT,
+                -1,
+                16,
+                Color.BLACK
+        )
+        draw_set_transform(Vector2.ZERO, PI / 2)
+        draw_string(
+                _font,
+                Vector2(-4, -RADIUS * 3.0 / 4.0),
+                "E",
+                HorizontalAlignment.HORIZONTAL_ALIGNMENT_LEFT,
+                -1,
+                16,
+                Color.BLACK
+        )
+        draw_set_transform(Vector2.ZERO, PI)
+        draw_string(
+                _font,
+                Vector2(-4, -RADIUS * 3.0 / 4.0),
+                "S",
+                HorizontalAlignment.HORIZONTAL_ALIGNMENT_LEFT,
+                -1,
+                16,
+                Color.BLACK
+        )
+        draw_set_transform(Vector2.ZERO, PI * 3.0 / 2.0)
+        draw_string(
+                _font,
+                Vector2(-4, -RADIUS * 3.0 / 4.0),
+                "W",
+                HorizontalAlignment.HORIZONTAL_ALIGNMENT_LEFT,
+                -1,
+                16,
+                Color.BLACK
+        )
+        draw_set_transform(Vector2.ZERO)
+        draw_colored_polygon(
+                PackedVector2Array(
+                        [Vector2(0, -RADIUS * 5.0 / 8.0), Vector2(-RADIUS / 6.0, 0), Vector2(RADIUS / 6.0, 0)]
+                ),
+                Color.RED
+        )
+        draw_colored_polygon(
+                PackedVector2Array(
+                        [Vector2(0, RADIUS * 5.0 / 8.0), Vector2(-RADIUS / 6.0, 0), Vector2(RADIUS / 6.0, 0)]
+                ),
+                Color.GRAY
+        )
@@ -0,0 +1,17 @@
+extends CanvasLayer
+
+var SCRIPT_compass
+
+var compass
+
+
+func _ready():
+        compass = SCRIPT_compass.new()
+        compass.position = Vector2(1840, 80)
+        add_child(compass)
+
+        visible = false
+
+
+func update_rotation(ry):
+        compass.rotation = ry
@@ -28,6 +28,14 @@ func _ready():
 
                         call_deferred("_readier")
 
+        if global.map == "the_sun_temple":
+                if name == "spe_EndPlatform" or name == "spe_entry_2":
+                        senders = [NodePath("/root/scene/Panels/EndCheck_dog")]
+
+        if global.map == "the_parthenon":
+                if name == "spe_entry_1":
+                        senders = [NodePath("/root/scene/Panels/EndCheck_dog")]
+
         super._ready()
 
 
@@ -11,6 +11,7 @@ var map_id_by_name = {}
 var progressive_id_by_ap_id = {}
 var letter_id_by_ap_id = {}
 var symbol_item_ids = []
+var anti_trap_ids = {}
 
 var kSYMBOL_ITEMS
 
@@ -97,6 +98,12 @@ func load(data_bytes):
         for symbol_name in kSYMBOL_ITEMS.values():
                 symbol_item_ids.append(objects.get_special_ids()[symbol_name])
 
+        for special_name in objects.get_special_ids().keys():
+                if special_name.begins_with("Anti "):
+                        anti_trap_ids[objects.get_special_ids()[special_name]] = (
+                                special_name.substr(5).to_lower()
+                        )
+
 
 func get_door_for_map_node_path(map_name, node_path):
         if not door_id_by_map_node_path.has(map_name):
@@ -4,6 +4,7 @@ const kALL_LETTERS = "abcdefghjiklmnopqrstuvwxyz"
 
 var letters_saved = {}
 var letters_in_keyholders = []
+var letters_blocked = []
 var letters_dynamic = {}
 var keyholder_state = {}
 
@@ -17,6 +18,7 @@ func _init():
 func reset():
         letters_saved.clear()
         letters_in_keyholders.clear()
+        letters_blocked.clear()
         letters_dynamic.clear()
         keyholder_state.clear()
 
@@ -91,6 +93,9 @@ func update_unlocks():
                         level = 2
                         has_doubles = true
 
+                if letters_blocked.has(k):
+                        level = 0
+
                 unlocks.unlockKey(k, level)
 
         if has_doubles and unlocks.data["double_letters"] != "unlocked":
@@ -105,6 +110,9 @@ func collect_local_letter(key, level):
 
         letters_saved[key] = level
 
+        if letters_blocked.has(key):
+                letters_blocked.erase(key)
+
         update_unlocks()
         save()
 
@@ -115,6 +123,9 @@ func collect_remote_letter(key, level):
 
         letters_dynamic[key] = level
 
+        if letters_blocked.has(key):
+                letters_blocked.erase(key)
+
         update_unlocks()
         save()
 
@@ -148,6 +159,13 @@ func remove_from_keyholder(key, map, kh_path):
         save()
 
 
+func block_letter(key):
+        if not letters_blocked.has(key):
+                letters_blocked.append(key)
+
+        update_unlocks()
+
+
 func load_keyholders(map):
         if keyholder_state.has(map):
                 var khs = keyholder_state[map]
@@ -160,9 +178,11 @@ func load_keyholders(map):
 
 
 func reset_keyholders():
-        if letters_in_keyholders.is_empty():
+        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):
                 for path in keyholder_state[global.map]:
                         get_tree().get_root().get_node("scene").get_node(path).setFromAp(
@@ -171,8 +191,9 @@ func reset_keyholders():
 
         keyholder_state.clear()
         letters_in_keyholders.clear()
+        letters_blocked.clear()
 
         update_unlocks()
         save()
 
-        return true
+        return cleared_anything
@@ -1,6 +1,6 @@
 extends Node
 
-const MOD_VERSION = 0
+const MOD_VERSION = 7
 
 var SCRIPT_client
 var SCRIPT_keyboard
@@ -12,6 +12,7 @@ var ap_server = ""
 var ap_user = ""
 var ap_pass = ""
 var connection_history = []
+var show_compass = false
 
 var client
 var keyboard
@@ -41,13 +42,17 @@ const kCYAN_DOOR_BEHAVIOR_H2 = 0
 const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1
 const kCYAN_DOOR_BEHAVIOR_ITEM = 2
 
+var apworld_version = [0, 0]
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var keyholder_sanity = false
 var shuffle_control_center_colors = false
 var shuffle_doors = false
+var shuffle_gallery_paintings = false
 var shuffle_letters = kSHUFFLE_LETTERS_VANILLA
 var shuffle_symbols = false
+var strict_cyan_ending = false
+var strict_purple_ending = false
 var victory_condition = -1
 
 signal could_not_connect
@@ -78,6 +83,9 @@ func _init():
                 if data.size() > 3:
                         connection_history = data[3]
 
+                if data.size() > 4:
+                        show_compass = data[4]
+
 
 func _ready():
         client = SCRIPT_client.new()
@@ -106,6 +114,7 @@ func saveSettings():
                 ap_user,
                 ap_pass,
                 connection_history,
+                show_compass,
         ]
         file.store_var(data, true)
         file.close()
@@ -213,6 +222,9 @@ func _process_item(item, index, from, flags, amount):
                                 "Received [color=%s]%s[/color] from %s" % [item_color, full_item_name, player_name]
                         )
 
+                if gamedata.anti_trap_ids.has(item):
+                        keyboard.block_letter(gamedata.anti_trap_ids[item])
+
                 global._print(message)
 
                 global.get_node("Messages").showMessage(message)
@@ -307,6 +319,10 @@ func parse_printjson_for_textclient(message):
 func _process_location_scout(item_id, location_id, player, flags):
         _location_scouts[location_id] = {"item": item_id, "player": player, "flags": flags}
 
+        if player == client._slot and flags & 4 != 0:
+                # This is a trap for us, so let's not display it.
+                return
+
         var gamedata = global.get_node("Gamedata")
         var map_id = gamedata.map_id_by_name.get(global.map)
 
@@ -327,8 +343,8 @@ func _process_location_scout(item_id, location_id, player, flags):
                                 collectable.setScoutedText(item_name)
 
 
-func _client_could_not_connect():
-        emit_signal("could_not_connect")
+func _client_could_not_connect(message):
+        emit_signal("could_not_connect", message)
 
 
 func _client_connect_status(message):
@@ -361,10 +377,16 @@ func _client_connected(slot_data):
         keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
         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))
         shuffle_letters = int(slot_data.get("shuffle_letters", 0))
         shuffle_symbols = bool(slot_data.get("shuffle_symbols", false))
+        strict_cyan_ending = bool(slot_data.get("strict_cyan_ending", false))
+        strict_purple_ending = bool(slot_data.get("strict_purple_ending", false))
         victory_condition = int(slot_data.get("victory_condition", 0))
 
+        if slot_data.has("version"):
+                apworld_version = [int(slot_data["version"][0]), int(slot_data["version"][1])]
+
         # Set up item locks.
         _item_locks = {}
 
@@ -399,6 +421,11 @@ func _client_connected(slot_data):
                                 for door in door_group.get_doors():
                                         _item_locks[door] = [door_group.get_ap_id(), 1]
 
+        if shuffle_gallery_paintings:
+                for door in gamedata.objects.get_doors():
+                        if door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING:
+                                _item_locks[door.get_id()] = [door.get_ap_id(), 1]
+
         if cyan_door_behavior == kCYAN_DOOR_BEHAVIOR_ITEM:
                 for door_group in gamedata.objects.get_door_groups():
                         if door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.CYAN_DOORS:
@@ -511,4 +538,7 @@ func _process_key_item(key, level):
                 _held_letters[key] = max(_held_letters.get(key, 0), level)
                 return
 
+        if shuffle_letters == kSHUFFLE_LETTERS_ITEM_CYAN:
+                level += 1
+
         keyboard.collect_remote_letter(key, level)
@@ -48,10 +48,11 @@ func showMessage(text):
         while !_ordered_labels.is_empty():
                 await get_tree().create_timer(timeout).timeout
 
-                var to_remove = _ordered_labels.pop_front()
-                var to_tween = get_tree().create_tween().bind_node(to_remove)
-                to_tween.tween_property(to_remove, "modulate:a", 0.0, 0.5)
-                to_tween.tween_callback(to_remove.queue_free)
+                if !_ordered_labels.is_empty():
+                        var to_remove = _ordered_labels.pop_front()
+                        var to_tween = get_tree().create_tween().bind_node(to_remove)
+                        to_tween.tween_property(to_remove, "modulate:a", 0.0, 0.5)
+                        to_tween.tween_callback(to_remove.queue_free)
 
                 if !_message_queue.is_empty():
                         var next_msg = _message_queue.pop_front()
@@ -59,3 +60,12 @@ func showMessage(text):
 
                 if timeout > 4:
                         timeout -= 3
+
+
+func clear():
+        _message_queue.clear()
+
+        for message_label in _ordered_labels:
+                message_label.queue_free()
+
+        _ordered_labels.clear()
@@ -1,5 +1,26 @@
 extends "res://scripts/ui/pauseMenu.gd"
 
+var compass_button
+
+
+func _ready():
+        var ap_panel = Panel.new()
+        ap_panel.name = "Archipelago"
+        get_node("menu/settings/settingsInner/TabContainer").add_child(ap_panel)
+
+        var ap = global.get_node("Archipelago")
+
+        compass_button = CheckBox.new()
+        compass_button.text = "show compass"
+        compass_button.button_pressed = ap.show_compass
+        compass_button.position = Vector2(65, 100)
+        compass_button.theme = preload("res://assets/themes/baseUI.tres")
+        compass_button.add_theme_font_size_override("font_size", 60)
+        compass_button.pressed.connect(_toggle_compass)
+        ap_panel.add_child(compass_button)
+
+        super._ready()
+
 
 func _pause_game():
         global.get_node("Textclient").dismiss()
@@ -9,4 +30,15 @@ func _pause_game():
 func _main_menu():
         global.loaded = false
         global.get_node("Archipelago").disconnect_from_ap()
+        global.get_node("Messages").clear()
+        global.get_node("Compass").visible = false
         super._main_menu()
+
+
+func _toggle_compass():
+        var ap = global.get_node("Archipelago")
+        ap.show_compass = compass_button.button_pressed
+        ap.saveSettings()
+
+        var compass = global.get_node("Compass")
+        compass.visible = compass_button.button_pressed
@@ -18,6 +18,8 @@ const kEndingNameByVictoryValue = {
 
 signal evaluate_solvability
 
+var compass
+
 
 func _ready():
         var khl_script = load("res://scripts/nodes/keyHolderListener.gd")
@@ -25,6 +27,9 @@ func _ready():
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
 
+        compass = global.get_node("Compass")
+        compass.visible = ap.show_compass
+
         ap.start_batching_locations()
 
         # Set up door locations.
@@ -36,7 +41,10 @@ func _ready():
                 if not door.has_ap_id():
                         continue
 
-                if door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY:
+                if (
+                        door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
+                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
+                ):
                         continue
 
                 var locationListener = ap.SCRIPT_locationListener.new()
@@ -68,6 +76,12 @@ func _ready():
 
                         locationListener.senders.append(NodePath("../" + khl.name))
 
+                for sender in door.get_senders():
+                        locationListener.senders.append(NodePath("/root/scene/" + sender))
+
+                if door.has_complete_at():
+                        locationListener.complete_at = door.get_complete_at()
+
                 get_parent().add_child.call_deferred(locationListener)
 
         # Set up letter locations.
@@ -88,7 +102,10 @@ func _ready():
                         != ap.kLETTER_BEHAVIOR_VANILLA
                 ):
                         var scout = ap.scout_location(letter.get_ap_id())
-                        if scout != null:
+                        if (
+                                scout != null
+                                and not (scout["player"] == ap.client._slot and scout["flags"] & 4 != 0)
+                        ):
                                 var item_name = "Unknown"
                                 var item_player_game = ap.client._game_by_player[float(scout["player"])]
                                 if ap.client._item_id_to_name[item_player_game].has(scout["item"]):
@@ -190,11 +207,132 @@ func _ready():
                 warp_enter.rotation_degrees.y = 90
                 get_parent().add_child.call_deferred(warp_enter)
 
-        # Remove door behind X1.
         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" % kEndingNameByVictoryValue.get(ap.victory_condition, "?")
+
+                var sign2_color = 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 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()
+
         super._ready()
 
         await get_tree().process_frame
@@ -218,3 +356,7 @@ func _set_up_invis_wall(x, y, z, sx, sy, sz):
         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,3 +7,17 @@ func levelLoaded():
                 ap.keyboard.load_keyholders.call_deferred(global.map)
         else:
                 reload.call_deferred()
+
+
+func reload():
+        # Just rewriting this whole thing so I can remove Chris's safeguard.
+        var file = FileAccess.open(path + type + ".save", FileAccess.READ)
+        if file:
+                var data = file.get_var(true)
+                file.close()
+                for datum in data:
+                        var saveable = get_node_or_null(datum[0])
+                        if saveable != null:
+                                saveable.is_complete = datum[1]
+                                if saveable.is_complete:
+                                        saveable.loadData(saveable.is_complete)
@@ -44,8 +44,10 @@ func _ready():
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pauseMenu.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/saver.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleportListener.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/visibilityListener.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldport.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldportListener.gd"))
 
                 var proto_script = load("user://maps/Archipelago/generated/proto.gd")
@@ -67,6 +69,12 @@ func _ready():
                 textclient_instance.name = "Textclient"
                 global.add_child(textclient_instance)
 
+                var compass_overlay_script = load("user://maps/Archipelago/compass_overlay.gd")
+                var compass_overlay_instance = compass_overlay_script.new()
+                compass_overlay_instance.name = "Compass"
+                compass_overlay_instance.SCRIPT_compass = load("user://maps/Archipelago/compass.gd")
+                global.add_child(compass_overlay_instance)
+
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
         ap.connect("ap_connected", connectionSuccessful)
@@ -99,6 +107,10 @@ func _ready():
         $Panel/player_box.add_theme_font_size_override("font_size", 36)
         $Panel/password_box.add_theme_font_size_override("font_size", 36)
 
+        # Set up version mismatch dialog.
+        $Panel/VersionMismatch.connect("confirmed", startGame)
+        $Panel/VersionMismatch.get_cancel_button().pressed.connect(versionMismatchDeclined)
+
 
 # Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd
 func installScriptExtension(childScript: Resource):
@@ -128,6 +140,33 @@ func connectionStatus(message):
 
 func connectionSuccessful():
         var ap = global.get_node("Archipelago")
+        var gamedata = global.get_node("Gamedata")
+
+        # Check for major version mismatch.
+        if ap.apworld_version[0] != gamedata.objects.get_version():
+                $Panel/AcceptDialog.exclusive = false
+
+                var popup = self.get_node("Panel/VersionMismatch")
+                popup.title = "Version Mismatch!"
+                popup.dialog_text = (
+                        "This slot was generated using v%d.%d of the Lingo 2 apworld,\nwhich has a different major version than this client (v%d.%d).\nIt is highly recommended to play using the correct version of the client.\nYou may experience bugs or logic issues if you continue."
+                        % [
+                                ap.apworld_version[0],
+                                ap.apworld_version[1],
+                                gamedata.objects.get_version(),
+                                ap.MOD_VERSION
+                        ]
+                )
+                popup.exclusive = true
+                popup.popup_centered()
+
+                return
+
+        startGame()
+
+
+func startGame():
+        var ap = global.get_node("Archipelago")
 
         # Save connection details
         var connection_details = [ap.ap_server, ap.ap_user, ap.ap_pass]
@@ -166,6 +205,8 @@ func connectionSuccessful():
         clearResourceCache("res://objects/nodes/panel.tscn")
         clearResourceCache("res://objects/nodes/player.tscn")
         clearResourceCache("res://objects/nodes/saver.tscn")
+        clearResourceCache("res://objects/nodes/teleport.tscn")
+        clearResourceCache("res://objects/nodes/worldport.tscn")
         clearResourceCache("res://objects/scenes/menus/pause_menu.tscn")
 
         var paintings_dir = DirAccess.open("res://objects/meshes/paintings")
@@ -190,6 +231,13 @@ func connectionUnsuccessful(error_message):
         popup.get_ok_button().visible = true
         popup.popup_centered()
 
+        $Panel/connect_button.disabled = false
+
+
+func versionMismatchDeclined():
+        $Panel/AcceptDialog.hide()
+        $Panel/connect_button.disabled = false
+
 
 func historySelected(index):
         var ap = global.get_node("Archipelago")
@@ -0,0 +1,38 @@
+extends "res://scripts/nodes/teleport.gd"
+
+var item_id
+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 = []
+
+                        call_deferred("_readier")
+
+        super._ready()
+
+
+func _readier():
+        var ap = global.get_node("Archipelago")
+
+        if ap.client.getItemAmount(item_id) >= item_amount:
+                handleTriggered()
@@ -9,6 +9,17 @@ func _ready():
                 get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names()
         )
 
+        if (
+                global.map == "daedalus"
+                and (
+                        node_path == "Components/Triggers/teleportListenerConnections"
+                        or node_path == "Components/Triggers/teleportListenerConnections2"
+                )
+        ):
+                # Effectively disable these.
+                teleport_point = target_path.position
+                return
+
         var gamedata = global.get_node("Gamedata")
         var door_id = gamedata.get_door_for_map_node_path(global.map, node_path)
         if door_id != null:
@@ -0,0 +1,10 @@
+extends "res://scripts/nodes/worldport.gd"
+
+
+func _ready():
+        if global.map == "icarus" and exit == "daedalus":
+                var ap = global.get_node("Archipelago")
+                if not ap.daedalus_roof_access:
+                        entry_point = Vector3(58, 10, 0)
+
+        super._ready()
@@ -1,8 +1,8 @@
 extends "res://scripts/nodes/listeners/worldportListener.gd"
 
 
-func changeScene():
+func handleTriggered():
         if exit == "menus/credits":
                 return
 
-        super.changeScene()
+        super.handleTriggered()