Updated frontend and more .Ready implementations

pac-man-board-game/ClientApp/src/components/gameComponent.tsx

@@ -6,7 +6,7 @@ import {Character, Ghost, PacMan} from "../game/character";
 import WebSocketService from "../websockets/WebSocketService";
 import {testMap} from "../game/map";
 import {TileType} from "../game/tileType";
-import Player from "../game/player";
+import Player, {State} from "../game/player";
 
 const wsService = new WebSocketService(import.meta.env.VITE_API);
 
@@ -17,10 +17,7 @@ const ghosts = [
 
 export const GameComponent: Component<{ player: Player }> = (
   {
-    player = new Player({
+    player
-      Name: "Martin",
-      Colour: "yellow",
-    })
   }) => {
   // TODO find spawn points
   const [characters, setCharacters] = useState<Character[]>();
@@ -62,6 +59,7 @@ export const GameComponent: Component<{ player: Player }> = (
         break;
       case GameAction.playerInfo:
         const players = parsed.Data as PlayerProps[];
+        console.log(players);
         const pacMen = players.filter(p => p.PacMan).map(p => new PacMan(p.PacMan!));
         console.log(pacMen);
         // TODO find spawn points
@@ -121,11 +119,19 @@ export const GameComponent: Component<{ player: Player }> = (
     return () => wsService.close();
   }, []);
 
+  function sendReady() {
+    wsService.send({Action: GameAction.ready});
+  }
+
   return (
     <div>
       <h1 className={"w-fit mx-auto"}>Pac-Man The Board Game</h1>
       <div className={"flex-center"}>
-        <button onClick={startGameLoop}>Roll dice</button>
+        {
+          player.State === State.waitingForPlayers ?
+            <button onClick={sendReady}>Ready</button> :
+            <button onClick={startGameLoop}>Roll dice</button>
+        }
       </div>
       <AllDice values={dice} onclick={handleDiceClick} selectedDiceIndex={selectedDice?.index}/>
       {

pac-man-board-game/ClientApp/src/game/player.ts

@@ -1,11 +1,18 @@
 import {Character, CharacterType} from "./character";
 import Box from "./box";
 
+export enum State {
+  waitingForPlayers,
+  ready,
+  inGame
+}
+
 export default class Player {
   public readonly Name: string;
   public readonly PacMan: Character;
   public readonly Colour: Colour;
   public readonly Box: Box;
+  public State: State;
 
   constructor(props: PlayerProps) {
     this.Name = props.Name;
@@ -15,6 +22,7 @@ export default class Player {
       Colour: props.Colour,
       Type: CharacterType.pacMan
     });
+    this.State = props.State ?? State.waitingForPlayers;
   }
 
   public stealFrom(other: Player): void {

pac-man-board-game/ClientApp/src/game/possibleMovesAlgorithm.ts

@@ -13,8 +13,9 @@ import {Direction, getDirections} from "./direction";
  * @returns An array of paths the character can move to
  */
 export default function findPossiblePositions(board: GameMap, character: Character, steps: number, characters: Character[]): Path[] {
+  if (!character.Position || !character.SpawnPosition) throw new Error("Character has no position or spawn position");
   return findPossibleRecursive(board, character.Position, steps, character, characters);
-}
+};
 
 /**
  * Uses recursion to move through the board and find all the possible positions
@@ -253,7 +254,7 @@ function isSpawn(board: GameMap, currentPos: Path) {
  */
 function isOwnSpawn(currentPos: Path, character: Character): boolean {
   const pos = currentPos.End;
-  const charPos = character.SpawnPosition.At;
+  const charPos = character.SpawnPosition!.At;
   return charPos.x === pos.x && charPos.y === pos.y;
 }
 

pac-man-board-game/ClientApp/src/pages/home.tsx

@@ -1,9 +1,13 @@
 import React from "react";
 import {GameComponent} from "../components/gameComponent";
+import Player from "../game/player";
 
 const Home: Component = () => (
   <div>
-    <GameComponent/>
+    <GameComponent player={new Player({
+      Name: "Martin",
+      Colour: "yellow",
+    })}/>
   </div>
 );
 

pac-man-board-game/ClientApp/src/types/props.d.ts

@@ -29,4 +29,5 @@ interface PlayerProps {
   readonly PacMan?: CharacterProps,
   readonly Colour: Colour,
   readonly Box?: BoxProps,
+  State?: import("../game/player").State,
 }

pac-man-board-game/Controllers/GameController.cs

@@ -18,16 +18,11 @@ public class GameController : GenericController
     private GameGroup _group = new();
     private IPlayer? _player;
 
-    public GameController(ILogger<GameController> logger, IWebSocketService wsService) : base(logger, wsService)
+    public GameController(ILogger<GameController> logger, IWebSocketService wsService) : base(logger, wsService) =>
-    {
         _diceCup = new DiceCup();
-    }
 
     [HttpGet]
-    public override async Task Accept()
+    public override async Task Accept() => await base.Accept();
-    {
-        await base.Accept();
-    }
 
     protected override ArraySegment<byte> Run(WebSocketReceiveResult result, byte[] data)
     {
@@ -57,15 +52,24 @@ public class GameController : GenericController
                 message.Data = _group.Players;
                 break;
             case GameAction.Ready:
-                if (_player != null) _group.SetReady(_player);
+                if (_player != null)
-                if (_group.AllReady())
                 {
-                    // TODO select starter player and send response
+                    var players = _group.SetReady(_player).ToArray();
+                    if (players.All(p => p.State == State.Ready))
+                        // TODO roll to start
+                        message.Data = new { AllReady = true, Starter = _group.RandomPlayer };
+                    else
+                        message.Data = new { AllReady = false, players };
                 }
+                else
+                {
+                    message.Data = "Player not found, please create a new player";
+                }
+
                 break;
             default:
                 Logger.Log(LogLevel.Information, "Forwarding message to all clients");
                 break;
         }
     }
-}
+}

pac-man-board-game/Services/GameGroup.cs

@@ -5,7 +5,10 @@ namespace pacMan.Services;
 
 public class GameGroup
 {
+    private readonly Random _random = new();
     public List<IPlayer> Players { get; } = new();
+
+    public IPlayer RandomPlayer => Players[_random.Next(Players.Count)];
     public event Func<ArraySegment<byte>, Task>? Connections;
 
     public bool AddPlayer(IPlayer player)
@@ -18,18 +21,11 @@ public class GameGroup
         return true;
     }
 
-    public void SendToAll(ArraySegment<byte> segment)
+    public void SendToAll(ArraySegment<byte> segment) => Connections?.Invoke(segment);
-    {
-        Connections?.Invoke(segment);
-    }
 
-    public bool AllReady()
+    public IEnumerable<IPlayer> SetReady(IPlayer player)
-    {
-        return Players.All(p => p.State == State.Ready);
-    }
-
-    public void SetReady(IPlayer player)
     {
         player.State = State.Ready;
+        return Players;
     }
-}
+}