3 files changed, 27 insertions, 1 deletions

@@ -353,6 +353,10 @@ func sendLocation(loc_id):
         sendMessage([{"cmd": "LocationChecks", "locations": [loc_id]}])
 
 
+func sendLocations(loc_ids):
+        sendMessage([{"cmd": "LocationChecks", "locations": loc_ids}])
+
+
 func setValue(key, value, operation = "replace"):
         sendMessage(
                 [
@@ -16,6 +16,8 @@ var client
 var _localdata_file = ""
 var _received_indexes = []
 var _last_new_item = -1
+var _batch_locations = false
+var _held_locations = []
 
 signal could_not_connect
 signal connect_status
@@ -286,8 +288,21 @@ func _client_connected():
         emit_signal("ap_connected")
 
 
+func start_batching_locations():
+        _batch_locations = true
+
+
 func send_location(loc_id):
-        client.sendLocation(loc_id)
+        if _batch_locations:
+                _held_locations.append(loc_id)
+        else:
+                client.sendLocation(loc_id)
+
+
+func stop_batching_locations():
+        _batch_locations = false
+        client.sendLocations(_held_locations)
+        _held_locations.clear()
 
 
 func colorForItemType(flags):
@@ -7,6 +7,8 @@ func _ready():
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
 
+        ap.start_batching_locations()
+
         # Set up door locations.
         var map_id = gamedata.map_id_by_name.get(global.map)
         for door in gamedata.objects.get_doors():
@@ -124,6 +126,11 @@ func _ready():
 
         super._ready()
 
+        await get_tree().process_frame
+        await get_tree().process_frame
+
+        ap.stop_batching_locations()
+
 
 func _set_up_invis_wall(x, y, z, sx, sy, sz):
         var prefab = preload("res://objects/nodes/block.tscn")