everything indexed

1 files changed, 18 insertions, 13 deletions

diff --git a/test-client/protocol.ts b/test-client/protocol.ts
index 707c09a3..d5cb2034 100644
--- a/test-client/protocol.ts
+++ b/test-client/protocol.ts
@@ -1,7 +1,13 @@
-export type ID = number;
 export type Vec2 = [number, number]
-export type Item = string
-export type Tile = string
+export type PlayerID = number
+export type ItemID = number
+export type ItemIndex = number
+export type TileIndex = number
+
+export interface Gamedata {
+    item_names: string[],
+    tile_names: string[],
+}
 
 export type PacketS =
     { join: { name: string } }
@@ -9,16 +15,15 @@ export type PacketS =
     | { position: { pos: Vec2, rot: number } }
     | { interact: { pos: Vec2, edge: boolean } }
 
-
 export type PacketC =
-    { joined: { id: ID } }
-    | { add_player: { id: ID, name: string, hand?: [number, Item] } }
-    | { remove_player: { id: ID } }
-    | { position: { player: ID, pos: Vec2, rot: number } }
-    | { take_item: { item: ID, player: ID } }
-    | { put_item: { item: ID, pos: Vec2 } }
-    | { produce_item: { id: ID, pos: Vec2, kind: Item } }
-    | { consume_item: { id: ID, pos: Vec2 } }
+    { joined: { id: PlayerID, data: Gamedata } }
+    | { add_player: { id: PlayerID, name: string, hand?: [ItemID, ItemIndex] } }
+    | { remove_player: { id: PlayerID } }
+    | { position: { player: PlayerID, pos: Vec2, rot: number } }
+    | { take_item: { item: ItemID, player: PlayerID } }
+    | { put_item: { item: ItemID, pos: Vec2 } }
+    | { produce_item: { id: ItemID, pos: Vec2, kind: ItemIndex } }
+    | { consume_item: { id: ItemID, pos: Vec2 } }
     | { set_active: { tile: Vec2 } }
-    | { update_map: { pos: Vec2, tile: Tile } }
+    | { update_map: { pos: Vec2, tile: TileIndex } }