martials/pac-man-board-game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from h600878/lobby

Browse Source 
Lobby, login, new map, new bugs
This commit is contained in:
Martin Berg Alstad 2023-07-21 16:51:52 +02:00 committed by GitHub
commit 7bb4316f25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 139 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BackendTests/Services/GameTests.cs
View File

@ -110,8 +110,8 @@ public class GameTests
_game.AddPlayer(_redPlayer);
_game.AddPlayer(_bluePlayer);
_game.SetReady(_redPlayer);
_game.SetReady(_bluePlayer);
_game.SetReady(_redPlayer.Username);
_game.SetReady(_bluePlayer.Username);
_game.SetAllInGame();
Assert.That(_game.AddPlayer(_greenPlayer), Is.False);
@ -154,7 +154,7 @@ public class GameTests
_game.AddPlayer(_redPlayer);
_game.AddPlayer(_bluePlayer);
var players = _game.SetReady(_redPlayer).ToList();
var players = _game.SetReady(_redPlayer.Username).ToList();
Assert.Multiple(() =>
{
@ -171,7 +171,7 @@ public class GameTests
Assert.That(_redPlayer.State, Is.Not.EqualTo(State.Ready));
_game.SetReady(_redPlayer);
_game.SetReady(_redPlayer.Username);
Assert.That(_redPlayer.State, Is.EqualTo(State.Ready));
}
@ -179,7 +179,7 @@ public class GameTests
[Test]
public void SetReady_WhenPlayerIsNotInPlayers()
{
Assert.Throws<PlayerNotFoundException>(() => _game.SetReady(_redPlayer));
Assert.Throws<PlayerNotFoundException>(() => _game.SetReady(_redPlayer.Username));
}
#endregion

5
pac-man-board-game/ClientApp/src/AppRoutes.tsx
View File

@ -1,6 +1,5 @@
import React from "react";
import {Counter} from "./pages/counter";
import Home from "./pages/home";
import Game from "./pages/game";
import LobbyPage from "./pages/lobby";
import Login from "./pages/login";
@ -8,14 +7,14 @@ import Login from "./pages/login";
const AppRoutes = [
{
index: true,
element: <Home/>
element: <LobbyPage/>
},
{
path: "/counter",
element: <Counter/>
},
{
path: "/game",
path: "/game/:id",
element: <Game/>,
},
{

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

@ -9,19 +9,20 @@ import PlayerStats from "../components/playerStats";
import {useAtom, useAtomValue, useSetAtom} from "jotai";
import {diceAtom, ghostsAtom, playersAtom, rollDiceButtonAtom, selectedDiceAtom} from "../utils/state";
import GameButton from "./gameButton";
import {Button} from "./button";
import {useNavigate} from "react-router-dom";
const wsService = new WebSocketService(import.meta.env.VITE_API_WS);
// TODO bug, when taking player on last dice, the currentPlayer changes and the wrong character get to steal
// TODO bug, first player can sometimes roll dice twice (maybe only on firefox)
// TODO bug, when refreshing page, the characters are reset for all players
// TODO bug, when taking player on last dice, the currentPlayer changes and the wrong character gets to steal
// TODO bug, first player can sometimes roll dice twice
// TODO bug, when refreshing page, some data is missing until other clients make a move
// TODO bug, teleportation doesn't work
// TODO guest users
// TODO store map in backend and save it in state on each client
// TODO add debug menu on dev, for testing and cheating
// TODO join/new game lobby
// TODO sign up player page
// TODO sign in page
// TODO show box with collected pellets
// TODO layout
@ -33,6 +34,8 @@ export const GameComponent: FC<{ player: Player, map: GameMap }> = ({player, map
const setActiveRollDiceButton = useSetAtom(rollDiceButtonAtom);
const ghosts = useAtomValue(ghostsAtom);
const navigate = useNavigate();
function rollDice(): void {
if (!player.isTurn()) return;
@ -79,6 +82,11 @@ export const GameComponent: FC<{ player: Player, map: GameMap }> = ({player, map
wsService.send({action: GameAction.nextPlayer});
}
function leaveGame(): void {
wsService.send({action: GameAction.disconnect});
navigate("/lobby");
}
useEffect(() => {
wsService.onReceive = doAction;
wsService.open();
@ -90,6 +98,7 @@ export const GameComponent: FC<{ player: Player, map: GameMap }> = ({player, map
return (
<>
<Button onClick={leaveGame}>Leave game</Button>
<div className={"flex justify-center"}>
{players?.map(p => <PlayerStats key={p.username} player={p}/>)}
</div>

16
pac-man-board-game/ClientApp/src/game/possibleMovesAlgorithm.ts
View File

@ -18,26 +18,26 @@ export default function findPossiblePositions(board: GameMap, character: Charact
};
/**
* Uses recursion to move through the board and find all the possible positions
* @param board The board the character is on
* Uses recursion to move through the map and find all the possible positions
* @param map The map the character is on
* @param currentPath The current path the character is on
* @param steps The number of steps the character can move
* @param character The current character
* @param characters
* @returns An array of paths the character can move to
*/
function findPossibleRecursive(board: GameMap, currentPath: Path, steps: number, character: Character, characters: Character[]): Path[] {
function findPossibleRecursive(map: GameMap, currentPath: Path, steps: number, character: Character, characters: Character[]): Path[] {
const paths: Path[] = [];
if (isOutsideBoard(currentPath, board.length)) { // TODO not working on new map
if (isOutsideBoard(currentPath, map.length)) { // TODO not working on new map
if (character.isPacMan()) {
return addTeleportationTiles(board, currentPath, steps, character, characters);
return addTeleportationTiles(map, currentPath, steps, character, characters);
}
} else if (!isWall(board, currentPath)) {
} else if (!isWall(map, currentPath)) {
if (!characterHitsAnotherCharacter(character, currentPath, characters)) {
if (steps <= 0) {
if (!(isSpawn(board, currentPath) && !isOwnSpawn(currentPath, character))) {
if (!(isSpawn(map, currentPath) && !isOwnSpawn(currentPath, character))) {
paths.push(currentPath);
}
@ -47,7 +47,7 @@ function findPossibleRecursive(board: GameMap, currentPath: Path, steps: number,
steps--;
for (const direction of getDirections()) {
paths.push(...tryMove(board, currentPath, direction, steps, character, characters));
paths.push(...tryMove(map, currentPath, direction, steps, character, characters));
}
}
} else {

9
pac-man-board-game/ClientApp/src/pages/lobby.tsx
View File

@ -26,7 +26,7 @@ const LobbyPage: FC = () => { // TODO check if player is defined in storage, if
if (response.ok) {
const data = await response.json();
console.debug("Game created: ", data);
// TODO redirect to game page
navigate("/game/" + data.id)
} else {
const data = await response.text();
console.error("Error: ", data);
@ -51,6 +51,7 @@ const GameTable: FC<ComponentProps> = ({className}) => {
const data = useAtomValue(fetchAtom);
const thisPlayer = useAtomValue(thisPlayerAtom);
const navigate = useNavigate();
async function joinGame(gameId: string): Promise<void> {
if (thisPlayer === undefined) throw new Error("Player is undefined");
@ -60,10 +61,10 @@ const GameTable: FC<ComponentProps> = ({className}) => {
const result = await postData("/game/join/" + gameId, {body: thisPlayer});
if (result.ok) {
console.debug("Joined game " + gameId, await result.json());
// TODO redirect to game page
console.debug("Joined game " + gameId, await result.text());
navigate("/game/" + gameId);
} else {
console.error("Failed to join game " + gameId, await result.json());
console.error("Failed to join game " + gameId, await result.text());
// TODO show error message
}
}

10
pac-man-board-game/ClientApp/src/utils/actions.ts
View File

@ -12,6 +12,7 @@ export enum GameAction {
playerInfo,
ready,
nextPlayer,
disconnect,
}
const store = getDefaultStore();
@ -49,6 +50,9 @@ export const doAction: MessageEventFunction<string> = (event): void => { // TODO
case GameAction.nextPlayer:
nextPlayer(message.data);
break;
case GameAction.disconnect:
updatePlayers(message.data);
break;
}
};
@ -60,14 +64,12 @@ type MoveCharacterData = { dice: number[], players: PlayerProps[], ghosts: Chara
function moveCharacter(data?: MoveCharacterData): void {
store.set(diceAtom, data?.dice);
updatePlayers(data);
updatePlayers(data?.players);
updateGhosts(data);
removeEatenPellets(data);
}
function updatePlayers(data?: MoveCharacterData): void {
const updatedPlayers = data?.players;
function updatePlayers(updatedPlayers?: PlayerProps[]): void {
if (updatedPlayers) {
const newList: Player[] = updatedPlayers.map(p => new Player(p));
store.set(playersAtom, newList);

1
pac-man-board-game/ClientApp/src/utils/api.ts
View File

@ -1,4 +1,5 @@
export const getData: Api = async (path, {headers} = {}) => {
if (import.meta.env.MODE === "test") return Promise.resolve(new Response(JSON.stringify([])));
return await fetch(import.meta.env.VITE_API_HTTP + path, {
method: "GET",
headers: headers

36
pac-man-board-game/Controllers/GameController.cs
View File

@ -10,15 +10,15 @@ namespace pacMan.Controllers;
[ApiController]
[Route("api/[controller]")]
public class GameController : GenericController // TODO reconnect using player id
public class GameController : GenericController
{
private readonly IActionService _actionService;
private readonly GameService _gameService;
public GameController(ILogger<GameController> logger, GameService gameService, IActionService actionService) :
base(logger, gameService)
public GameController(ILogger<GameController> logger, GameService webSocketService, IActionService actionService) :
base(logger, webSocketService)
{
_gameService = gameService;
_gameService = webSocketService;
_actionService = actionService;
}
@ -66,6 +66,11 @@ public class GameController : GenericController // TODO reconnect using player i
}
}
protected override Task Echo()
{
_actionService.WebSocket = WebSocket ?? throw new NullReferenceException("WebSocket is null");
return base.Echo();
}
protected override ArraySegment<byte> Run(WebSocketReceiveResult result, byte[] data)
{
@ -78,24 +83,11 @@ public class GameController : GenericController // TODO reconnect using player i
return action.ToArraySegment();
}
protected override void Send(ArraySegment<byte> segment) => _gameService.SendToAll(segment);
protected override void Send(ArraySegment<byte> segment) => _actionService.SendToAll(segment);
protected override Task Echo()
{
_gameService.Connections += WsServiceOnFire;
// _actionService.Game.Connections += WsServiceOnFire;
return base.Echo();
}
protected override ArraySegment<byte>? Disconnect() =>
new ActionMessage { Action = GameAction.Disconnect, Data = _actionService.Disconnect() }
.ToArraySegment();
protected override void Disconnect()
{
_gameService.Connections -= WsServiceOnFire;
_actionService.Disconnect();
}
private async Task WsServiceOnFire(ArraySegment<byte> segment)
{
if (WebSocket == null) return;
await GameService.Send(WebSocket, segment);
}
protected override void SendDisconnectMessage(ArraySegment<byte> segment) => _actionService.SendToAll(segment);
}

21
pac-man-board-game/Controllers/GenericController.cs
View File

@ -7,14 +7,14 @@ namespace pacMan.Controllers;
public abstract class GenericController : ControllerBase
{
private const int BufferSize = 1024 * 4;
protected readonly IWebSocketService GameService;
private readonly IWebSocketService _webSocketService;
protected readonly ILogger<GenericController> Logger;
protected WebSocket? WebSocket;
protected GenericController(ILogger<GenericController> logger, IWebSocketService gameService)
protected GenericController(ILogger<GenericController> logger, IWebSocketService webSocketService)
{
Logger = logger;
GameService = gameService;
_webSocketService = webSocketService;
Logger.Log(LogLevel.Debug, "WebSocket Controller created");
}
@ -42,7 +42,7 @@ public abstract class GenericController : ControllerBase
do
{
var buffer = new byte[BufferSize];
result = await GameService.Receive(WebSocket, buffer);
result = await _webSocketService.Receive(WebSocket, buffer);
if (result.CloseStatus.HasValue) break;
@ -51,23 +51,26 @@ public abstract class GenericController : ControllerBase
Send(segment);
} while (true);
await GameService.Close(WebSocket, result.CloseStatus.Value, result.CloseStatusDescription);
var disconnectSegment = Disconnect();
if (disconnectSegment != null) SendDisconnectMessage((ArraySegment<byte>)disconnectSegment);
await _webSocketService.Close(WebSocket, result.CloseStatus.Value, result.CloseStatusDescription);
}
catch (WebSocketException e)
{
Logger.Log(LogLevel.Error, "{}", e.Message);
}
Disconnect();
}
protected virtual async void Send(ArraySegment<byte> segment)
{
if (WebSocket == null) return;
await GameService.Send(WebSocket, segment);
await _webSocketService.Send(WebSocket, segment);
}
protected abstract ArraySegment<byte> Run(WebSocketReceiveResult result, byte[] data);
protected virtual void Disconnect() { }
protected virtual ArraySegment<byte>? Disconnect() => null;
protected virtual void SendDisconnectMessage(ArraySegment<byte> segment) { }
}

3
pac-man-board-game/GameStuff/Actions.cs
View File

@ -9,7 +9,8 @@ public enum GameAction
MoveCharacter,
PlayerInfo,
Ready,
NextPlayer
NextPlayer,
Disconnect
}
public class ActionMessage<T>

2
pac-man-board-game/GameStuff/Character.cs
View File

@ -31,7 +31,7 @@ public class Character : IEquatable<Character>
return obj.GetType() == GetType() && Equals((Character)obj);
}
public override int GetHashCode() => HashCode.Combine(Colour, Position, IsEatable, SpawnPosition, (int)Type);
public override int GetHashCode() => HashCode.Combine(Colour, Position, IsEatable, SpawnPosition, (int?)Type);
}
public enum CharacterType

4
pac-man-board-game/GameStuff/Items/Player.cs
View File

@ -15,11 +15,11 @@ public class Player : IEquatable<Player>
{
[JsonPropertyName("username")] public required string Username { get; init; }
[JsonPropertyName("pacMan")] public required Character PacMan { get; init; }
[JsonPropertyName("pacMan")] public required Character PacMan { get; set; }
[JsonPropertyName("colour")] public required string Colour { get; init; }
[JsonPropertyName("box")] public Box? Box { get; init; }
[JsonPropertyName("box")] public Box? Box { get; set; }
[JsonPropertyName("state")] public State State { get; set; } = State.WaitingForPlayers;

68
pac-man-board-game/Services/ActionService.cs
View File

@ -1,3 +1,4 @@
using System.Net.WebSockets;
using System.Text.Json;
using System.Text.Json.Serialization;
using pacMan.GameStuff;
@ -9,13 +10,16 @@ public interface IActionService
{
Player Player { set; }
Game Game { set; }
WebSocket? WebSocket { set; }
void DoAction(ActionMessage message);
List<int> RollDice();
List<Player> SetPlayerInfo(JsonElement? jsonElement);
object? HandleMoveCharacter(JsonElement? jsonElement); // TODO test
object? HandleMoveCharacter(JsonElement? jsonElement);
object Ready();
string FindNextPlayer();
void Disconnect();
List<Player> LeaveGame();
void SendToAll(ArraySegment<byte> segment);
List<Player>? Disconnect();
}
public class ActionService : IActionService
@ -29,6 +33,8 @@ public class ActionService : IActionService
_gameService = gameService;
}
public WebSocket? WebSocket { private get; set; }
public Game? Game { get; set; }
public Player? Player { get; set; }
@ -38,10 +44,11 @@ public class ActionService : IActionService
message.Data = message.Action switch
{
GameAction.RollDice => RollDice(),
GameAction.MoveCharacter => HandleMoveCharacter(message.Data),
GameAction.PlayerInfo => SetPlayerInfo(message.Data),
GameAction.Ready => Ready(),
GameAction.NextPlayer => FindNextPlayer(),
GameAction.MoveCharacter => HandleMoveCharacter(message.Data),
GameAction.Disconnect => LeaveGame(),
_ => message.Data
};
}
@ -55,19 +62,33 @@ public class ActionService : IActionService
return rolls;
}
public List<Player> SetPlayerInfo(JsonElement? jsonElement)
public object? HandleMoveCharacter(JsonElement? jsonElement)
{
if (Game != null && jsonElement.HasValue)
{
Game.Ghosts = jsonElement.Value.GetProperty("ghosts").Deserialize<List<Character>>() ??
throw new JsonException("Ghosts is null");
Game.Players = jsonElement.Value.GetProperty("players").Deserialize<List<Player>>() ??
throw new NullReferenceException("Players is null");
}
return jsonElement;
}
public List<Player> SetPlayerInfo(JsonElement? jsonElement) // TODO split up into two actions
{
var data = jsonElement?.Deserialize<PlayerInfoData>() ?? throw new NullReferenceException("Data is null");
Player = data.Player;
Game? group;
Player? player;
if ((group = _gameService.FindGameByUsername(Player.Username)) != null &&
(player = group.Players.Find(p => p.Username == Player.Username))?.State == State.Disconnected)
Game? game;
if ((game = _gameService.FindGameByUsername(Player.Username)) != null)
{
player.State = group.IsGameStarted ? State.InGame : State.WaitingForPlayers;
var player = game.Players.Find(p => p.Username == Player.Username);
if (player is null) throw new NullReferenceException("Player is null");
player.State = game.IsGameStarted ? State.InGame : State.WaitingForPlayers; // TODO doesn't work anymore
Player = player;
Game = group;
Game = game;
// TODO send missing data: Dices, CurrentPlayer, Ghosts
}
else
@ -75,6 +96,8 @@ public class ActionService : IActionService
Game = _gameService.AddPlayer(Player, data.Spawns);
}
Game.Connections += SendSegment;
return Game.Players;
}
@ -83,7 +106,7 @@ public class ActionService : IActionService
object data;
if (Player != null && Game != null)
{
var players = Game.SetReady(Player).ToArray();
var players = Game.SetReady(Player.Username).ToArray();
// TODO roll to start
Game.Shuffle();
var allReady = players.All(p => p.State == State.Ready);
@ -100,18 +123,27 @@ public class ActionService : IActionService
public string FindNextPlayer() => Game?.NextPlayer().Username ?? "Error: No group found";
public void Disconnect()
public List<Player> LeaveGame()
{
if (Player != null) Player.State = State.Disconnected;
if (Game == null || Player == null) throw new NullReferenceException("Game or Player is null");
Game.RemovePlayer(Player.Username);
return Game.Players;
}
public object? HandleMoveCharacter(JsonElement? jsonElement)
public List<Player>? Disconnect()
{
if (Game != null && jsonElement.HasValue)
Game.Ghosts = jsonElement.Value.GetProperty("ghosts").Deserialize<List<Character>>() ??
throw new JsonException("Ghosts is null");
if (Player == null) return null;
Player.State = State.Disconnected;
if (Game != null) Game.Connections -= SendSegment;
return Game?.Players;
}
return jsonElement;
public void SendToAll(ArraySegment<byte> segment) => Game?.SendToAll(segment);
private async Task SendSegment(ArraySegment<byte> segment)
{
if (WebSocket != null) await _gameService.Send(WebSocket, segment);
else await Task.FromCanceled(new CancellationToken(true));
}
}

20
pac-man-board-game/Services/Game.cs
View File

@ -9,12 +9,25 @@ public class Game // TODO handle disconnects and reconnects
{
private readonly Random _random = new();
private int _currentPlayerIndex;
private List<Player> _players = new();
public Game(Queue<DirectionalPosition> spawns) => Spawns = spawns;
[JsonInclude] public Guid Id { get; } = Guid.NewGuid();
[JsonIgnore] public List<Player> Players { get; } = new();
[JsonIgnore]
public List<Player> Players
{
get => _players;
set =>
_players = _players.Select((player, index) =>
{
player.State = value[index].State;
player.PacMan = value[index].PacMan;
player.Box = value[index].Box;
return player;
}).ToList();
}
[JsonIgnore] public List<Character> Ghosts { get; set; } = new();
@ -81,9 +94,10 @@ public class Game // TODO handle disconnects and reconnects
public void SendToAll(ArraySegment<byte> segment) => Connections?.Invoke(segment);
public IEnumerable<Player> SetReady(Player player)
public IEnumerable<Player> SetReady(string username)
{
if (!Players.Contains(player))
var player = Players.FirstOrDefault(p => p.Username == username);
if (player is null)
throw new PlayerNotFoundException("The player was not found in the game group.");
player.State = State.Ready;
return Players;

7
pac-man-board-game/Services/GameService.cs
View File

@ -19,13 +19,6 @@ public class GameService : WebSocketService
/// </summary>
public SynchronizedCollection<Game> Games { get; } = new();
public event Func<ArraySegment<byte>, Task>? Connections; // TODO remove and use Game
public void SendToAll(ArraySegment<byte> segment)
{
Connections?.Invoke(segment);
}
public Game AddPlayer(Player player, Queue<DirectionalPosition> spawns)
{
var index = 0;