36 files changed, 344 insertions, 84 deletions

@@ -1,7 +1,15 @@
 """
 Archipelago init file for Lingo 2
 """
+import asyncio
+import os.path
+import subprocess
+from typing import ClassVar
+
+import Utils
+import settings
 from BaseClasses import ItemClassification, Item, Tutorial
+from settings import Group, UserFilePath
 from worlds.AutoWorld import WebWorld, World
 from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS
 from .options import Lingo2Options
@@ -9,6 +17,30 @@ from .player_logic import Lingo2PlayerLogic
 from .regions import create_regions, shuffle_entrances, connect_ports_from_ut
 from .static_logic import Lingo2StaticLogic
 from .version import APWORLD_VERSION
+from ..LauncherComponents import Component, Type, components
+
+
+async def run_game():
+    exe_file = settings.get_settings().lingo2_options.exe_file
+
+    subprocess.Popen(
+        [
+            exe_file,
+            "--scene",
+            Utils.local_path("worlds", "lingo2", "client", "run_from_source.tscn"),
+            "--",
+            Utils.local_path("worlds", "lingo2", "client"),
+        ],
+        cwd=os.path.dirname(exe_file),
+    )
+
+
+async def client_main():
+    Utils.async_start(run_game())
+
+
+def launch_client(*args):
+    asyncio.run(client_main())
 
 
 class Lingo2WebWorld(WebWorld):
@@ -24,6 +56,14 @@ class Lingo2WebWorld(WebWorld):
     )]
 
 
+class Lingo2Settings(Group):
+    class ExecutableFile(UserFilePath):
+        """Path to the Lingo 2 executable"""
+        is_exe = True
+
+    exe_file: ExecutableFile = ExecutableFile()
+
+
 class Lingo2World(World):
     """
     Lingo 2 is a first person indie puzzle game where you solve word puzzles in a labyrinthe world. Compared to its
@@ -33,6 +73,9 @@ class Lingo2World(World):
     game = "Lingo 2"
     web = Lingo2WebWorld()
 
+    settings: ClassVar[Lingo2Settings]
+    settings_key = "lingo2_options"
+
     topology_present = True
 
     options_dataclass = Lingo2Options
@@ -1,7 +1,9 @@
-extends Node2D
+extends Node
 
 
 func _ready():
+        var runtime = global.get_node("Runtime")
+
         # Some helpful logging.
         if Steam.isSubscribed():
                 global._print("Provisioning successful! Build ID: %d" % Steam.getAppBuildId())
@@ -20,63 +22,59 @@ func _ready():
 
         # Create the global AP manager, if it doesn't already exist.
         if not global.has_node("Archipelago"):
-                var ap_script = ResourceLoader.load("user://maps/Archipelago/manager.gd")
+                var ap_script = runtime.load_path("manager.gd")
                 var ap_instance = ap_script.new()
                 ap_instance.name = "Archipelago"
 
-                ap_instance.SCRIPT_client = load("user://maps/Archipelago/client.gd")
-                ap_instance.SCRIPT_keyboard = load("user://maps/Archipelago/keyboard.gd")
-                ap_instance.SCRIPT_locationListener = load("user://maps/Archipelago/locationListener.gd")
-                ap_instance.SCRIPT_minimap = load("user://maps/Archipelago/minimap.gd")
-                ap_instance.SCRIPT_uuid = load("user://maps/Archipelago/vendor/uuid.gd")
-                ap_instance.SCRIPT_victoryListener = load("user://maps/Archipelago/victoryListener.gd")
+                ap_instance.SCRIPT_client = runtime.load_path("client.gd")
+                ap_instance.SCRIPT_keyboard = runtime.load_path("keyboard.gd")
+                ap_instance.SCRIPT_locationListener = runtime.load_path("locationListener.gd")
+                ap_instance.SCRIPT_minimap = runtime.load_path("minimap.gd")
+                ap_instance.SCRIPT_uuid = runtime.load_path("vendor/uuid.gd")
+                ap_instance.SCRIPT_victoryListener = runtime.load_path("victoryListener.gd")
 
                 global.add_child(ap_instance)
 
                 # Let's also inject any scripts we need to inject now.
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/animationListener.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/collectable.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/door.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/keyHolder.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/keyHolderChecker.gd"))
-                installScriptExtension(
-                        ResourceLoader.load("user://maps/Archipelago/keyHolderResetterListener.gd")
-                )
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panel.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pauseMenu.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/saver.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleportListener.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/visibilityListener.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldport.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldportListener.gd"))
-
-                var proto_script = load("user://maps/Archipelago/generated/proto.gd")
-                var gamedata_script = load("user://maps/Archipelago/gamedata.gd")
+                installScriptExtension(runtime.load_path("animationListener.gd"))
+                installScriptExtension(runtime.load_path("collectable.gd"))
+                installScriptExtension(runtime.load_path("door.gd"))
+                installScriptExtension(runtime.load_path("keyHolder.gd"))
+                installScriptExtension(runtime.load_path("keyHolderChecker.gd"))
+                installScriptExtension(runtime.load_path("keyHolderResetterListener.gd"))
+                installScriptExtension(runtime.load_path("painting.gd"))
+                installScriptExtension(runtime.load_path("panel.gd"))
+                installScriptExtension(runtime.load_path("pauseMenu.gd"))
+                installScriptExtension(runtime.load_path("player.gd"))
+                installScriptExtension(runtime.load_path("saver.gd"))
+                installScriptExtension(runtime.load_path("teleport.gd"))
+                installScriptExtension(runtime.load_path("teleportListener.gd"))
+                installScriptExtension(runtime.load_path("visibilityListener.gd"))
+                installScriptExtension(runtime.load_path("worldport.gd"))
+                installScriptExtension(runtime.load_path("worldportListener.gd"))
+
+                var proto_script = runtime.load_path("../generated/proto.gd")
+                var gamedata_script = runtime.load_path("gamedata.gd")
                 var gamedata_instance = gamedata_script.new(proto_script)
-                gamedata_instance.load(
-                        FileAccess.get_file_as_bytes("user://maps/Archipelago/generated/data.binpb")
-                )
+                gamedata_instance.load(runtime.read_path("../generated/data.binpb"))
                 gamedata_instance.name = "Gamedata"
                 global.add_child(gamedata_instance)
 
-                var messages_script = load("user://maps/Archipelago/messages.gd")
+                var messages_script = runtime.load_path("messages.gd")
                 var messages_instance = messages_script.new()
                 messages_instance.name = "Messages"
-                messages_instance.SCRIPT_rainbowText = load("user://maps/Archipelago/rainbowText.gd")
+                messages_instance.SCRIPT_rainbowText = runtime.load_path("rainbowText.gd")
                 global.add_child(messages_instance)
 
-                var textclient_script = load("user://maps/Archipelago/textclient.gd")
+                var textclient_script = runtime.load_path("textclient.gd")
                 var textclient_instance = textclient_script.new()
                 textclient_instance.name = "Textclient"
                 global.add_child(textclient_instance)
 
-                var compass_overlay_script = load("user://maps/Archipelago/compass_overlay.gd")
+                var compass_overlay_script = runtime.load_path("compass_overlay.gd")
                 var compass_overlay_instance = compass_overlay_script.new()
                 compass_overlay_instance.name = "Compass"
-                compass_overlay_instance.SCRIPT_compass = load("user://maps/Archipelago/compass.gd")
+                compass_overlay_instance.SCRIPT_compass = runtime.load_path("compass.gd")
                 global.add_child(compass_overlay_instance)
 
         var ap = global.get_node("Archipelago")
@@ -86,11 +84,11 @@ func _ready():
         ap.connect("connect_status", connectionStatus)
 
         # Populate textboxes with AP settings.
-        $Panel/server_box.text = ap.ap_server
-        $Panel/player_box.text = ap.ap_user
-        $Panel/password_box.text = ap.ap_pass
+        get_node("../Panel/server_box").text = ap.ap_server
+        get_node("../Panel/player_box").text = ap.ap_user
+        get_node("../Panel/password_box").text = ap.ap_pass
 
-        var history_box = $Panel/connection_history
+        var history_box = get_node("../Panel/connection_history")
         if ap.connection_history.is_empty():
                 history_box.disabled = true
         else:
@@ -104,16 +102,43 @@ func _ready():
         history_box.get_popup().connect("id_pressed", historySelected)
 
         # Show client version.
-        $Panel/title.text = "ARCHIPELAGO (%d.%d)" % [gamedata.objects.get_version(), ap.MOD_VERSION]
+        get_node("../Panel/title").text = (
+                "ARCHIPELAGO (%d.%d)" % [gamedata.objects.get_version(), ap.MOD_VERSION]
+        )
 
         # Increase font size in text boxes.
-        $Panel/server_box.add_theme_font_size_override("font_size", 36)
-        $Panel/player_box.add_theme_font_size_override("font_size", 36)
-        $Panel/password_box.add_theme_font_size_override("font_size", 36)
+        get_node("../Panel/server_box").add_theme_font_size_override("font_size", 36)
+        get_node("../Panel/player_box").add_theme_font_size_override("font_size", 36)
+        get_node("../Panel/password_box").add_theme_font_size_override("font_size", 36)
 
         # Set up version mismatch dialog.
-        $Panel/VersionMismatch.connect("confirmed", startGame)
-        $Panel/VersionMismatch.get_cancel_button().pressed.connect(versionMismatchDeclined)
+        get_node("../Panel/VersionMismatch").connect("confirmed", startGame)
+        get_node("../Panel/VersionMismatch").get_cancel_button().pressed.connect(
+                versionMismatchDeclined
+        )
+
+        # Set up buttons.
+        get_node("../Panel/connect_button").connect("pressed", _connect_pressed)
+        get_node("../Panel/quit_button").connect("pressed", _back_pressed)
+
+
+func _connect_pressed():
+        get_node("../Panel/connect_button").disabled = true
+
+        var ap = global.get_node("Archipelago")
+        ap.ap_server = get_node("../Panel/server_box").text
+        ap.ap_user = get_node("../Panel/player_box").text
+        ap.ap_pass = get_node("../Panel/password_box").text
+        ap.saveSettings()
+
+        ap.connectToServer()
+
+
+func _back_pressed():
+        var ap = global.get_node("Archipelago")
+        ap.disconnect_from_ap()
+
+        get_tree().quit()
 
 
 # Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd
@@ -134,7 +159,7 @@ func installScriptExtension(childScript: Resource):
 
 
 func connectionStatus(message):
-        var popup = self.get_node("Panel/AcceptDialog")
+        var popup = get_node("../Panel/AcceptDialog")
         popup.title = "Connecting to Archipelago"
         popup.dialog_text = message
         popup.exclusive = true
@@ -148,9 +173,9 @@ func connectionSuccessful():
 
         # Check for major version mismatch.
         if ap.apworld_version[0] != gamedata.objects.get_version():
-                $Panel/AcceptDialog.exclusive = false
+                get_node("../Panel/AcceptDialog").exclusive = false
 
-                var popup = self.get_node("Panel/VersionMismatch")
+                var popup = get_node("../Panel/VersionMismatch")
                 popup.title = "Version Mismatch!"
                 popup.dialog_text = (
                         "This slot was generated using v%d.%d of the Lingo 2 apworld,\nwhich has a different major version than this client (v%d.%d).\nIt is highly recommended to play using the correct version of the client.\nYou may experience bugs or logic issues if you continue."
@@ -231,30 +256,28 @@ func startGame():
 
 
 func connectionUnsuccessful(error_message):
-        $Panel/connect_button.disabled = false
+        get_node("../Panel/connect_button").disabled = false
 
-        var popup = $Panel/AcceptDialog
+        var popup = get_node("../Panel/AcceptDialog")
         popup.title = "Could not connect to Archipelago"
         popup.dialog_text = error_message
         popup.exclusive = true
         popup.get_ok_button().visible = true
         popup.popup_centered()
 
-        $Panel/connect_button.disabled = false
-
 
 func versionMismatchDeclined():
-        $Panel/AcceptDialog.hide()
-        $Panel/connect_button.disabled = false
+        get_node("../Panel/AcceptDialog").hide()
+        get_node("../Panel/connect_button").disabled = false
 
 
 func historySelected(index):
         var ap = global.get_node("Archipelago")
         var details = ap.connection_history[index]
 
-        $Panel/server_box.text = details[0]
-        $Panel/player_box.text = details[1]
-        $Panel/password_box.text = details[2]
+        get_node("../Panel/server_box").text = details[0]
+        get_node("../Panel/player_box").text = details[1]
+        get_node("../Panel/password_box").text = details[2]
 
 
 func clearResourceCache(path):
@@ -32,7 +32,14 @@ func _main_menu():
         global.get_node("Archipelago").disconnect_from_ap()
         global.get_node("Messages").clear()
         global.get_node("Compass").visible = false
-        super._main_menu()
+
+        autosplitter.reset()
+        _unpause_game()
+        Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
+        musicPlayer.stop()
+
+        var runtime = global.get_node("Runtime")
+        get_tree().change_scene_to_packed(runtime.load_path("settings_screen.tscn"))
 
 
 func _toggle_compass():
@@ -0,0 +1,23 @@
+[gd_scene load_steps=11 format=2]
+
+[sub_resource id=2 type="GDScript"]
+script/source = "extends Node2D
+
+
+func _ready():
+        var args = OS.get_cmdline_user_args()
+        var source_path = args[0]
+
+        var runtime_script = ResourceLoader.load(\"%s/source_runtime.gd\" % source_path)
+        var runtime = runtime_script.new(source_path)
+        runtime.name = \"Runtime\"
+
+        global.add_child(runtime)
+
+        var settings_screen = runtime.load_path(\"settings_screen.tscn\")
+        get_tree().change_scene_to_packed(settings_screen)
+
+"
+
+[node name="loader" type="Node2D"]
+script = SubResource( 2 )
@@ -0,0 +1,173 @@
+[gd_scene load_steps=11 format=2]
+
+[ext_resource path="res://images/unchecked.png" type="Texture" id=7]
+[ext_resource path="res://images/checked.png" type="Texture" id=8]
+[ext_resource type="Theme" uid="uid://7w454egydi41" path="res://assets/themes/baseUI.tres" id="2_g4bvn"]
+
+[sub_resource type="StyleBoxFlat" id=1]
+bg_color = Color( 0, 0, 0, 0 )
+
+[sub_resource type="StyleBoxFlat" id=2]
+bg_color = Color( 1, 1, 1, 1 )
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color( 1, 1, 0, 1 )
+border_blend = true
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+expand_offset_left = 5.0
+expand_offset_right = 5.0
+expand_offset_top = 5.0
+expand_offset_bottom = 5.0
+
+[sub_resource id=4 type="GDScript"]
+script/source = "extends Node2D
+
+
+func _ready():
+        var runtime = global.get_node(\"Runtime\")
+        var main_script = runtime.load_path(\"main.gd\")
+        var main_node = main_script.new()
+        main_node.name = \"Main\"
+        add_child(main_node)
+
+"
+
+[node name="settings_screen" type="Node2D"]
+script = SubResource( 4 )
+
+[node name="Panel" type="Panel" parent="."]
+offset_right = 1920.0
+offset_bottom = 1080.0
+
+[node name="title" parent="Panel" type="Label"]
+offset_left = 0.0
+offset_top = 75.0
+offset_right = 1920.0
+offset_bottom = 225.0
+text = "ARCHIPELAGO"
+valign = 1
+horizontal_alignment = 1
+theme = ExtResource("2_g4bvn")
+
+[node name="credit" parent="Panel" type="Label"]
+visible = false
+offset_left = 1278.0
+offset_top = 974.0
+offset_right = 1868.0
+offset_bottom = 1034.0
+text = "Brenton Wildes"
+theme = ExtResource("2_g4bvn")
+
+[node name="connect_button" parent="Panel" type="Button"]
+offset_left = 255.0
+offset_top = 875.0
+offset_right = 891.0
+offset_bottom = 1025.0
+custom_colors/font_color_hover = Color( 1, 0.501961, 0, 1 )
+text = "CONNECT"
+theme = ExtResource("2_g4bvn")
+
+[node name="quit_button" parent="Panel" type="Button"]
+offset_left = 1102.0
+offset_top = 875.0
+offset_right = 1738.0
+offset_bottom = 1025.0
+custom_colors/font_color_hover = Color( 1, 0, 0, 1 )
+text = "QUIT"
+theme = ExtResource("2_g4bvn")
+
+[node name="credit2" parent="Panel" type="Label"]
+offset_left = -105.0
+offset_top = 346.0
+offset_right = 485.0
+offset_bottom = 410.0
+custom_styles/normal = SubResource( 1 )
+text = "SERVER"
+align = 2
+theme = ExtResource("2_g4bvn")
+
+[node name="credit5" parent="Panel" type="Label"]
+offset_left = 1239.0
+offset_top = 422.0
+offset_right = 1829.0
+offset_bottom = 486.0
+custom_styles/normal = SubResource( 1 )
+text = "OPTIONS"
+theme = ExtResource("2_g4bvn")
+
+[node name="credit3" parent="Panel" type="Label"]
+offset_left = -105.0
+offset_top = 519.0
+offset_right = 485.0
+offset_bottom = 583.0
+custom_styles/normal = SubResource( 1 )
+text = "PLAYER"
+align = 2
+theme = ExtResource("2_g4bvn")
+
+[node name="credit4" parent="Panel" type="Label"]
+offset_left = -105.0
+offset_top = 704.0
+offset_right = 485.0
+offset_bottom = 768.0
+custom_styles/normal = SubResource( 1 )
+text = "PASSWORD"
+align = 2
+theme = ExtResource("2_g4bvn")
+
+[node name="server_box" type="LineEdit" parent="Panel"]
+offset_left = 502.0
+offset_top = 295.0
+offset_right = 1144.0
+offset_bottom = 445.0
+custom_colors/selection_color = Color( 0.482353, 0, 0, 1 )
+custom_colors/cursor_color = Color( 0, 0, 0, 1 )
+custom_colors/font_color = Color( 0, 0, 0, 1 )
+custom_styles/focus = SubResource( 2 )
+align = 1
+caret_blink = true
+
+[node name="player_box" type="LineEdit" parent="Panel"]
+offset_left = 502.0
+offset_top = 477.0
+offset_right = 1144.0
+offset_bottom = 627.0
+custom_colors/selection_color = Color( 0.482353, 0, 0, 1 )
+custom_colors/cursor_color = Color( 0, 0, 0, 1 )
+custom_colors/font_color = Color( 0, 0, 0, 1 )
+custom_styles/focus = SubResource( 2 )
+align = 1
+caret_blink = true
+
+[node name="password_box" type="LineEdit" parent="Panel"]
+offset_left = 502.0
+offset_top = 659.0
+offset_right = 1144.0
+offset_bottom = 809.0
+custom_colors/selection_color = Color( 0.482353, 0, 0, 1 )
+custom_colors/cursor_color = Color( 0, 0, 0, 1 )
+custom_colors/font_color = Color( 0, 0, 0, 1 )
+custom_styles/focus = SubResource( 2 )
+align = 1
+caret_blink = true
+
+[node name="AcceptDialog" type="AcceptDialog" parent="Panel"]
+offset_right = 83.0
+offset_bottom = 58.0
+
+[node name="VersionMismatch" type="ConfirmationDialog" parent="Panel"]
+offset_right = 83.0
+offset_bottom = 58.0
+
+[node name="connection_history" type="MenuButton" parent="Panel"]
+offset_left = 1239.0
+offset_top = 276.0
+offset_right = 1829.0
+offset_bottom = 372.0
+text = "connection history"
+flat = false
@@ -0,0 +1,15 @@
+extends Node
+
+var source_path
+
+
+func _init(path):
+        source_path = path
+
+
+func load_path(path):
+        return ResourceLoader.load("%s/%s" % [source_path, path])
+
+
+func read_path(path):
+        return FileAccess.get_file_as_bytes("%s/%s" % [source_path, path])
@@ -1,24 +0,0 @@
-extends Button
-
-
-func _ready():
-        pass
-
-
-func _connect_pressed():
-        self.disabled = true
-
-        var ap = global.get_node("Archipelago")
-        ap.ap_server = self.get_parent().get_node("server_box").text
-        ap.ap_user = self.get_parent().get_node("player_box").text
-        ap.ap_pass = self.get_parent().get_node("password_box").text
-        ap.saveSettings()
-
-        ap.connectToServer()
-
-
-func _back_pressed():
-        var ap = global.get_node("Archipelago")
-        ap.disconnect_from_ap()
-
-        get_tree().change_scene_to_file("res://objects/scenes/menus/main_menu.tscn")