jeremy.mouyon
/
sae201_qwirkle
3
5
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

push some tests but minor improvements on score
continuous-integration/drone/push Build is failing Details

Browse Source
test_old_branch
Jules LASCRET 1 year ago
parent da8f3e9274
commit 1f227fd53b
3 changed files with 125 additions and 70 deletions
Show Stats Download Patch File Download Diff File

97
Qwirkle/QwirkleClassLibrary/Games/Game.cs
Unescape View File

@ -21,9 +21,9 @@ namespace QwirkleClassLibrary.Games
public ReadOnlyDictionary<Player, int> ScoreBoard => scoreBoard.AsReadOnly();
private readonly Dictionary<Player, int> scoreBoard = new();
private TileBag bag;
private TileBag? bag = null;
public bool GameRunning { get; private set; }
private Board board;
private Board? board = null;
public ReadOnlyCollection<Player> PlayerList => players.AsReadOnly();
private readonly List<Player> players = new();
@ -50,15 +50,6 @@ namespace QwirkleClassLibrary.Games
protected virtual void OnEndOfGame(EndOfGameNotifiedEventArgs args)
=> EndOfGameNotified?.Invoke(this, args);
/// <summary>
/// Creates a game with a board and a tile bag
/// </summary>
public Game()
{
bag = CreateTileBag(3);
board = CreateBoard();
}
/// <summary>
/// Adds a player in the game if the game is not running, if the name is correct, if the game is not full and if the name is not already taken.
@ -119,7 +110,13 @@ namespace QwirkleClassLibrary.Games
/// Returns the board of the game
/// </summary>
/// <returns>Board</returns>
public Board GetBoard() { return board; }
public Board? GetBoard() { return board; }
/// <summary>
/// Returns the tile bag of the game
/// </summary>
/// <returns></returns>
public TileBag? GetTileBag() { return bag; }
/// <summary>
/// Creates a board with a number of columns and rows
@ -127,7 +124,7 @@ namespace QwirkleClassLibrary.Games
/// <returns>Board</returns>
public Board CreateBoard()
{
board = new Board(15, 12);
board = new Board(7, 7);
return board;
}
@ -148,6 +145,8 @@ namespace QwirkleClassLibrary.Games
public void StartGame()
{
if (players.Count < 2 || players.Count >= 5) return;
board = CreateBoard();
bag = CreateTileBag(3);
GameRunning = true;
}
@ -177,7 +176,7 @@ namespace QwirkleClassLibrary.Games
{
if (GetPlayingPlayerPosition() == -1)
{
throw new ArgumentException("No player play.");
throw new ArgumentException("No player currently playing !");
}
return players[GetPlayingPlayerPosition()];
}
@ -217,10 +216,13 @@ namespace QwirkleClassLibrary.Games
{
for (int j = 0; j < 6; j++)
{
int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
if (bag != null)
{
int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
p.AddTileToPlayer(bag.TilesBag[val]);
bag.RemoveTileInBag(bag.TilesBag[val]);
p.AddTileToPlayer(bag.TilesBag[val]);
bag.RemoveTileInBag(bag.TilesBag[val]);
}
}
}
}
@ -238,7 +240,8 @@ namespace QwirkleClassLibrary.Games
OnNextPlayer(new NextPlayerNotifiedEventArgs(players[0]));
return players[0].NameTag;
}
throw new ArgumentException("Game is not running");
throw new ArgumentException("Game is not running");
}
/// <summary>
@ -271,8 +274,8 @@ namespace QwirkleClassLibrary.Games
/// <returns>bool</returns>
public bool PlaceTile(Player player, Tile tile, int x, int y)
{
if (!IsMoveCorrect(tile, x, y, board)) return false;
if (board.AddTileInCell(x, y, tile))
if (!IsMoveCorrect(tile, x, y, board!)) return false;
if (board!.AddTileInCell(x, y, tile))
{
OnPlaceTile(new PlaceTileNotifiedEventArgs(tile, "was correctly placed !"));
AddCellUsed(board.GetCell(x, y));
@ -293,7 +296,7 @@ namespace QwirkleClassLibrary.Games
{
while (player.Tiles.Count < 6)
{
if (bag.TilesBag.Count == 0)
if (bag!.TilesBag.Count == 0)
{
return false;
}
@ -335,7 +338,7 @@ namespace QwirkleClassLibrary.Games
foreach (var t in tilesToSwap)
{
bag.AddTileInBag(t);
bag!.AddTileInBag(t);
}
return true;
@ -486,7 +489,7 @@ namespace QwirkleClassLibrary.Games
return false;
}
if (!surroundingCells.Any(cell => cell?.GetTile != null))
if (surroundingCells.All(cell => cell?.GetTile == null))
{
OnPlaceTile(new PlaceTileNotifiedEventArgs(t, " : You can't place a tile that isn't adjacent to another one !"));
return false;
@ -520,18 +523,25 @@ namespace QwirkleClassLibrary.Games
int cellsX = cellsPlayed[0].GetX;
int cellsY = cellsPlayed[0].GetY;
foreach (var cell in cellsPlayed)
if (cellsPlayed.Count > 1)
{
if (cellsX != cell.GetX && cellsX != -1)
{
cellsX = -1;
}
else if (cellsY != cell.GetY && cellsY != -1)
foreach (var cell in cellsPlayed)
{
cellsY = -1;
if (cellsX != cell.GetX && cellsX != -1)
{
cellsX = -1;
}
else if (cellsY != cell.GetY && cellsY != -1)
{
cellsY = -1;
}
}
}
else
{
cellsX = cellsY = -1;
}
score += cellsPlayed.Sum(cell => CalculateAdjacentScore(cell, b, cellsPlayed, cellsX, cellsY));
@ -605,7 +615,12 @@ namespace QwirkleClassLibrary.Games
continue;
}
if (dx != 0 && cellsY != -1 && nbCellsPlayed + i == 6 || dy != 0 && cellsX != -1 && nbCellsPlayed + i == 6)
if (dx == 0 && cellsY != -1 && i + 1 == 6 || dy == 0 && cellsX != -1 && i + 1 == 6)
{
score += 6;
}
if (dx != 0 && cellsY != -1 && i + nbCellsPlayed == 6 || dy != 0 && cellsX != -1 && i + nbCellsPlayed == 6)
{
score += 6;
}
@ -630,7 +645,7 @@ namespace QwirkleClassLibrary.Games
{
List<int> playerTilesBagPos = [];
if (bag.TilesBag.Count == 0)
if (bag!.TilesBag.Count == 0)
{
for (int i = 0; i < players.Count; i++)
{
@ -650,13 +665,13 @@ namespace QwirkleClassLibrary.Games
/// </summary>
/// <param name="playerTilesBagPos"></param>
/// <returns></returns>
public bool CheckBoardTile(List<int> playerTilesBagPos)
public bool CheckPlacementPossibilities(List<int> playerTilesBagPos)
{
for (int i = 0; i < playerTilesBagPos.Count; i++)
{
for (int j = 0; j < players[playerTilesBagPos[i]].Tiles.Count; j++)
{
for (int b = 0; b < board.ReadCells.Count; b++)
for (int b = 0; b < board!.ReadCells.Count; b++)
{
int x = board.ReadCells[b].GetX;
int y = board.ReadCells[b].GetY;
@ -682,7 +697,7 @@ namespace QwirkleClassLibrary.Games
{
List<int> playerTilesBagPos = CheckTilesBag();
if (playerTilesBagPos.Count != 0 && !CheckBoardTile(playerTilesBagPos))
if (playerTilesBagPos.Count != 0 && !CheckPlacementPossibilities(playerTilesBagPos))
{
OnEndOfGame(new EndOfGameNotifiedEventArgs(player));
GameRunning = false;
@ -692,5 +707,15 @@ namespace QwirkleClassLibrary.Games
return false;
}
public void ClearGame()
{
players.Clear();
scoreBoard.Clear();
cellUsed.Clear();
bag = null;
board = CreateBoard();
GameRunning = false;
}
}
}

36
Qwirkle/QwirkleClassLibrary/Tiles/TileBag.cs
Unescape View File

@ -24,18 +24,32 @@ namespace QwirkleClassLibrary.Tiles
throw new ArgumentException(nbSet.ToString());
}
for (int i = 0; i < nbSet; i++)
{
foreach (Shape s in Enum.GetValues(typeof(Shape)))
{
foreach (Color c in Enum.GetValues(typeof(Color)))
{
Tile t = new Tile(s, c);
tiles.Add(t);
}
}
}
// for (int i = 0; i < nbSet; i++)
// {
// foreach (Shape s in Enum.GetValues(typeof(Shape)))
// {
// foreach (Color c in Enum.GetValues(typeof(Color)))
// {
// Tile t = new Tile(s, c);
// tiles.Add(t);
// }
// }
// }
tiles.Add(new Tile(Shape.Club, Color.Blue));
tiles.Add(new Tile(Shape.Club, Color.Green));
tiles.Add(new Tile(Shape.Club, Color.Orange));
tiles.Add(new Tile(Shape.Club, Color.Purple));
tiles.Add(new Tile(Shape.Club, Color.Red));
tiles.Add(new Tile(Shape.Club, Color.Yellow));
tiles.Add(new Tile(Shape.Round, Color.Blue));
tiles.Add(new Tile(Shape.Round, Color.Green));
tiles.Add(new Tile(Shape.Round, Color.Orange));
tiles.Add(new Tile(Shape.Round, Color.Purple));
tiles.Add(new Tile(Shape.Round, Color.Red));
tiles.Add(new Tile(Shape.Round, Color.Yellow));
TilesBag = tiles.AsReadOnly();
}

62
Qwirkle/TestBase/TestGame.cs
Unescape View File

@ -214,41 +214,39 @@ public class TestGame
game.AddPlayerInGame("Test1");
game.AddPlayerInGame("Test2");
game.GiveTilesToPlayers();
if (except)
{
game.StartGame();
game.GiveTilesToPlayers();
game.SetNextPlayer();
Assert.True(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], 1, 1));
return;
}
game.StartGame();
game.GiveTilesToPlayers();
game.SetNextPlayer();
Assert.False(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], -5, 1));
return;
}
[Fact]
public void Test_DrawTile()
{
Game game = new Game();
game.AddPlayerInGame("Test1");
game.AddPlayerInGame("Test2");
game.StartGame();
game.SetNextPlayer();
Assert.True(game.DrawTiles(game.GetPlayingPlayer()));
/*test*/
TileBag bag = new TileBag(0);
Assert.False(game.DrawTiles(game.GetPlayingPlayer()));
return;
}
// [Fact]
// public void Test_DrawTile()
// {
// Game game = new Game();
// game.AddPlayerInGame("Test1");
// game.AddPlayerInGame("Test2");
//
// game.StartGame();
// game.SetNextPlayer();
//
// Assert.True(game.DrawTiles(game.GetPlayingPlayer()));
//
// /*test*/
// TileBag bag = new TileBag(0);
// Assert.False(game.DrawTiles(game.GetPlayingPlayer()));
// return;
//
// }
[Theory]
[InlineData(true)]
@ -340,7 +338,7 @@ public class TestGame
game.PlaceTile(game.GetPlayingPlayer(), t6, 5, 0);
Assert.False(game.IsMoveCorrect(t7, 6, 0, game.GetBoard()));
Assert.False(game.IsMoveCorrect(t7, 6, 0, game.GetBoard()!));
}
@ -390,6 +388,24 @@ public class TestGame
game.CheckGameOver(game.GetPlayingPlayer());
}
[Fact]
public void Test_ClearGame()
{
Game game = new Game();
game.AddPlayerInGame("Test1");
game.AddPlayerInGame("Test2");
game.StartGame();
game.SetFirstPlayer();
game.ClearGame();
Assert.Empty(game.PlayerList);
Assert.Null(game.GetTileBag());
Assert.Null(game.GetBoard());
Assert.Equal(-1, game.GetPlayingPlayerPosition());
}
}

Write Preview
Loading…
Cancel
Save