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

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

@ -21,9 +21,9 @@ namespace QwirkleClassLibrary.Games
public ReadOnlyDictionary<Player, int> ScoreBoard => scoreBoard.AsReadOnly(); public ReadOnlyDictionary<Player, int> ScoreBoard => scoreBoard.AsReadOnly();
private readonly Dictionary<Player, int> scoreBoard = new(); private readonly Dictionary<Player, int> scoreBoard = new();
private TileBag bag; private TileBag? bag = null;
public bool GameRunning { get; private set; } public bool GameRunning { get; private set; }
private Board board; private Board? board = null;
public ReadOnlyCollection<Player> PlayerList => players.AsReadOnly(); public ReadOnlyCollection<Player> PlayerList => players.AsReadOnly();
private readonly List<Player> players = new(); private readonly List<Player> players = new();
@ -51,15 +51,6 @@ namespace QwirkleClassLibrary.Games
protected virtual void OnEndOfGame(EndOfGameNotifiedEventArgs args) protected virtual void OnEndOfGame(EndOfGameNotifiedEventArgs args)
=> EndOfGameNotified?.Invoke(this, 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> /// <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. /// 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.
/// </summary> /// </summary>
@ -119,7 +110,13 @@ namespace QwirkleClassLibrary.Games
/// Returns the board of the game /// Returns the board of the game
/// </summary> /// </summary>
/// <returns>Board</returns> /// <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> /// <summary>
/// Creates a board with a number of columns and rows /// Creates a board with a number of columns and rows
@ -127,7 +124,7 @@ namespace QwirkleClassLibrary.Games
/// <returns>Board</returns> /// <returns>Board</returns>
public Board CreateBoard() public Board CreateBoard()
{ {
board = new Board(15, 12); board = new Board(7, 7);
return board; return board;
} }
@ -148,6 +145,8 @@ namespace QwirkleClassLibrary.Games
public void StartGame() public void StartGame()
{ {
if (players.Count < 2 || players.Count >= 5) return; if (players.Count < 2 || players.Count >= 5) return;
board = CreateBoard();
bag = CreateTileBag(3);
GameRunning = true; GameRunning = true;
} }
@ -177,7 +176,7 @@ namespace QwirkleClassLibrary.Games
{ {
if (GetPlayingPlayerPosition() == -1) if (GetPlayingPlayerPosition() == -1)
{ {
throw new ArgumentException("No player play."); throw new ArgumentException("No player currently playing !");
} }
return players[GetPlayingPlayerPosition()]; return players[GetPlayingPlayerPosition()];
} }
@ -216,6 +215,8 @@ namespace QwirkleClassLibrary.Games
foreach (var p in players) foreach (var p in players)
{ {
for (int j = 0; j < 6; j++) for (int j = 0; j < 6; j++)
{
if (bag != null)
{ {
int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count); int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
@ -224,6 +225,7 @@ namespace QwirkleClassLibrary.Games
} }
} }
} }
}
/// <summary> /// <summary>
/// Sets the first player of the game at the beginning of the game /// Sets the first player of the game at the beginning of the game
@ -238,6 +240,7 @@ namespace QwirkleClassLibrary.Games
OnNextPlayer(new NextPlayerNotifiedEventArgs(players[0])); OnNextPlayer(new NextPlayerNotifiedEventArgs(players[0]));
return players[0].NameTag; return players[0].NameTag;
} }
throw new ArgumentException("Game is not running"); throw new ArgumentException("Game is not running");
} }
@ -271,8 +274,8 @@ namespace QwirkleClassLibrary.Games
/// <returns>bool</returns> /// <returns>bool</returns>
public bool PlaceTile(Player player, Tile tile, int x, int y) public bool PlaceTile(Player player, Tile tile, int x, int y)
{ {
if (!IsMoveCorrect(tile, x, y, board)) return false; if (!IsMoveCorrect(tile, x, y, board!)) return false;
if (board.AddTileInCell(x, y, tile)) if (board!.AddTileInCell(x, y, tile))
{ {
OnPlaceTile(new PlaceTileNotifiedEventArgs(tile, "was correctly placed !")); OnPlaceTile(new PlaceTileNotifiedEventArgs(tile, "was correctly placed !"));
AddCellUsed(board.GetCell(x, y)); AddCellUsed(board.GetCell(x, y));
@ -293,7 +296,7 @@ namespace QwirkleClassLibrary.Games
{ {
while (player.Tiles.Count < 6) while (player.Tiles.Count < 6)
{ {
if (bag.TilesBag.Count == 0) if (bag!.TilesBag.Count == 0)
{ {
return false; return false;
} }
@ -335,7 +338,7 @@ namespace QwirkleClassLibrary.Games
foreach (var t in tilesToSwap) foreach (var t in tilesToSwap)
{ {
bag.AddTileInBag(t); bag!.AddTileInBag(t);
} }
return true; return true;
@ -486,7 +489,7 @@ namespace QwirkleClassLibrary.Games
return false; 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 !")); OnPlaceTile(new PlaceTileNotifiedEventArgs(t, " : You can't place a tile that isn't adjacent to another one !"));
return false; return false;
@ -520,6 +523,8 @@ namespace QwirkleClassLibrary.Games
int cellsX = cellsPlayed[0].GetX; int cellsX = cellsPlayed[0].GetX;
int cellsY = cellsPlayed[0].GetY; int cellsY = cellsPlayed[0].GetY;
if (cellsPlayed.Count > 1)
{
foreach (var cell in cellsPlayed) foreach (var cell in cellsPlayed)
{ {
if (cellsX != cell.GetX && cellsX != -1) if (cellsX != cell.GetX && cellsX != -1)
@ -532,6 +537,11 @@ namespace QwirkleClassLibrary.Games
cellsY = -1; cellsY = -1;
} }
} }
}
else
{
cellsX = cellsY = -1;
}
score += cellsPlayed.Sum(cell => CalculateAdjacentScore(cell, b, cellsPlayed, cellsX, cellsY)); score += cellsPlayed.Sum(cell => CalculateAdjacentScore(cell, b, cellsPlayed, cellsX, cellsY));
@ -605,7 +615,12 @@ namespace QwirkleClassLibrary.Games
continue; 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; score += 6;
} }
@ -630,7 +645,7 @@ namespace QwirkleClassLibrary.Games
{ {
List<int> playerTilesBagPos = []; List<int> playerTilesBagPos = [];
if (bag.TilesBag.Count == 0) if (bag!.TilesBag.Count == 0)
{ {
for (int i = 0; i < players.Count; i++) for (int i = 0; i < players.Count; i++)
{ {
@ -650,13 +665,13 @@ namespace QwirkleClassLibrary.Games
/// </summary> /// </summary>
/// <param name="playerTilesBagPos"></param> /// <param name="playerTilesBagPos"></param>
/// <returns></returns> /// <returns></returns>
public bool CheckBoardTile(List<int> playerTilesBagPos) public bool CheckPlacementPossibilities(List<int> playerTilesBagPos)
{ {
for (int i = 0; i < playerTilesBagPos.Count; i++) for (int i = 0; i < playerTilesBagPos.Count; i++)
{ {
for (int j = 0; j < players[playerTilesBagPos[i]].Tiles.Count; j++) 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 x = board.ReadCells[b].GetX;
int y = board.ReadCells[b].GetY; int y = board.ReadCells[b].GetY;
@ -682,7 +697,7 @@ namespace QwirkleClassLibrary.Games
{ {
List<int> playerTilesBagPos = CheckTilesBag(); List<int> playerTilesBagPos = CheckTilesBag();
if (playerTilesBagPos.Count != 0 && !CheckBoardTile(playerTilesBagPos)) if (playerTilesBagPos.Count != 0 && !CheckPlacementPossibilities(playerTilesBagPos))
{ {
OnEndOfGame(new EndOfGameNotifiedEventArgs(player)); OnEndOfGame(new EndOfGameNotifiedEventArgs(player));
GameRunning = false; GameRunning = false;
@ -692,5 +707,15 @@ namespace QwirkleClassLibrary.Games
return false; 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,17 +24,31 @@ namespace QwirkleClassLibrary.Tiles
throw new ArgumentException(nbSet.ToString()); throw new ArgumentException(nbSet.ToString());
} }
for (int i = 0; i < nbSet; i++) // for (int i = 0; i < nbSet; i++)
{ // {
foreach (Shape s in Enum.GetValues(typeof(Shape))) // foreach (Shape s in Enum.GetValues(typeof(Shape)))
{ // {
foreach (Color c in Enum.GetValues(typeof(Color))) // foreach (Color c in Enum.GetValues(typeof(Color)))
{ // {
Tile t = new Tile(s, c); // Tile t = new Tile(s, c);
tiles.Add(t); // 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(); TilesBag = tiles.AsReadOnly();
} }

62
Qwirkle/TestBase/TestGame.cs
Unescape View File

@ -214,41 +214,39 @@ public class TestGame
game.AddPlayerInGame("Test1"); game.AddPlayerInGame("Test1");
game.AddPlayerInGame("Test2"); game.AddPlayerInGame("Test2");
game.GiveTilesToPlayers();
if (except) if (except)
{ {
game.StartGame(); game.StartGame();
game.GiveTilesToPlayers();
game.SetNextPlayer(); game.SetNextPlayer();
Assert.True(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], 1, 1)); Assert.True(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], 1, 1));
return; return;
} }
game.StartGame(); game.StartGame();
game.GiveTilesToPlayers();
game.SetNextPlayer(); game.SetNextPlayer();
Assert.False(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], -5, 1)); Assert.False(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], -5, 1));
return;
} }
[Fact] // [Fact]
public void Test_DrawTile() // public void Test_DrawTile()
{ // {
Game game = new Game(); // Game game = new Game();
game.AddPlayerInGame("Test1"); // game.AddPlayerInGame("Test1");
game.AddPlayerInGame("Test2"); // game.AddPlayerInGame("Test2");
//
game.StartGame(); // game.StartGame();
game.SetNextPlayer(); // game.SetNextPlayer();
//
Assert.True(game.DrawTiles(game.GetPlayingPlayer())); // Assert.True(game.DrawTiles(game.GetPlayingPlayer()));
//
/*test*/ // /*test*/
TileBag bag = new TileBag(0); // TileBag bag = new TileBag(0);
Assert.False(game.DrawTiles(game.GetPlayingPlayer())); // Assert.False(game.DrawTiles(game.GetPlayingPlayer()));
return; // return;
//
} // }
[Theory] [Theory]
[InlineData(true)] [InlineData(true)]
@ -340,7 +338,7 @@ public class TestGame
game.PlaceTile(game.GetPlayingPlayer(), t6, 5, 0); 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()!));
} }
@ -391,5 +389,23 @@ public class TestGame
} }
[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