19 files changed, 175 insertions, 8 deletions

@@ -25,6 +25,7 @@ var _slot_data = {}
 var _accessible_locations = []
 var _accessible_worldports = []
 var _goal_accessible = false
+var _latched_doors = []
 
 signal could_not_connect
 signal connect_status
@@ -34,6 +35,7 @@ signal location_scout_received(location_id, item_name, player_name, flags, for_s
 signal text_message_received(message)
 signal item_sent_notification(message)
 signal hint_received(message)
+signal door_latched(id)
 signal accessible_locations_updated
 signal checked_locations_updated
 signal checked_worldports_updated
@@ -189,6 +191,14 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                                 message["type"], int(message.get("id", null)), message["path"]
                         )
 
+                elif cmd == "UpdateLatches":
+                        for id in message["latches"]:
+                                var iid = int(id)
+                                if not _latched_doors.has(iid):
+                                        _latched_doors.append(iid)
+
+                                door_latched.emit(iid)
+
 
 func connectToServer(server, un, pw):
         sendMessage([{"cmd": "Connect", "server": server, "player": un, "password": pw}])
@@ -255,6 +265,13 @@ func checkWorldport(port_id):
                 sendMessage([{"cmd": "CheckWorldport", "port_id": port_id}])
 
 
+func latchDoor(id):
+        if not _latched_doors.has(id):
+                _latched_doors.append(id)
+
+                sendMessage([{"cmd": "LatchDoor", "door": id}])
+
+
 func getLogicalPath(object_type, object_id):
         var msg = {"cmd": "GetPath", "type": object_type}
         if object_id != null:
@@ -1,7 +1,9 @@
 extends "res://scripts/nodes/door.gd"
 
+var door_id
 var item_id
 var item_amount
+var latched = false
 
 
 func _ready():
@@ -10,7 +12,7 @@ func _ready():
         )
 
         var gamedata = global.get_node("Gamedata")
-        var door_id = gamedata.get_door_for_map_node_path(global.map, node_path)
+        door_id = gamedata.get_door_for_map_node_path(global.map, node_path)
         if door_id != null:
                 var ap = global.get_node("Archipelago")
                 var item_lock = ap.get_item_id_for_door(door_id)
@@ -27,6 +29,12 @@ func _ready():
                         self.excludeSenders = []
 
                         call_deferred("_readier")
+                else:
+                        var door_data = gamedata.objects.get_doors()[door_id]
+                        if door_data.has_latch() and door_data.get_latch():
+                                _check_latched.call_deferred(door_id)
+
+                                latched = true
 
         if global.map == "the_sun_temple":
                 if name == "spe_EndPlatform" or name == "spe_entry_2":
@@ -44,3 +52,24 @@ func _readier():
 
         if ap.client.getItemAmount(item_id) >= item_amount:
                 handleTriggered()
+
+
+func _check_latched(door_id):
+        var ap = global.get_node("Archipelago")
+
+        if ap.client._latched_doors.has(door_id):
+                triggered = total
+                handleTriggered()
+
+
+func handleTriggered():
+        super.handleTriggered()
+
+        if latched and ran:
+                var ap = global.get_node("Archipelago")
+                ap.client.latchDoor(door_id)
+
+
+func handleUntriggered():
+        if not latched or not ran:
+                super.handleUntriggered()
@@ -43,6 +43,7 @@ func _ready():
                 installScriptExtension(runtime.load_script("keyHolderChecker.gd"))
                 installScriptExtension(runtime.load_script("keyHolderResetterListener.gd"))
                 installScriptExtension(runtime.load_script("painting.gd"))
+                installScriptExtension(runtime.load_script("paintingAuto.gd"))
                 installScriptExtension(runtime.load_script("panel.gd"))
                 installScriptExtension(runtime.load_script("pauseMenu.gd"))
                 installScriptExtension(runtime.load_script("player.gd"))
@@ -141,6 +141,7 @@ func _ready():
         client.accessible_locations_updated.connect(_on_accessible_locations_updated)
         client.checked_locations_updated.connect(_on_checked_locations_updated)
         client.checked_worldports_updated.connect(_on_checked_worldports_updated)
+        client.door_latched.connect(_on_door_latched)
 
         client.could_not_connect.connect(_client_could_not_connect)
         client.connect_status.connect(_client_connect_status)
@@ -376,6 +377,20 @@ func _on_checked_worldports_updated():
                 textclient_node.update_worldports()
 
 
+func _on_door_latched(door_id):
+        var gamedata = global.get_node("Gamedata")
+        if gamedata.get_door_map_name(door_id) != global.map:
+                return
+
+        var receivers = gamedata.get_door_receivers(door_id)
+        var scene = get_tree().get_root().get_node_or_null("scene")
+        if scene != null:
+                for receiver in receivers:
+                        var rnode = scene.get_node_or_null(receiver)
+                        if rnode != null:
+                                rnode.handleTriggered()
+
+
 func _client_could_not_connect(message):
         could_not_connect.emit(message)
 
@@ -0,0 +1,43 @@
+extends "res://scripts/nodes/paintingAuto.gd"
+
+var item_id
+var item_amount
+
+
+func _ready():
+        var node_path = String(
+                get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names()
+        )
+
+        var gamedata = global.get_node("Gamedata")
+        var door_id = gamedata.get_door_for_map_node_path(global.map, node_path)
+        if door_id != null:
+                var ap = global.get_node("Archipelago")
+                var item_lock = ap.get_item_id_for_door(door_id)
+
+                if item_lock != null:
+                        item_id = item_lock[0]
+                        item_amount = item_lock[1]
+
+                        self.senders = []
+                        self.senderGroup = []
+                        self.nested = false
+                        self.complete_at = 0
+                        self.max_length = 0
+                        self.excludeSenders = []
+
+                        call_deferred("_readier")
+
+        super._ready()
+
+        if item_id != null and activate_on_sender_complete:
+                enabled = false
+                if not hide_particles:
+                        get_node("Hinge/paintingColliders/TeleportParticles").emitting = false
+
+
+func _readier():
+        var ap = global.get_node("Archipelago")
+
+        if ap.client.getItemAmount(item_id) >= item_amount:
+                handleTriggered()
@@ -313,6 +313,11 @@ func _ready():
                 entry1.get_parent().add_child.call_deferred(entry12)
                 entry1.queue_free()
 
+        # Move the Plaza RTE trigger outside of the turtle.
+        if global.map == "the_plaza":
+                var rte_trigger = get_node("/root/scene/Components/Warps/triggerArea")
+                rte_trigger.position.z = 0
+
         ap.update_job_well_done_sign()
 
         var minimap = ap.SCRIPT_minimap.new()
@@ -38,6 +38,7 @@ class Lingo2Manager:
     keyboard: dict[str, int]
     worldports: set[int]
     goaled: bool
+    latches: set[int]
 
     def __init__(self, game_ctx: "Lingo2GameContext", client_ctx: "Lingo2ClientContext"):
         self.game_ctx = game_ctx
@@ -47,6 +48,7 @@ class Lingo2Manager:
         self.tracker = Tracker(self)
         self.keyboard = {}
         self.worldports = set()
+        self.latches = set()
 
         self.reset()
 
@@ -56,6 +58,7 @@ class Lingo2Manager:
 
         self.worldports = set()
         self.goaled = False
+        self.latches = set()
 
     def update_keyboard(self, new_keyboard: dict[str, int]) -> dict[str, int]:
         ret: dict[str, int] = {}
@@ -81,6 +84,12 @@ class Lingo2Manager:
 
         return ret
 
+    def update_latches(self, new_latches: set[int]) -> set[int]:
+        ret = new_latches.difference(self.latches)
+        self.latches.update(new_latches)
+
+        return ret
+
 
 class Lingo2GameContext:
     server: Endpoint | None
@@ -244,6 +253,17 @@ class Lingo2GameContext:
 
         async_start(self.send_msgs([msg]), name="path reply")
 
+    def send_update_latches(self, latches):
+        if self.server is None:
+            return
+
+        msg = {
+            "cmd": "UpdateLatches",
+            "latches": latches,
+        }
+
+        async_start(self.send_msgs([msg]), name="update latches")
+
     async def send_msgs(self, msgs: list[Any]) -> None:
         """ `msgs` JSON serializable """
         if not self.server or not self.server.socket.open or self.server.socket.closed:
@@ -298,7 +318,7 @@ class Lingo2ClientContext(CommonContext):
             self.victory_data_storage_key = f"_read_client_status_{self.team}_{self.slot}"
 
             self.set_notify(self.get_datastorage_key("keyboard1"), self.get_datastorage_key("keyboard2"),
-                            self.victory_data_storage_key)
+                            self.victory_data_storage_key, self.get_datastorage_key("latches"))
             msg_batch = [{
                 "cmd": "Set",
                 "key": self.get_datastorage_key("keyboard1"),
@@ -311,6 +331,12 @@ class Lingo2ClientContext(CommonContext):
                 "default": 0,
                 "want_reply": True,
                 "operations": [{"operation": "default", "value": 0}]
+            }, {
+                "cmd": "Set",
+                "key": self.get_datastorage_key("latches"),
+                "default": [],
+                "want_reply": True,
+                "operations": [{"operation": "default", "value": []}]
             }]
 
             if self.slot_data.get("shuffle_worldports", False):
@@ -420,6 +446,10 @@ class Lingo2ClientContext(CommonContext):
                     self.manager.game_ctx.send_update_worldports(updates)
             elif args["key"] == self.victory_data_storage_key:
                 self.handle_status_update(args["value"])
+            elif args["key"] == self.get_datastorage_key("latches"):
+                updates = self.manager.update_latches(set(args["value"]))
+                if len(updates) > 0:
+                    self.manager.game_ctx.send_update_latches(updates)
 
     def get_datastorage_key(self, name: str):
         return f"Lingo2_{self.slot}_{name}"
@@ -501,6 +531,17 @@ class Lingo2ClientContext(CommonContext):
         self.manager.tracker.refresh_state()
         self.manager.game_ctx.send_accessible_locations()
 
+    async def update_latches(self, updates: set[int]):
+        await self.send_msgs([{
+            "cmd": "Set",
+            "key": self.get_datastorage_key("latches"),
+            "want_reply": True,
+            "operations": [{
+                "operation": "update",
+                "value": updates
+            }]
+        }])
+
 
 async def pipe_loop(manager: Lingo2Manager):
     while not manager.client_ctx.exit_event.is_set():
@@ -571,6 +612,10 @@ async def process_game_cmd(manager: Lingo2Manager, args: dict):
             path = manager.tracker.get_path_to_goal()
 
         manager.game_ctx.send_path_reply(args["type"], args.get("id", None), path)
+    elif cmd == "LatchDoor":
+        updates = manager.update_latches({args["door"]})
+        if len(updates) > 0:
+            async_start(manager.client_ctx.update_latches(updates), name="client update latches")
     elif cmd == "Quit":
         manager.client_ctx.exit_event.set()
 
@@ -56,11 +56,7 @@ class ShuffleWorldports(Toggle):
     """
     Randomizes the connections between maps. This affects worldports only, which are the loading zones you walk into in
     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.
+    like the one between The Shop and Control Center.
     """
     display_name = "Shuffle Worldports"
 
@@ -866,6 +866,7 @@ doors {
 doors {
   name: "Control Center Orange Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/oroom_6"
   control_center_color: "orange"
 }
@@ -893,12 +894,14 @@ doors {
 doors {
   name: "White Hallway From Entry"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/froom_6"
   control_center_color: "white"
 }
 doors {
   name: "Purple Hallway From Great"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/froom_7"
   control_center_color: "purple"
 }
@@ -241,6 +241,7 @@ doors {
 doors {
   name: "Control Center Brown Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/brown_1"
   control_center_color: "brown"
 }
@@ -42,6 +42,7 @@ doors {
 doors {
   name: "Control Center Blue Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/maze2"
   control_center_color: "blue"
 }
@@ -161,6 +161,7 @@ doors {
 doors {
   name: "Control Center White Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/back_left_7"
   control_center_color: "white"
 }
@@ -54,18 +54,21 @@ doors {
 doors {
   name: "Control Center Purple Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_23"
   control_center_color: "purple"
 }
 doors {
   name: "Control Center Gray Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Gates/Gate/animationListener"
   control_center_color: "gray"
 }
 doors {
   name: "Control Center Red Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_18"
   control_center_color: "red"
 }
@@ -32,6 +32,7 @@ doors {
 doors {
   name: "Control Center Green Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_2"
   control_center_color: "green"
 }
@@ -59,6 +59,7 @@ doors {
 doors {
   name: "Control Center Magenta Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_18"
   control_center_color: "magenta"
 }
@@ -4,5 +4,5 @@ ports {
   display_name: "Northwest Worldport"
   path: "Components/Warps/worldport2"
   destination { x: -11 y: 0 z: 13 }
-  rotation: 0
+  rotation: 90
 }
@@ -33,5 +33,8 @@ doors {
 doors {
   name: "N Entered"
   type: EVENT
+  latch: true
+  receivers: "Components/Doors/entry_1"
+  receivers: "Components/Doors/entry_2"
   keyholders { room: "Main Area" name: "N" key: "n" }
 }
@@ -1,6 +1,7 @@
 doors {
   name: "Control Center Brown Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_1"
   control_center_color: "brown"
 }
@@ -68,6 +68,7 @@ doors {
 doors {
   name: "Control Center Orange Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_6"
   receivers: "Components/Doors/entry_13"
   receivers: "Panels/Assorted/panel_1/teleportListener"