1 files changed, 35 insertions, 0 deletions

@@ -30,6 +30,8 @@ func _ready():
                 apclient_instance.SCRIPT_mypainting = load("user://maps/Archipelago/mypainting.gd")
                 apclient_instance.SCRIPT_notifier = load("user://maps/Archipelago/notifier.gd")
                 apclient_instance.SCRIPT_panel = load("user://maps/Archipelago/panel.gd")
+                var pilg_term = load("user://maps/Archipelago/pilgrimage_terminator.gd")
+                apclient_instance.SCRIPT_pilgrimage_terminator = pilg_term
                 apclient_instance.SCRIPT_uuid = load("user://maps/Archipelago/vendor/uuid.gd")
 
                 var apdata = ResourceLoader.load("user://maps/Archipelago/gamedata.gd")
@@ -45,6 +47,7 @@ func _ready():
                 # Let's also inject any scripts we need to inject now.
                 installScriptExtension(apclient_instance.SCRIPT_doorControl)
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/load.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_eye.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_scenery.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelLevelSwitch.gd"))
@@ -52,6 +55,7 @@ func _ready():
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd"))
 
         var apclient = global.get_node("Archipelago")
@@ -67,6 +71,19 @@ func _ready():
         self.get_node("Panel/multiplayer_box").pressed = apclient.enable_multiplayer
         self.get_node("Panel/position_box").pressed = apclient.track_player
 
+        var history_box = get_node("Panel/connection_history")
+        if apclient.connection_history.empty():
+                history_box.disabled = true
+        else:
+                history_box.disabled = false
+
+                var i = 0
+                for details in apclient.connection_history:
+                        history_box.get_popup().add_item("%s (%s)" % [details[1], details[0]], i)
+                        i += 1
+
+        history_box.get_popup().connect("id_pressed", self, "historySelected")
+
         # Show client version.
         self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version
 
@@ -109,6 +126,15 @@ func connectionStatus(message):
 func connectionSuccessful():
         var apclient = global.get_node("Archipelago")
 
+        # Save connection details
+        var connection_details = [apclient.ap_server, apclient.ap_user, apclient.ap_pass]
+        if apclient.connection_history.has(connection_details):
+                apclient.connection_history.erase(connection_details)
+        apclient.connection_history.push_front(connection_details)
+        if apclient.connection_history.size() > 10:
+                apclient.connection_history.resize(10)
+        apclient.saveSettings()
+
         # Switch to LL1
         Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
         global.save_file = apclient.getSaveFileName()
@@ -130,3 +156,12 @@ func connectionUnsuccessful(error_message):
         popup.popup_exclusive = true
         popup.get_ok().visible = true
         popup.popup_centered()
+
+
+func historySelected(index):
+        var apclient = global.get_node("Archipelago")
+        var details = apclient.connection_history[index]
+
+        self.get_node("Panel/server_box").text = details[0]
+        self.get_node("Panel/player_box").text = details[1]
+        self.get_node("Panel/password_box").text = details[2]