3 files changed, 19 insertions, 1 deletions

@@ -124,6 +124,11 @@ func _connected(_proto = ""):
         global._print("Connected!")
 
 
+func disconnect_from_ap():
+        _initiated_disconnect = true
+        _client.disconnect_from_host()
+
+
 func _on_data():
         var packet = _client.get_peer(1).get_packet()
         global._print("Got data from server: " + packet.get_string_from_utf8())
@@ -388,7 +393,13 @@ func connectToServer():
         var url = "ws://" + ap_server
         var err = _client.connect_to_url(url)
         if err != OK:
-                emit_signal("could_not_connect", "Could not connect to Archipelago. Error code: %d." % err)
+                emit_signal(
+                        "could_not_connect",
+                        (
+                                "Could not connect to Archipelago. Check that your server and port are correct. See the error log for more information. Error code: %d."
+                                % err
+                        )
+                )
                 global._print("Could not connect to AP: " + err)
                 return
         _should_process = true
@@ -6,6 +6,8 @@ func _ready():
 
 
 func _connect_pressed():
+        self.disabled = true
+
         var apclient = global.get_node("Archipelago")
         apclient.ap_server = self.get_parent().get_node("server_box").text
         apclient.ap_user = self.get_parent().get_node("player_box").text
@@ -16,4 +18,7 @@ func _connect_pressed():
 
 
 func _back_pressed():
+        var apclient = global.get_node("Archipelago")
+        apclient.disconnect_from_ap()
+
         fader._fade_start("main_menu")
@@ -66,6 +66,8 @@ func connectionSuccessful():
 
 
 func connectionUnsuccessful(error_message):
+        self.get_node("Panel/connect_button").disabled = false
+
         var popup = self.get_node("Panel/AcceptDialog")
         popup.window_title = "Could not connect to Archipelago"
         popup.dialog_text = error_message