6 files changed, 45 insertions, 4 deletions

@@ -3,6 +3,7 @@ extends Node
 var SCRIPT_doorControl
 var SCRIPT_effects
 var SCRIPT_location
+var SCRIPT_multiplayer
 var SCRIPT_mypainting
 var SCRIPT_notifier
 var SCRIPT_panel
@@ -12,6 +13,7 @@ var ap_server = ""
 var ap_user = ""
 var ap_pass = ""
 var confusify_world = false
+var enable_multiplayer = false
 
 const my_version = "0.15.1"
 const ap_version = {"major": 0, "minor": 4, "build": 0, "class": "Version"}
@@ -137,6 +139,8 @@ func _init():
                         _datapackages = data[3]
                 if data.size() > 4:
                         confusify_world = data[4]
+                if data.size() > 5:
+                        enable_multiplayer = data[5]
 
                 processDatapackages()
 
@@ -431,7 +435,7 @@ func saveSettings():
         var file = File.new()
         file.open("user://settings/archipelago", File.WRITE)
 
-        var data = [ap_server, ap_user, ap_pass, _datapackages, confusify_world]
+        var data = [ap_server, ap_user, ap_pass, _datapackages, confusify_world, enable_multiplayer]
         file.store_var(data, true)
         file.close()
 
@@ -471,6 +471,12 @@ func _load():
         effects.set_name("AP_Effects")
         self.add_child(effects)
 
+        # Create the multiplayer node, if needed.
+        if apclient.enable_multiplayer:
+                var multiplayer_node = apclient.SCRIPT_multiplayer.new()
+                multiplayer_node.ghost_mode = true
+                add_child(multiplayer_node)
+
         # Hook up the scene to be able to handle connection failures.
         apclient.connect("could_not_connect", self, "archipelago_disconnected")
 
@@ -0,0 +1,20 @@
+extends "res://scripts/multiplayer.gd"
+
+
+func _request_lobby_list():
+        var apclient = global.get_node("Archipelago")
+        Steam.addRequestLobbyListStringFilter(
+                "archipelago", apclient._seed, Steam.LOBBY_COMPARISON_EQUAL
+        )
+
+        ._request_lobby_list()
+
+
+func _on_lobby_created(result: int, lobby_id: int) -> void:
+        if result != Steam.RESULT_OK:
+                return
+
+        var apclient = global.get_node("Archipelago")
+        var _ignore = Steam.setLobbyData(lobby_id, "archipelago", apclient._seed)
+
+        ._on_lobby_created(result, lobby_id)
@@ -13,6 +13,7 @@ func _connect_pressed():
         apclient.ap_user = self.get_parent().get_node("player_box").text
         apclient.ap_pass = self.get_parent().get_node("password_box").text
         apclient.confusify_world = self.get_parent().get_node("confusing_box").pressed
+        apclient.enable_multiplayer = self.get_parent().get_node("multiplayer_box").pressed
         apclient.saveSettings()
 
         apclient.connectToServer()
@@ -20,6 +20,7 @@ func _ready():
                 apclient_instance.SCRIPT_doorControl = load("user://maps/Archipelago/doorControl.gd")
                 apclient_instance.SCRIPT_effects = load("user://maps/Archipelago/effects.gd")
                 apclient_instance.SCRIPT_location = load("user://maps/Archipelago/location.gd")
+                apclient_instance.SCRIPT_multiplayer = load("user://maps/Archipelago/multiplayer.gd")
                 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")
@@ -52,6 +53,7 @@ func _ready():
         self.get_node("Panel/player_box").text = apclient.ap_user
         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
 
         # Show client version.
         self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version
@@ -79,9 +81,7 @@ func installScriptExtension(childScript: Resource):
 
         var parentScript = childScript.get_base_script()
         var parentScriptPath = parentScript.resource_path
-        global._print(
-                "ModLoader: Installing script extension over %s" % parentScriptPath
-        )
+        global._print("ModLoader: Installing script extension over %s" % parentScriptPath)
         childScript.take_over_path(parentScriptPath)
 
 
@@ -163,5 +163,15 @@ custom_icons/checked = ExtResource( 8 )
 custom_icons/unchecked = ExtResource( 7 )
 text = "Make world more confusing"
 
+[node name="multiplayer_box" type="CheckBox" parent="Panel"]
+margin_left = 1227.0
+margin_top = 461.0
+margin_right = 1832.0
+margin_bottom = 549.0
+custom_fonts/font = ExtResource( 6 )
+custom_icons/checked = ExtResource( 8 )
+custom_icons/unchecked = ExtResource( 7 )
+text = "Show other players"
+
 [connection signal="pressed" from="Panel/connect_button" to="Panel/connect_button" method="_connect_pressed"]
 [connection signal="pressed" from="Panel/quit_button" to="Panel/quit_button" method="_back_pressed"]