From 05827d25733698a26cc0f305966e6a8a03be4684 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Thu, 25 Sep 2025 18:26:53 -0400 Subject: Game talks through CommonClient now --- apworld/client/main.gd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'apworld/client/main.gd') diff --git a/apworld/client/main.gd b/apworld/client/main.gd index cff92bc..9d66358 100644 --- a/apworld/client/main.gd +++ b/apworld/client/main.gd @@ -30,8 +30,8 @@ func _ready(): ap_instance.SCRIPT_keyboard = runtime.load_script("keyboard.gd") ap_instance.SCRIPT_locationListener = runtime.load_script("locationListener.gd") ap_instance.SCRIPT_minimap = runtime.load_script("minimap.gd") - ap_instance.SCRIPT_uuid = runtime.load_script("vendor/uuid.gd") ap_instance.SCRIPT_victoryListener = runtime.load_script("victoryListener.gd") + ap_instance.SCRIPT_websocketserver = runtime.load_script("vendor/WebSocketServer.gd") global.add_child(ap_instance) @@ -79,9 +79,9 @@ func _ready(): var ap = global.get_node("Archipelago") var gamedata = global.get_node("Gamedata") - ap.connect("ap_connected", connectionSuccessful) - ap.connect("could_not_connect", connectionUnsuccessful) - ap.connect("connect_status", connectionStatus) + ap.ap_connected.connect(connectionSuccessful) + ap.could_not_connect.connect(connectionUnsuccessful) + ap.connect_status.connect(connectionStatus) # Populate textboxes with AP settings. get_node("../Panel/server_box").text = ap.ap_server @@ -99,7 +99,7 @@ func _ready(): history_box.get_popup().add_item("%s (%s)" % [details[1], details[0]], i) i += 1 - history_box.get_popup().connect("id_pressed", historySelected) + history_box.get_popup().id_pressed.connect(historySelected) # Show client version. get_node("../Panel/title").text = ( @@ -112,14 +112,14 @@ func _ready(): get_node("../Panel/password_box").add_theme_font_size_override("font_size", 36) # Set up version mismatch dialog. - get_node("../Panel/VersionMismatch").connect("confirmed", startGame) + get_node("../Panel/VersionMismatch").confirmed.connect(startGame) get_node("../Panel/VersionMismatch").get_cancel_button().pressed.connect( versionMismatchDeclined ) # Set up buttons. - get_node("../Panel/connect_button").connect("pressed", _connect_pressed) - get_node("../Panel/quit_button").connect("pressed", _back_pressed) + get_node("../Panel/connect_button").pressed.connect(_connect_pressed) + get_node("../Panel/quit_button").pressed.connect(_back_pressed) func _connect_pressed(): -- cgit 1.4.1