7 files changed, 68 insertions, 7 deletions

@@ -11,7 +11,7 @@ from .options import Lingo2Options
 from .player_logic import Lingo2PlayerLogic
 from .regions import create_regions, shuffle_entrances, connect_ports_from_ut
 from .static_logic import Lingo2StaticLogic
-from ..LauncherComponents import Component, Type, components, launch as launch_component, icon_paths
+from worlds.LauncherComponents import Component, Type, components, launch as launch_component, icon_paths
 
 
 class Lingo2WebWorld(WebWorld):
@@ -0,0 +1,32 @@
+extends CanvasLayer
+
+var _label
+
+var _disconnected = false
+
+
+func _ready():
+        _label = Label.new()
+        _label.name = "Label"
+        _label.offset_left = 20
+        _label.offset_top = 20
+        _label.horizontal_alignment = HORIZONTAL_ALIGNMENT_LEFT
+        _label.vertical_alignment = VERTICAL_ALIGNMENT_TOP
+        _label.theme = preload("res://assets/themes/baseUI.tres")
+        _label.add_theme_font_size_override("font_size", 36)
+        add_child(_label)
+
+
+func set_connection_lost(arg):
+        _disconnected = arg
+
+        _update_label()
+
+
+func _update_label():
+        var text = []
+
+        if _disconnected:
+                text.append("Disconnected from multiworld.")
+
+        _label.text = "\n".join(text)
@@ -66,6 +66,11 @@ func _ready():
                 messages_instance.SCRIPT_rainbowText = runtime.load_script("rainbowText.gd")
                 global.add_child(messages_instance)
 
+                var effects_script = runtime.load_script("effects.gd")
+                var effects_instance = effects_script.new()
+                effects_instance.name = "Effects"
+                global.add_child(effects_instance)
+
                 var textclient_script = runtime.load_script("textclient.gd")
                 var textclient_instance = textclient_script.new()
                 textclient_instance.name = "Textclient"
@@ -28,6 +28,7 @@ var _item_locks = {}
 var _inverse_item_locks = {}
 var _held_letters = {}
 var _letters_setup = false
+var _already_connected = false
 
 const kSHUFFLE_LETTERS_VANILLA = 0
 const kSHUFFLE_LETTERS_UNLOCKED = 1
@@ -178,6 +179,7 @@ func connectToServer():
         _location_scouts = {}
         _letters_setup = false
         _held_letters = {}
+        _already_connected = false
 
         client.connectToServer(ap_server, ap_user, ap_pass)
 
@@ -187,6 +189,11 @@ func getSaveFileName():
 
 
 func disconnect_from_ap():
+        _already_connected = false
+
+        var effects = global.get_node("Effects")
+        effects.set_connection_lost(false)
+
         client.disconnect_from_ap()
 
 
@@ -353,12 +360,29 @@ func _on_checked_worldports_updated():
 func _client_could_not_connect(message):
         could_not_connect.emit(message)
 
+        if global.loaded:
+                var effects = global.get_node("Effects")
+                effects.set_connection_lost(true)
+
+                var messages = global.get_node("Messages")
+                messages.showMessage("Connection to multiworld lost.")
+
 
 func _client_connect_status(message):
         connect_status.emit(message)
 
 
 func _client_connected(slot_data):
+        var effects = global.get_node("Effects")
+        effects.set_connection_lost(false)
+
+        if _already_connected:
+                var messages = global.get_node("Messages")
+                messages.showMessage("Reconnected to multiworld!")
+                return
+
+        _already_connected = true
+
         var gamedata = global.get_node("Gamedata")
 
         _localdata_file = "user://archipelago_data/%s_%d" % [client._seed, client._slot]
@@ -254,11 +254,8 @@ class Lingo2ClientContext(CommonContext):
         return ui
 
     async def server_auth(self, password_requested: bool = False):
-        if password_requested:
-            if self.password is None:
-                self.manager.game_ctx.send_connection_refused("Slot requires a password.")
-            else:
-                self.manager.game_ctx.send_connection_refused("Invalid password.")
+        if password_requested and not self.password:
+            self.manager.game_ctx.send_connection_refused("Invalid password.")
         else:
             self.auth = self.username
             await self.send_connect()
@@ -58,6 +58,9 @@ class ShuffleWorldports(Toggle):
     order to change maps. This does not affect paintings, panels that teleport you, or certain other special connections
     like the one between The Shop and Control Center. Connections that depend on placing letters in keyholders are also
     currently not shuffled.
+
+    NOTE: It is highly recommended that you turn on Shuffle Control Center Colors when using Shuffle Worldports. Not
+    doing so runs the risk of creating an unfinishable seed.
     """
     display_name = "Shuffle Worldports"
 
@@ -4,7 +4,7 @@ from .generated import data_pb2 as data_pb2
 from .items import SYMBOL_ITEMS
 from typing import TYPE_CHECKING, NamedTuple
 
-from .options import VictoryCondition, ShuffleLetters, CyanDoorBehavior
+from .options import ShuffleLetters, CyanDoorBehavior
 
 if TYPE_CHECKING:
     from . import Lingo2World