1 files changed, 63 insertions, 14 deletions

@@ -18,9 +18,12 @@ var _seed = ""
 var _team = 0
 var _slot = 0
 var _checked_locations = []
+var _checked_worldports = []
 var _received_indexes = []
 var _received_items = {}
 var _slot_data = {}
+var _accessible_locations = []
+var _accessible_worldports = []
 
 signal could_not_connect
 signal connect_status
@@ -30,6 +33,10 @@ 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 accessible_locations_updated
+signal checked_locations_updated
+signal checked_worldports_updated
+signal keyboard_update_received
 
 
 func _init():
@@ -51,6 +58,9 @@ func _reset_state():
         _should_process = false
         _received_items = {}
         _received_indexes = []
+        _checked_worldports = []
+        _accessible_locations = []
+        _accessible_worldports = []
 
 
 func disconnect_from_ap():
@@ -92,15 +102,34 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                         _gen_version = message["generator_version"]
                         _team = message["team"]
                         _slot = message["slot"]
-                        _checked_locations = message["checked_locations"]
                         _slot_data = message["slot_data"]
 
+                        _checked_locations = []
+                        for location in message["checked_locations"]:
+                                _checked_locations.append(int(message["checked_locations"]))
+
                         client_connected.emit(_slot_data)
 
                 elif cmd == "ConnectionRefused":
                         could_not_connect.emit(message["text"])
                         global._print("Connection to AP refused")
 
+                elif cmd == "UpdateLocations":
+                        for location in message["locations"]:
+                                var lint = int(location)
+                                if not _checked_locations.has(lint):
+                                        _checked_locations.append(lint)
+
+                        checked_locations_updated.emit()
+
+                elif cmd == "UpdateWorldports":
+                        for port_id in message["worldports"]:
+                                var lint = int(port_id)
+                                if not _checked_worldports.has(lint):
+                                        _checked_worldports.append(lint)
+
+                        checked_worldports_updated.emit()
+
                 elif cmd == "ItemReceived":
                         for item in message["items"]:
                                 var index = int(item["index"])
@@ -134,6 +163,26 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                                         int(loc["for_self"])
                                 )
 
+                elif cmd == "AccessibleLocations":
+                        _accessible_locations.clear()
+                        _accessible_worldports.clear()
+
+                        for loc in message["locations"]:
+                                _accessible_locations.append(int(loc))
+
+                        if "worldports" in message:
+                                for port_id in message["worldports"]:
+                                        _accessible_worldports.append(int(port_id))
+
+                        accessible_locations_updated.emit()
+
+                elif cmd == "UpdateKeyboard":
+                        var updates = {}
+                        for k in message["updates"]:
+                                updates[k] = int(message["updates"][k])
+
+                        keyboard_update_received.emit(updates)
+
 
 func connectToServer(server, un, pw):
         sendMessage([{"cmd": "Connect", "server": server, "player": un, "password": pw}])
@@ -179,19 +228,6 @@ func sendLocations(loc_ids):
         sendMessage([{"cmd": "LocationChecks", "locations": loc_ids}])
 
 
-func setValue(key, value, operation = "replace"):
-        sendMessage(
-                [
-                        {
-                                "cmd": "Set",
-                                "key": "Lingo2_%d_%s" % [_slot, key],
-                                "want_reply": false,
-                                "operations": [{"operation": operation, "value": value}]
-                        }
-                ]
-        )
-
-
 func say(textdata):
         sendMessage([{"cmd": "Say", "text": textdata}])
 
@@ -204,6 +240,19 @@ func scoutLocations(loc_ids):
         sendMessage([{"cmd": "LocationScouts", "locations": loc_ids}])
 
 
+func updateKeyboard(updates):
+        sendMessage([{"cmd": "UpdateKeyboard", "keyboard": updates}])
+
+
+func checkWorldport(port_id):
+        if not _checked_worldports.has(port_id):
+                sendMessage([{"cmd": "CheckWorldport", "port_id": port_id}])
+
+
+func sendQuit():
+        sendMessage([{"cmd": "Quit"}])
+
+
 func hasItem(item_id):
         return _received_items.has(item_id)