1 files changed, 45 insertions, 10 deletions

@@ -32,17 +32,23 @@ var _players = []
 var _player_name_by_slot = {}
 var _game_by_player = {}
 var _checked_locations = []
-var _received_items = []
+var _received_indexes = []
+var _received_items = {}
 var _slot_data = {}
 
 signal could_not_connect
 signal connect_status
 signal client_connected(slot_data)
-signal item_received(item_id, index, player, flags)
+signal item_received(item_id, index, player, flags, amount)
 signal message_received(message)
+signal location_scout_received(item_id, location_id, player, flags)
 
 
 func _init():
+        set_process_mode(Node.PROCESS_MODE_ALWAYS)
+
+        _ws.inbound_buffer_size = 8388608
+
         global._print("Instantiated APClient")
 
         # Read AP datapackages from file, if there are any
@@ -74,6 +80,8 @@ func _reset_state():
         _authenticated = false
         _try_wss = false
         _has_connected = false
+        _received_items = {}
+        _received_indexes = []
 
 
 func _errored():
@@ -219,7 +227,7 @@ func _process(_delta):
                                                         error_message = "Unknown error."
 
                                                 _initiated_disconnect = true
-                                                _ws.disconnect_from_host()
+                                                _ws.close()
 
                                                 emit_signal("could_not_connect", error_message)
                                                 global._print("Connection to AP refused")
@@ -228,21 +236,40 @@ func _process(_delta):
                                         elif cmd == "ReceivedItems":
                                                 var i = 0
                                                 for item in message["items"]:
-                                                        if not _received_items.has(int(item["item"])):
-                                                                _received_items.append(int(item["item"]))
+                                                        var index = int(message["index"] + i)
+                                                        i += 1
+
+                                                        if _received_indexes.has(index):
+                                                                # Do not re-process items.
+                                                                continue
+
+                                                        _received_indexes.append(index)
+
+                                                        var item_id = int(item["item"])
+                                                        _received_items[item_id] = _received_items.get(item_id, 0) + 1
 
                                                         emit_signal(
                                                                 "item_received",
-                                                                int(item["item"]),
-                                                                int(message["index"]) + i,
+                                                                item_id,
+                                                                index,
                                                                 int(item["player"]),
-                                                                int(item["flags"])
+                                                                int(item["flags"]),
+                                                                _received_items[item_id]
                                                         )
-                                                        i += 1
 
                                         elif cmd == "PrintJSON":
                                                 emit_signal("message_received", message)
 
+                                        elif cmd == "LocationInfo":
+                                                for loc in message["locations"]:
+                                                        emit_signal(
+                                                                "location_scout_received",
+                                                                int(loc["item"]),
+                                                                int(loc["location"]),
+                                                                int(loc["player"]),
+                                                                int(loc["flags"])
+                                                        )
+
                 elif state == WebSocketPeer.STATE_CLOSED:
                         if _has_connected:
                                 _closed()
@@ -284,7 +311,7 @@ func connectToServer(server, un, pw):
                                 % err
                         )
                 )
-                global._print("Could not connect to AP: " + err)
+                global._print("Could not connect to AP: %d" % err)
                 return
         _should_process = true
 
@@ -378,5 +405,13 @@ func completedGoal():
         sendMessage([{"cmd": "StatusUpdate", "status": 30}])  # CLIENT_GOAL
 
 
+func scoutLocations(loc_ids):
+        sendMessage([{"cmd": "LocationScouts", "locations": loc_ids}])
+
+
 func hasItem(item_id):
         return _received_items.has(item_id)
+
+
+func getItemAmount(item_id):
+        return _received_items.get(item_id, 0)