From bb4b16ca06c70cf263424955713c91117f2f1813 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 6 Sep 2025 09:20:28 -0400 Subject: [Client] Handle letter shuffle Cyan doors are not handled properly yet. --- client/Archipelago/settings_screen.gd | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'client/Archipelago/settings_screen.gd') diff --git a/client/Archipelago/settings_screen.gd b/client/Archipelago/settings_screen.gd index ed9571d..aaaf72a 100644 --- a/client/Archipelago/settings_screen.gd +++ b/client/Archipelago/settings_screen.gd @@ -22,14 +22,8 @@ func _ready(): var ap_instance = ap_script.new() ap_instance.name = "Archipelago" - #apclient_instance.SCRIPT_doorControl = load("user://maps/Archipelago/doorControl.gd") - #apclient_instance.SCRIPT_effects = load("user://maps/Archipelago/effects.gd") - #apclient_instance.SCRIPT_location = load("user://maps/Archipelago/location.gd") - #apclient_instance.SCRIPT_mypainting = load("user://maps/Archipelago/mypainting.gd") - #apclient_instance.SCRIPT_panel = load("user://maps/Archipelago/panel.gd") - #apclient_instance.SCRIPT_textclient = load("user://maps/Archipelago/textclient.gd") - ap_instance.SCRIPT_client = load("user://maps/Archipelago/client.gd") + ap_instance.SCRIPT_keyboard = load("user://maps/Archipelago/keyboard.gd") ap_instance.SCRIPT_locationListener = load("user://maps/Archipelago/locationListener.gd") ap_instance.SCRIPT_uuid = load("user://maps/Archipelago/vendor/uuid.gd") ap_instance.SCRIPT_victoryListener = load("user://maps/Archipelago/victoryListener.gd") @@ -38,7 +32,13 @@ func _ready(): # Let's also inject any scripts we need to inject now. installScriptExtension(ResourceLoader.load("user://maps/Archipelago/animationListener.gd")) + installScriptExtension(ResourceLoader.load("user://maps/Archipelago/collectable.gd")) installScriptExtension(ResourceLoader.load("user://maps/Archipelago/door.gd")) + installScriptExtension(ResourceLoader.load("user://maps/Archipelago/keyHolder.gd")) + installScriptExtension(ResourceLoader.load("user://maps/Archipelago/keyHolderChecker.gd")) + installScriptExtension( + ResourceLoader.load("user://maps/Archipelago/keyHolderResetterListener.gd") + ) installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting.gd")) installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pauseMenu.gd")) installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd")) @@ -141,17 +141,22 @@ func connectionSuccessful(): global.universe = "lingo" global.map = "the_entry" - unlocks.resetKeys() unlocks.resetCollectables() unlocks.resetData() - unlocks.loadKeys() + + ap.setup_keys() + unlocks.loadCollectables() unlocks.loadData() unlocks.unlockKey("capslock", 1) clearResourceCache("res://objects/meshes/gridDoor.tscn") + clearResourceCache("res://objects/nodes/collectable.tscn") clearResourceCache("res://objects/nodes/door.tscn") + clearResourceCache("res://objects/nodes/keyHolder.tscn") clearResourceCache("res://objects/nodes/listeners/animationListener.tscn") + 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/worldportListener.tscn") clearResourceCache("res://objects/nodes/player.tscn") -- cgit 1.4.1