Merge branch 'main' into sunwarps

1 files changed, 44 insertions, 1 deletions

@@ -2,6 +2,12 @@ extends Spatial
 
 
 func _ready():
+        # Some helpful logging.
+        if Steam.isSubscribed():
+                global._print("Provisioning successful! Build ID: %d" % Steam.getAppBuildId())
+        else:
+                global._print("Provisioning failed.")
+
         # Undo the load screen removing our cursor
         get_tree().get_root().set_disable_input(false)
         Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
@@ -62,6 +68,20 @@ func _ready():
         self.get_node("Panel/password_box").text = apclient.ap_pass
         self.get_node("Panel/confusing_box").pressed = apclient.confusify_world
         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
@@ -105,10 +125,24 @@ 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.map = "level1"
         global.save_file = apclient.getSaveFileName()
+
+        if Directory.new().file_exists("user://level1/%s.save" % global.save_file):
+                global.map = "level1"
+        else:
+                global.map = "level1_stable"
+
         var _discard = get_tree().change_scene("res://scenes/load_screen.tscn")
 
 
@@ -121,3 +155,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]