Merge branch 'master' of https://codefirst.iut.uca.fr/git/jeremy.mouyon/sae201_qwirkle

Qwirkle/Files/LeaderBoard.json

@@ -0,0 +1 @@
+<Leaderboard xmlns="http://schemas.datacontract.org/2004/07/QwirkleClassLibrary.Players" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><leaderboard><Score><Date>2024-05-31T00:00:00+02:00</Date><PlayerName>Jérémy</PlayerName><Points>0</Points><Victories>1</Victories></Score><Score><Date>2024-05-31T00:00:00+02:00</Date><PlayerName>Jules</PlayerName><Points>0</Points><Victories>0</Victories></Score></leaderboard></Leaderboard>

Qwirkle/QwirkleClassLibrary/Boards/Board.cs

@@ -122,7 +122,7 @@ namespace QwirkleClassLibrary.Boards
 
             return null;
         }
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

Qwirkle/QwirkleClassLibrary/Boards/Cell.cs

@@ -85,7 +85,7 @@ public class Cell : INotifyPropertyChanged
         }
     }
 
-    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }

Qwirkle/QwirkleClassLibrary/Events/SwapTilesNotifiedEventArgs.cs

@@ -1,7 +1,12 @@
 namespace QwirkleClassLibrary.Events
 {
-    public class SwapTilesNotifiedEventArgs(string reason)
+    public class SwapTilesNotifiedEventArgs
     {
-        public string Reason { get; private set; } = reason;
+        public string Reason { get; private set; }
+
+        public SwapTilesNotifiedEventArgs(string reason)
+        {
+            Reason = reason;
+        }
     }
 }

Qwirkle/QwirkleClassLibrary/Games/Game.cs

@@ -20,20 +20,24 @@ namespace QwirkleClassLibrary.Games
     [DataContract]
     public class Game : IPlayer, IRules
     {
-        public ReadOnlyDictionary<Player, int> ScoreBoard => scoreBoard.AsReadOnly();
-        private readonly Dictionary<Player, int> scoreBoard = new();
-
         private TileBag? bag = null;
         
         [DataMember]
-        public bool GameRunning { get; private set; }
+        public bool GameRunning { get; set; }
 
         [DataMember]
         private Board board = new Board(15, 12);
         public Board Board => board;
-
+        
         public ReadOnlyCollection<Player> PlayerList => players.AsReadOnly();
+        
+        [DataMember]
         private readonly List<Player> players = new();
+        
+        [DataMember]
+        private readonly Dictionary<Player, int> scoreBoard = new();
+        
+        public ReadOnlyDictionary<Player, int> ScoreBoard => scoreBoard.AsReadOnly();
 
         public ReadOnlyCollection<Cell> CellsUsed => cellUsed.AsReadOnly();
         private readonly List<Cell> cellUsed = new();
@@ -259,7 +263,7 @@ namespace QwirkleClassLibrary.Games
             {
                 for (int j = 0; j < 6; j++)
                 {
-                    if (bag != null)
+                    if (bag != null && p.Tiles.Count < 6)
                     {
                         int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
 
@@ -333,16 +337,14 @@ namespace QwirkleClassLibrary.Games
             return false;
         }
 
-        public bool TileInbag(Player player, Tile tile)
+        private bool TileInbag(Player player, Tile tile)
         {
-            for (int i = 0; i < player.Tiles.Count; i++)
+            foreach (var t in player.Tiles)
             {
-                Tile? t = player.Tiles[i];
-                if (Object.ReferenceEquals(t, tile)) return true;
-
+                if (ReferenceEquals(t, tile)) return true;
             }
-            return false;
 
+            return false;
         }
 
 

Qwirkle/QwirkleClassLibrary/Persistences/GamePersistenceJson.cs

@@ -0,0 +1,27 @@
+using System.Runtime.Serialization;
+using QwirkleClassLibrary.Games;
+
+namespace QwirkleClassLibrary.Persistences;
+
+public class GamePersistenceJson : IGamePersistence
+{
+    public void SaveGame(Game game)
+    {
+        var serializer = new DataContractSerializer(typeof(Game));
+        
+        using (Stream writer = File.Create("Game.json"))
+        {
+            serializer.WriteObject(writer, game);
+        }
+    }
+
+    public Game LoadGame()
+    {
+        var serializer = new DataContractSerializer(typeof(Game));
+
+        using (Stream reader = File.OpenRead("Game.json"))
+        {
+            return serializer.ReadObject(reader) as Game ?? throw new InvalidOperationException();
+        }
+    }
+}

Qwirkle/QwirkleClassLibrary/Persistences/IGamePersistence.cs

@@ -0,0 +1,10 @@
+using QwirkleClassLibrary.Games;
+
+namespace QwirkleClassLibrary.Persistences;
+
+public interface IGamePersistence
+{
+    void SaveGame(Game game);
+    
+    Game LoadGame();
+}

Qwirkle/QwirkleClassLibrary/Persistences/ILeaderboardPersistence.cs

@@ -0,0 +1,10 @@
+using QwirkleClassLibrary.Players;
+
+namespace QwirkleClassLibrary.Persistences;
+
+public interface ILeaderboardPersistence
+{
+    void SaveLeaderboard(Leaderboard leaderboard);
+    
+    Leaderboard LoadLeaderboard();
+}

Qwirkle/QwirkleClassLibrary/Persistences/LeaderboardPersistenceJson.cs

@@ -0,0 +1,27 @@
+using System.Runtime.Serialization;
+using QwirkleClassLibrary.Players;
+
+namespace QwirkleClassLibrary.Persistences;
+
+public class LeaderboardPersistenceJson : ILeaderboardPersistence
+{
+    public void SaveLeaderboard(Leaderboard leaderboard)
+    {
+        var serializer = new DataContractSerializer(typeof(Leaderboard));
+        
+        using (Stream writer = File.Create("Leaderboard.json"))
+        {
+            serializer.WriteObject(writer, leaderboard);
+        }
+    }
+
+    public Leaderboard LoadLeaderboard()
+    {
+        var serializer = new DataContractSerializer(typeof(Leaderboard));
+
+        using (Stream reader = File.OpenRead("Leaderboard.json"))
+        {
+            return serializer.ReadObject(reader) as Leaderboard ?? throw new InvalidOperationException();
+        }
+    }
+}

Qwirkle/QwirkleClassLibrary/Players/Leaderboard.cs

@@ -3,14 +3,18 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Runtime.ExceptionServices;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace QwirkleClassLibrary.Players
 {
+    [DataContract]
     public class Leaderboard
     {
         public ReadOnlyCollection<Score> Lb => leaderboard.AsReadOnly();
+        
+        [DataMember]
         private readonly List<Score> leaderboard = new();
         
         

Qwirkle/QwirkleClassLibrary/Players/Player.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,20 +12,15 @@ using QwirkleClassLibrary.Tiles;
 
 namespace QwirkleClassLibrary.Players
 {
+    [DataContract]
     public class Player : INotifyPropertyChanged
     {
-        private ObservableCollection<Tile> playerTiles = new ObservableCollection<Tile>();
-        public ObservableCollection<Tile> Tiles
-        {
-            get { return playerTiles; }
-            set
-            {
-                playerTiles = value;
-                OnPropertyChanged(nameof(Tiles));
-            }
-        }
+        [DataMember]
+        public ObservableCollection<Tile> Tiles { get; private set; }
 
+        
         public event PropertyChangedEventHandler? PropertyChanged;
+        
         void OnPropertyChanged([CallerMemberName] string? propertyName = null)
             => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
@@ -41,10 +37,13 @@ namespace QwirkleClassLibrary.Players
             }
 
             NameTag = name;
+            Tiles = new ObservableCollection<Tile>();
         }
 
-        public string NameTag { get; }
+        [DataMember]
+        public string NameTag { get; set; }
 
+        [DataMember]
         public bool IsPlaying { get; set; } = false;
         
         /// <summary>
@@ -53,7 +52,7 @@ namespace QwirkleClassLibrary.Players
         /// <param name="tile"></param>
         public void AddTileToPlayer(Tile tile)
         {
-            playerTiles.Add(tile);
+            Tiles.Add(tile);
             OnPropertyChanged(nameof(Tiles));
         }
 
@@ -64,7 +63,7 @@ namespace QwirkleClassLibrary.Players
         /// <returns>bool</returns>
         public bool RemoveTileToPlayer(Tile tile)
         {
-            if (playerTiles.Remove(tile))
+            if (Tiles.Remove(tile))
             {
                 OnPropertyChanged(nameof(Tiles));
                 return true;

Qwirkle/QwirkleClassLibrary/Players/Score.cs

@@ -3,16 +3,25 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace QwirkleClassLibrary.Players
 {
+    [DataContract]
     public class Score
     {
+        [DataMember]
         public string PlayerName { get; private set; }
+        
+        [DataMember]
         public DateTime Date { get; set; }
+        
+        [DataMember]
         public int Points { get; set; }
+        
+        [DataMember]
         public int Victories { get; set; }
 
         /// <summary>

Qwirkle/QwirkleClassLibrary/Tiles/Color.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 

Qwirkle/QwirkleClassLibrary/Tiles/TileBag.cs

@@ -35,8 +35,7 @@ namespace QwirkleClassLibrary.Tiles
                     }
                 }
             }
-
-
+            
             TilesBag = tiles.AsReadOnly();
         }
 

Qwirkle/QwirkleConsoleApp/Program.cs

@@ -12,6 +12,7 @@ using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Transactions;
+using QwirkleClassLibrary.Persistences;
 using static System.Console;
 
 
@@ -173,7 +174,7 @@ static void MenuSwitch(Game game)
 {
     int enter = 0;
 
-    while (enter != 3)
+    while (enter != 3 && game.GameRunning)
     {
         ShowBoard(game);
 
@@ -186,6 +187,7 @@ static void MenuSwitch(Game game)
         WriteLine("[1] Place your tiles");
         WriteLine("[2] Swap your tiles");
         WriteLine("[3] End your turn / Skip your turn");
+        WriteLine("[4] Save the game");
         Write("Enter your choice : ");
 
         try
@@ -215,7 +217,17 @@ static void MenuSwitch(Game game)
                 game.EmptyCellUsed();
                 game.DrawTiles(game.GetPlayingPlayer());
                 game.CheckGameOver(game.GetPlayingPlayer());
+
+                IGamePersistence gameSave = new GamePersistenceJson();
+                gameSave.SaveGame(game);
+                
                 return;
+            case 4:
+                IGamePersistence endGameSave = new GamePersistenceJson();
+                endGameSave.SaveGame(game);
+                
+                game.GameRunning = false;
+                break;
         }
     }
 }
@@ -231,20 +243,20 @@ static void ShowBoard(Game game)
             Cell? cell = board.GetCell(y, i);
             if (cell != null && !cell.IsFree)
             {
-                Tile? tile = cell.GetTile;
+                Tile? tile = cell.Tile;
                 if (tile != null)
                 {
-                    Console.Write("| " + tile.GetShape.ToString()[0] + tile.GetShape.ToString()[1] +
+                    Write("| " + tile.GetShape.ToString()[0] + tile.GetShape.ToString()[1] +
                                   tile.GetColor.ToString()[0] + " |");
                 }
             }
             else
             {
-                Console.Write("|     |");
+                Write("|     |");
             }
         }
 
-        Console.WriteLine();
+        WriteLine();
     }
 }
 
@@ -281,9 +293,9 @@ static void MainMenu(Game game)
 {
     game.GiveTilesToPlayers();
 
-    Console.ForegroundColor = ConsoleColor.Green;
+    ForegroundColor = ConsoleColor.Green;
     WriteLine("Game is starting !");
-    Console.ResetColor();
+    ResetColor();
 
     NotificationClass nc = new NotificationClass();
 
@@ -309,12 +321,40 @@ static void MainMenu(Game game)
     ShowScoreBoard(game);
 }
 
+static void MainMenuContinue(Game game)
+{
+    ForegroundColor = ConsoleColor.Green;
+    WriteLine("Game loaded ! You can continue the game !");
+    ResetColor();
+    
+    NotificationClass nc = new NotificationClass();
+
+    do
+    {
+        game.NextPlayerNotified += nc.NotificationNextPlayer;
+        game.EndOfGameNotified += nc.NotificationEndOfGame;
+
+        game.SetNextPlayer();
+
+        WriteLine(" --------------------- GAME ! ------------------------");
+
+        MenuSwitch(game);
+
+        game.NextPlayerNotified -= nc.NotificationNextPlayer;
+        game.EndOfGameNotified -= nc.NotificationEndOfGame;
+
+    } while (game.GameRunning);
+}
+
 static void MainGame()
 {
+    Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), "..\\..\\..\\..\\Files"));
+    
     Leaderboard leaderboard = new Leaderboard();
-    Console.ForegroundColor = ConsoleColor.DarkGray;
+    
+    ForegroundColor = ConsoleColor.DarkGray;
     WriteLine(" ===================== WELCOME TO QWIRKLE ! =====================");
-    Console.ResetColor();
+    ResetColor();
 
     int enter = 0;
 
@@ -322,8 +362,9 @@ static void MainGame()
     {
         ForegroundColor = ConsoleColor.DarkCyan;
         WriteLine("[1] Create game");
-        WriteLine("[2] Show leaderboard");
-        WriteLine("[3] Exit");
+        WriteLine("[2] Load game");
+        WriteLine("[3] Show leaderboard");
+        WriteLine("[4] Exit");
         WriteLine();
         ResetColor();
         WriteLine("Enter your choice : ");
@@ -347,47 +388,43 @@ static void MainGame()
                 ForegroundColor = ConsoleColor.DarkYellow;
                 WriteLine("Enter minimun 2 player and max 4 player !\n");
                 ResetColor();
+                
                 Game game = new Game();
                 AddPlayers(game);
+                
                 game.StartGame();
                 MainMenu(game);
+                
                 leaderboard.AddScoreInLead(game.ScoreBoard);
+                
+                ILeaderboardPersistence leaderboardSave = new LeaderboardPersistenceJson();
+                leaderboardSave.SaveLeaderboard(leaderboard);
+                
                 break;
             
             case 2:
-                ShowLeaderboard(leaderboard);
+                Game loadedGame;
+                
+                IGamePersistence gameLoad = new GamePersistenceJson();
+                loadedGame = gameLoad.LoadGame();
+
+                ILeaderboardPersistence leaderboardLoad = new LeaderboardPersistenceJson();
+                leaderboard = leaderboardLoad.LoadLeaderboard();
+                
+                MainMenuContinue(loadedGame);
+                leaderboard.AddScoreInLead(loadedGame.ScoreBoard);
+                
                 break;
             
             case 3:
+                ShowLeaderboard(leaderboard);
+                break;
+            
+            case 4:
                 return;
         }
 
     }
 }
 
-// MainGame();
-
-var game = new Game();
-game.AddPlayerInGame(["Player1", "Player2", "Player3", "Player4"]);
-
-game.StartGame();
-game.SetNextPlayer();
-
-game.PlaceTile(game.GetPlayingPlayer(), new Tile(Shape.Round, Color.Blue), 0, 0);
-game.PlaceTile(game.GetPlayingPlayer(), new Tile(Shape.Square, Color.Blue), 0, 1);
-
-Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), "..\\..\\..\\..\\Files"));
-
-var serializer = new DataContractJsonSerializer(typeof(Game));
-using (Stream s = File.Create("game.json"))
-{
-    serializer.WriteObject(s, game);
-}
-
-Game game2;
-using (Stream s = File.OpenRead("game.json"))
-{
-    game2 = (serializer.ReadObject(s) as Game)!;
-}
-
-WriteLine(game2.GetBoard()!.GetCell(0, 0)!.GetTile);
+MainGame();

Qwirkle/TestBase/TestGame.cs

@@ -319,16 +319,20 @@ public class TestGame
         Tile t1 = new Tile(Shape.Square, Color.Red);
         Tile t2 = new Tile(Shape.Club, Color.Purple);
         Tile t3 = new Tile(Shape.Round, Color.Red);
+        
+        game.GetPlayingPlayer().Tiles.Add(t1);
+        game.GetPlayingPlayer().Tiles.Add(t2);
+        game.GetPlayingPlayer().Tiles.Add(t3);
 
-        game.PlaceTile(game.GetPlayingPlayer(), t1, 0, 0);
+        game.PlaceTile(game.GetPlayingPlayer(), game.GetPlayingPlayer().Tiles[0], 0, 0);
 
         if (except)
         {
-            Assert.True(game.IsMoveCorrect(t3, 0, 1, game.GetBoard()!));
+            Assert.True(game.IsMoveCorrect(game.GetPlayingPlayer().Tiles[1], 0, 1, game.GetBoard()!));
         }
         else
         {
-            Assert.False(game.IsMoveCorrect(t2, 0, 1, game.GetBoard()!));
+            Assert.False(game.IsMoveCorrect(game.GetPlayingPlayer().Tiles[0], 0, 1, game.GetBoard()!));
         }
     }
 
@@ -350,6 +354,12 @@ public class TestGame
         Tile t6 = new Tile(Shape.Rhombus, Color.Red);
         Tile t7 = new Tile(Shape.Round, Color.Red);
 
+        game.GetPlayingPlayer().Tiles.Add(t1);
+        game.GetPlayingPlayer().Tiles.Add(t2);
+        game.GetPlayingPlayer().Tiles.Add(t3);
+        game.GetPlayingPlayer().Tiles.Add(t4);
+        game.GetPlayingPlayer().Tiles.Add(t5);
+        game.GetPlayingPlayer().Tiles.Add(t6);
 
         game.PlaceTile(game.GetPlayingPlayer(), t1, 0, 0);
         game.PlaceTile(game.GetPlayingPlayer(), t2, 1, 0);
@@ -358,7 +368,8 @@ public class TestGame
         game.PlaceTile(game.GetPlayingPlayer(), t5, 4, 0);
         game.PlaceTile(game.GetPlayingPlayer(), t6, 5, 0);
 
-
+        game.GetPlayingPlayer().Tiles.Add(t7);
+        
         Assert.False(game.IsMoveCorrect(t7, 6, 0, game.GetBoard()!));
 
     }