Handle TileTake messages

board-server/src/room.rs

@@ -134,6 +134,13 @@ impl Room {
                     }
                 }
             }
+            ClientMessage::TileTake(pos) => {
+                if let Some(p) = self.connections.get(&addr) {
+                    if *p == self.active_player {
+                        self.on_tile_take(pos.into());
+                    }
+                }
+            }
             ClientMessage::Validate => {
                 if let Some(p) = self.connections.get(&addr) {
                     if *p == self.active_player {
@@ -141,7 +148,6 @@ impl Room {
                     }
                 }
             }
-            _ => todo!(),
         }
         !self.connections.is_empty()
     }
@@ -185,6 +191,19 @@ impl Room {
         self.broadcast(ServerMessage::TilePlaced(pos.into(), tile.into()));
     }
 
+    fn on_tile_take(&mut self, pos: Position2d) {
+        if self.board.get(pos.x, pos.y) == self.validated_board.get(pos.x, pos.y) {
+            self.send(
+                self.active_player,
+                ServerMessage::TurnRejected("Cannot take already validated tile.".to_string()),
+            );
+        } else if let Some(tile) = self.board.take(pos.x, pos.y) {
+            self.players[self.active_player].hand.push(tile);
+            self.sync_hand(self.active_player);
+            self.broadcast(ServerMessage::TileRemoved(pos.into()));
+        }
+    }
+
     fn on_validate(&mut self) {
         let diff = self.board.difference(&self.validated_board);
         if diff.is_empty() {

board-shared/src/board.rs

@@ -19,6 +19,10 @@ impl Board {
         self.tiles[y * self.width + x] = Some(tile);
     }
 
+    pub fn take(&mut self, x: usize, y: usize) -> Option<Tile> {
+        self.tiles[y * self.width + x].take()
+    }
+
     /// Gets the difference between this board and another.
     pub fn difference(&self, other: &Board) -> Vec<Position2d> {
         let mut diff = Vec::new();

board-shared/src/game.rs

@@ -49,6 +49,10 @@ impl Hand {
         Ok(())
     }
 
+    pub fn push(&mut self, tile: Tile) {
+        self.tiles.push(tile);
+    }
+
     pub fn remove(&mut self, idx: usize) -> Option<Tile> {
         if idx < self.tiles.len() {
             Some(self.tiles.remove(idx))