Adde player class and updated character classes

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

@@ -7,10 +7,11 @@ import WebSocketService from "../websockets/WebSocketService";
 import {testMap} from "../game/map";
 import {Direction} from "../game/direction";
 import {TileType} from "../game/tileType";
+import Player from "../game/player";
 
 const wsService = new WebSocketService("wss://localhost:3000/api/game");
 
-export const GameComponent: Component = () => {
+export const GameComponent: Component<{ player: Player }> = ({player = new Player({colour: "yellow"})}) => {
   // TODO find spawn points
   const [characters, setCharacters] = useState([
     new PacMan({
@@ -29,6 +30,7 @@ export const GameComponent: Component = () => {
 
   const [dice, setDice] = useState<number[]>();
   const [selectedDice, setSelectedDice] = useState<SelectedDice>();
+  const [currentPlayer, setCurrentPlayer] = useState<Player>();
 
   function handleDiceClick(selected: SelectedDice): void {
     setSelectedDice(selected);
@@ -39,6 +41,8 @@ export const GameComponent: Component = () => {
   }
 
   function startGameLoop(): void {
+    if (currentPlayer !== player) return;
+
     if (!wsService.isOpen()) {
       setTimeout(startGameLoop, 50);
       return;
@@ -71,16 +75,12 @@ export const GameComponent: Component = () => {
   }
 
   function updateCharacters(parsed: ActionMessage): void {
-    const updatedCharacters = parsed.Data?.characters as (PacManProps | CharacterProps)[] | undefined;
+    const updatedCharacters = parsed.Data?.characters as CharacterProps[] | undefined;
 
     if (updatedCharacters) {
       const newList: Character[] = [];
       for (const character of updatedCharacters) {
-        if ("box" in character) { // If Pac-Man
-          newList.push(new PacMan(character));
-        } else if (character satisfies CharacterProps) {
-          newList.push(new Ghost(character));
-        }
+        newList.push(new Character(character));
       }
       setCharacters(newList);
     }
@@ -106,7 +106,9 @@ export const GameComponent: Component = () => {
     wsService.onReceive = doAction;
     wsService.open();
 
-    startGameLoop();
+    // TODO send player info to backend
+    // TODO send action to backend when all players are ready
+    //  The backend should then send the first player as current player
     return () => wsService.close();
   }, []);
 
@@ -120,9 +122,9 @@ export const GameComponent: Component = () => {
       {
         (characters.filter(c => c instanceof PacMan) as PacMan[]).map(c =>
           <div key={c.colour} className={"mx-auto w-fit m-2"}>
-            <p>Pac-Man: {c.colour}</p>
-            <p>Pellets: {c.box.count}</p>
-            <p>PowerPellets: {c.box.countPowerPellets}</p>
+            <p>Player: {player.colour}</p>
+            <p>Pellets: {player.box.count}</p>
+            <p>PowerPellets: {player.box.countPowerPellets}</p>
           </div>)
       }
       <GameBoard className={"mx-auto my-2"} characters={characters} selectedDice={selectedDice}

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

@@ -1,17 +1,31 @@
-import Box from "./box";
 import {Direction} from "./direction";
 
-export abstract class Character {
+export enum CharacterType {
+  pacMan = "pacMan",
+  ghost = "ghost",
+  dummy = "dummy",
+}
+
+export class Character {
   public readonly colour: Colour;
   public position: Path;
   public isEatable: boolean;
   public readonly spawnPosition: DirectionalPosition;
+  public readonly type: CharacterType;
 
-  protected constructor({colour, position, isEatable = false, spawnPosition}: CharacterProps) {
+  public constructor(
+    {
+      colour,
+      position,
+      type = CharacterType.dummy,
+      isEatable = type === CharacterType.pacMan,
+      spawnPosition
+    }: CharacterProps) {
     this.colour = colour;
     this.position = position ?? {end: spawnPosition.at, direction: spawnPosition.direction};
     this.isEatable = isEatable;
     this.spawnPosition = spawnPosition;
+    this.type = type;
   }
 
   public follow(path: Path): void {
@@ -20,12 +34,12 @@ export abstract class Character {
     this.position.path = undefined;
   }
 
-  public isPacMan(): this is PacMan {
-    return this instanceof PacMan;
+  public isPacMan(): boolean {
+    return this.type === CharacterType.pacMan;
   }
 
-  public isGhost(): this is Ghost {
-    return this instanceof Ghost;
+  public isGhost(): boolean {
+    return this.type === CharacterType.ghost;
   }
 
   public moveToSpawn(): void {
@@ -39,27 +53,29 @@ export abstract class Character {
 
 export class PacMan extends Character {
 
-  public box: Box;
-
-  public constructor({colour, position, isEatable = true, spawnPosition, box = {colour}}: PacManProps) {
-    super({colour, position, isEatable, spawnPosition});
-    this.isEatable = isEatable;
-    this.box = new Box(box);
+  public constructor({colour, position, isEatable = true, spawnPosition, type = CharacterType.pacMan}: CharacterProps) {
+    super({colour, position, isEatable, spawnPosition, type});
   }
 
 }
 
 export class Ghost extends Character {
 
-  public constructor({colour, position, isEatable, spawnPosition}: CharacterProps) {
-    super({colour, position, isEatable, spawnPosition});
+  public constructor({colour, position, isEatable, spawnPosition, type = CharacterType.ghost}: CharacterProps) {
+    super({colour, position, isEatable, spawnPosition, type});
   }
 }
 
 export class Dummy extends Character {
 
   public constructor(position: Path) { // TODO see-through
-    super({colour: "grey", position, isEatable: false, spawnPosition: {at: {x: 0, y: 0}, direction: Direction.up}});
+    super({
+      colour: "grey",
+      position,
+      isEatable: false,
+      spawnPosition: {at: {x: 0, y: 0}, direction: Direction.up},
+      type: CharacterType.dummy,
+    });
   }
 
 }

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

@@ -1,19 +1,28 @@
-import {Character, Ghost, PacMan} from "./character";
+import {Character, CharacterType} from "./character";
 import Box from "./box";
+import {Direction} from "./direction";
 
 export default class Player {
-  public readonly character: Character;
+  public readonly pacMan: Character;
   public readonly colour: Colour;
   public readonly box: Box;
 
   constructor(props: PlayerProps) {
     this.colour = props.colour;
-    this.box = new Box(props.box);
-    this.character = "box" in props.character ? new PacMan(props.character) : new Ghost(props.character); // TODO move box here
+    this.box = new Box(props.box ?? {colour: props.colour});
+    this.pacMan = new Character(props.pacMan ?? {
+      colour: props.colour,
+      spawnPosition: {at: {x: 0, y: 0}, direction: Direction.up},
+      type: CharacterType.pacMan
+    });
   }
 
   public stealFrom(other: Player): void {
-
+    for (let i = 0; i < 2; i++) {
+      const pellet = other.box.pellets.pop();
+      if (pellet)
+        this.box.addPellet(pellet);
+    }
   }
-  
+
 }

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

@@ -15,11 +15,8 @@ interface CharacterProps {
   colour: Colour,
   position?: Path,
   isEatable?: boolean,
-  spawnPosition: DirectionalPosition
-}
-
-interface PacManProps extends CharacterProps {
-  box?: BoxProps,
+  spawnPosition: DirectionalPosition,
+  type?: import("../game/character").CharacterType,
 }
 
 interface BoxProps {
@@ -28,7 +25,7 @@ interface BoxProps {
 }
 
 interface PlayerProps {
-  readonly character: CharacterProps | PacManProps,
+  readonly pacMan?: CharacterProps,
   readonly colour: Colour,
-  readonly box: BoxProps,
+  readonly box?: BoxProps,
 }

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

@@ -13,7 +13,7 @@ namespace pacMan.Controllers;
 public class GameController : GenericController
 {
     private readonly IDiceCup _diceCup;
-    private readonly IPlayer _player;
+    private readonly IPlayer _player; // TODO recieve player from client and choose a starter
 
     public GameController(ILogger<GameController> logger, IWebSocketService wsService) : base(logger, wsService)
     {