3 files changed, 59 insertions, 31 deletions

@@ -0,0 +1,44 @@
+extends Node
+
+var ap_server = ""
+var ap_user = ""
+var ap_pass = ""
+
+
+func _init():
+        global._print("Instantiated APClient")
+
+        # Read AP settings from file, if there are any
+        var file = File.new()
+        if file.file_exists("user://settings/archipelago"):
+                file.open("user://settings/archipelago", File.READ)
+                var data = file.get_var(true)
+                file.close()
+
+                if data.size() > 0:
+                        ap_server = data[0]
+                if data.size() > 1:
+                        ap_user = data[1]
+                if data.size() > 2:
+                        ap_pass = data[2]
+
+
+func _ready():
+        pass
+
+
+func saveSettings():
+        # Save the AP settings to disk.
+        var dir = Directory.new()
+        var path = "user://settings"
+        if dir.dir_exists(path):
+                pass
+        else:
+                dir.make_dir(path)
+
+        var file = File.new()
+        file.open("user://settings/archipelago", File.WRITE)
+
+        var data = [ap_server, ap_user, ap_pass]
+        file.store_var(data, true)
+        file.close()
@@ -6,25 +6,11 @@ func _ready():
 
 
 func _connect_pressed():
-        # Save the AP settings to disk.
-        var dir = Directory.new()
-        var path = "user://settings"
-        if dir.dir_exists(path):
-                pass
-        else:
-                dir.make_dir(path)
-
-        var file = File.new()
-        file.open("user://settings/archipelago", File.WRITE)
-
-        var data = [
-                self.get_parent().get_node("server_box").text,
-                self.get_parent().get_node("player_box").text,
-                self.get_parent().get_node("password_box").text
-        ]
-
-        file.store_var(data, true)
-        file.close()
+        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
+        apclient.ap_pass = self.get_parent().get_node("password_box").text
+        apclient.saveSettings()
 
 
 func _back_pressed():
@@ -6,16 +6,14 @@ func _ready():
         get_tree().get_root().set_disable_input(false)
         Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
 
-        # Read AP settings from file, if there are any
-        var file = File.new()
-        if file.file_exists("user://settings/archipelago"):
-                file.open("user://settings/archipelago", File.READ)
-                var data = file.get_var(true)
-                file.close()
+        # Create the global AP client, if it doesn't already exist.
+        if not global.has_node("Archipelago"):
+                var apclient = ResourceLoader.load("user://maps/Archipelago/client.gd")
+                var apclient_instance = apclient.new()
+                apclient_instance.name = "Archipelago"
+                global.add_child(apclient_instance)
 
-                if data.size() > 0:
-                        self.get_node("Panel/server_box").text = data[0]
-                if data.size() > 1:
-                        self.get_node("Panel/player_box").text = data[1]
-                if data.size() > 2:
-                        self.get_node("Panel/password_box").text = data[2]
+        # Populate textboxes with AP settings.
+        self.get_node("Panel/server_box").text = global.get_node("Archipelago").ap_server
+        self.get_node("Panel/player_box").text = global.get_node("Archipelago").ap_user
+        self.get_node("Panel/password_box").text = global.get_node("Archipelago").ap_pass