diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-03-01 22:08:01 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-03-01 22:08:01 +0100 |
| commit | cec40ee1ec236829e774e3f7f82a17d5d5bffcb0 (patch) | |
| tree | a328291ca1bc258adad81995f5115d150d5b074d /test-client | |
| parent | 74ffa47147d2bb989057b4513075975c44c2bc42 (diff) | |
| download | hurrycurry-cec40ee1ec236829e774e3f7f82a17d5d5bffcb0.tar hurrycurry-cec40ee1ec236829e774e3f7f82a17d5d5bffcb0.tar.bz2 hurrycurry-cec40ee1ec236829e774e3f7f82a17d5d5bffcb0.tar.zst | |
remove nesting in game/server data packets
Diffstat (limited to 'test-client')
| -rw-r--r-- | test-client/main.ts | 6 | ||||
| -rw-r--r-- | test-client/protocol.ts | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/test-client/main.ts b/test-client/main.ts index 3f349d7c..662a726c 100644 --- a/test-client/main.ts +++ b/test-client/main.ts @@ -128,9 +128,7 @@ export let data: Gamedata = { tile_interactable_empty: [], tile_placeable_any: [], tile_placeable_items: {}, - maps: [], hand_count: 0, - bot_algos: [], current_map: "", tile_collide: [], } @@ -174,8 +172,8 @@ function packet(p: PacketC) { case "joined": my_id = p.id break; - case "data": - data = p.data + case "game_data": + data = p break; case "add_player": { players.set(p.id, { diff --git a/test-client/protocol.ts b/test-client/protocol.ts index 3dfcc594..afec2b41 100644 --- a/test-client/protocol.ts +++ b/test-client/protocol.ts @@ -30,6 +30,12 @@ export interface MapMetadata { difficulty: int, } +export interface Serverdata { + maps: [string, MapMetadata][], // Metadata for most available maps + bot_algos: string[], + name: string, + motd?: string +} export interface Gamedata { current_map: string, item_names: string[], // Look-up table for ItemIndex @@ -38,8 +44,6 @@ export interface Gamedata { tile_placeable_items: { [key: string /*TileIndex*/]: ItemIndex[] }, // Map from TileIndex to list of ItemIndex which can be placed on that tile. Not set if not restricted tile_placeable_any: TileIndex[], tile_interactable_empty: TileIndex[], // List of TileIndex that have "crate recipes" - maps: [string, MapMetadata][], // Metadata for most available maps - bot_algos: string[], hand_count: int, } @@ -58,7 +62,8 @@ export type PacketS = export type PacketC = { type: "version", minor: int, major: int, supports_bincode?: boolean } // Sent once after connecting to ensure you client is compatible | { type: "joined", id: PlayerID } // Informs you about the id of the character you spawned - | { type: "data", data: Gamedata } // Game data was changed + | { type: "game_data" } & Gamedata // Game data was changed + | { type: "server_data" } & Serverdata // Server data was changed | { type: "add_player", id: PlayerID, name: string, position: Vec2, character: Character, class: PlayerClass } // Somebody else joined (or was already in the game) | { type: "remove_player", id: PlayerID } // Somebody left | { type: "movement", player: PlayerID, pos: Vec2, rot: float, boost: boolean, dir: Vec2 } // Update the movement of a players (your own position is included here) |