update client to new protocol

1 files changed, 12 insertions, 8 deletions

diff --git a/client/multiplayer.gd b/client/multiplayer.gd
index dad4464d..02cf21e0 100644
--- a/client/multiplayer.gd
+++ b/client/multiplayer.gd
@@ -18,7 +18,7 @@
 class_name Multiplayer
 extends Node
 
-signal init(player_id: int)
+signal joined(player_id: int)
 signal data(
 	item_names: Array[String],
 	tile_names: Array[String],
@@ -98,9 +98,9 @@ func handle_packet(bytes: PackedByteArray):
 
 	var packet_type: String = decoded["type"]
 	match packet_type:
-		"init":
+		"joined":
 			var player_id = decoded["id"]
-			init.emit(player_id)
+			joined.emit(player_id)
 		"version":
 			var major = decoded["major"]
 			var minor = decoded["minor"]
@@ -279,26 +279,29 @@ func send_join(player_name: String, character: int):
 		"character": character
 	})
 
-func send_movement(pos: Vector2, direction: Vector2, boosting: bool):
+func send_movement(player: int, pos: Vector2, direction: Vector2, boosting: bool):
 	send_packet({
 		"type": "movement",
+		"player": player,
 		"pos": [pos.x, pos.y],
 		"direction": [direction.x, direction.y],
 		"boosting": boosting
 	})
 
-func send_tile_interact(pos: Vector2i, edge: bool):
+func send_tile_interact(player:int, pos: Vector2i, edge: bool):
 	send_packet({
 		"type": "interact",
+		"player": player,
 		"pos": [pos.x, pos.y] if edge else null,
 	})
 
-func set_player_interact(_player: int, _edge: bool):
+func send_player_interact(_player: int, _edge: bool):
 	push_error("not yet implemented")
 
-func send_chat(message: String):
+func send_chat(player: int, message: String):
 	send_packet({
 		"type": "communicate",
+		"player": player,
 		"persist": false,
 		"message": {
 			"text": message
@@ -311,9 +314,10 @@ func send_replay_tick(dt: float):
 		"dt": dt
 	})
 
-func send_leave():
+func send_leave(player: int):
 	send_packet({
 		"type": "leave",
+		"player": player,
 	})
 
 func send_packet(packet):