diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index 76566e7..8ec8528 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -34,6 +34,8 @@ CurrentPlayersPayload, BombPlacedPayload, BombPlacedAckPayload, + BombHitReportPayload, + PlayerDeadPayload, PlaceBombPayload, BombNetworkPayload, GameStartPayload, diff --git a/packages/shared/src/protocol/eventPayloads.ts b/packages/shared/src/protocol/eventPayloads.ts index 4abd536..0da02b4 100644 --- a/packages/shared/src/protocol/eventPayloads.ts +++ b/packages/shared/src/protocol/eventPayloads.ts @@ -28,6 +28,8 @@ PlaceBombPayload, BombPlacedPayload, BombPlacedAckPayload, + BombHitReportPayload, + PlayerDeadPayload, GameResultPayload, GameResultRanking, } from "./payloads/gamePayloads"; diff --git a/packages/shared/src/protocol/events.ts b/packages/shared/src/protocol/events.ts index 14c1e4b..3de5e3c 100644 --- a/packages/shared/src/protocol/events.ts +++ b/packages/shared/src/protocol/events.ts @@ -27,6 +27,8 @@ PlaceBombPayload, BombPlacedPayload, BombPlacedAckPayload, + BombHitReportPayload, + PlayerDeadPayload, PingPayload, PongPayload, JoinRoomPayload, diff --git a/packages/shared/src/protocol/maps/gameEventPayloadMap.ts b/packages/shared/src/protocol/maps/gameEventPayloadMap.ts index 83b80ea..cc53619 100644 --- a/packages/shared/src/protocol/maps/gameEventPayloadMap.ts +++ b/packages/shared/src/protocol/maps/gameEventPayloadMap.ts @@ -5,6 +5,7 @@ */ import { SocketEvents } from "../socketEvents"; import type { + BombHitReportPayload, BombPlacedAckPayload, BombPlacedPayload, CurrentPlayersPayload, @@ -13,6 +14,7 @@ MovePayload, NewPlayerPayload, PlaceBombPayload, + PlayerDeadPayload, PingPayload, PongPayload, RemovePlayerPayload, @@ -26,6 +28,7 @@ [SocketEvents.READY_FOR_GAME]: undefined; [SocketEvents.MOVE]: MovePayload; [SocketEvents.PLACE_BOMB]: PlaceBombPayload; + [SocketEvents.BOMB_HIT_REPORT]: BombHitReportPayload; [SocketEvents.PING]: PingPayload; }; @@ -39,6 +42,7 @@ [SocketEvents.UPDATE_MAP_CELLS]: UpdateMapCellsPayload; [SocketEvents.BOMB_PLACED]: BombPlacedPayload; [SocketEvents.BOMB_PLACED_ACK]: BombPlacedAckPayload; + [SocketEvents.PLAYER_DEAD]: PlayerDeadPayload; [SocketEvents.PONG]: PongPayload; [SocketEvents.GAME_END]: undefined; [SocketEvents.GAME_RESULT]: GameResultPayload; diff --git a/packages/shared/src/protocol/payloads/gamePayloads.ts b/packages/shared/src/protocol/payloads/gamePayloads.ts index 22f5900..4ba4ff6 100644 --- a/packages/shared/src/protocol/payloads/gamePayloads.ts +++ b/packages/shared/src/protocol/payloads/gamePayloads.ts @@ -78,3 +78,13 @@ bombId: string; requestId: string; }; + +/** BOMB_HIT_REPORT イベントで送受信する被弾報告 */ +export type BombHitReportPayload = { + bombId: string; +}; + +/** PLAYER_DEAD イベントで送受信する死亡プレイヤー情報 */ +export type PlayerDeadPayload = { + playerId: string; +}; diff --git a/packages/shared/src/protocol/socketEvents.ts b/packages/shared/src/protocol/socketEvents.ts index d93cb2f..f2c9a50 100644 --- a/packages/shared/src/protocol/socketEvents.ts +++ b/packages/shared/src/protocol/socketEvents.ts @@ -25,9 +25,11 @@ REMOVE_PLAYER: "remove_player", MOVE: "move", PLACE_BOMB: "place-bomb", + BOMB_HIT_REPORT: "bomb-hit-report", UPDATE_MAP_CELLS: "update_map_cells", BOMB_PLACED: "bomb-placed", BOMB_PLACED_ACK: "bomb-placed-ack", + PLAYER_DEAD: "player-dead", // 時間同期・ゲーム進行関連 PING: "ping",