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

Qwirkle/Files/game.json

@@ -1 +0,0 @@
-{"GameRunning":false,"bag":null,"board":{"Columns":15,"Rows":12,"cells":[{"Tile":null,"x":0,"y":0},{"Tile":null,"x":0,"y":1},{"Tile":null,"x":0,"y":2},{"Tile":null,"x":0,"y":3},{"Tile":null,"x":0,"y":4},{"Tile":null,"x":0,"y":5},{"Tile":null,"x":0,"y":6},{"Tile":null,"x":0,"y":7},{"Tile":null,"x":0,"y":8},{"Tile":null,"x":0,"y":9},{"Tile":null,"x":0,"y":10},{"Tile":null,"x":0,"y":11},{"Tile":null,"x":0,"y":12},{"Tile":null,"x":0,"y":13},{"Tile":null,"x":0,"y":14},{"Tile":null,"x":1,"y":0},{"Tile":null,"x":1,"y":1},{"Tile":null,"x":1,"y":2},{"Tile":null,"x":1,"y":3},{"Tile":null,"x":1,"y":4},{"Tile":null,"x":1,"y":5},{"Tile":null,"x":1,"y":6},{"Tile":null,"x":1,"y":7},{"Tile":null,"x":1,"y":8},{"Tile":null,"x":1,"y":9},{"Tile":null,"x":1,"y":10},{"Tile":null,"x":1,"y":11},{"Tile":null,"x":1,"y":12},{"Tile":null,"x":1,"y":13},{"Tile":null,"x":1,"y":14},{"Tile":null,"x":2,"y":0},{"Tile":null,"x":2,"y":1},{"Tile":null,"x":2,"y":2},{"Tile":null,"x":2,"y":3},{"Tile":null,"x":2,"y":4},{"Tile":null,"x":2,"y":5},{"Tile":null,"x":2,"y":6},{"Tile":null,"x":2,"y":7},{"Tile":null,"x":2,"y":8},{"Tile":null,"x":2,"y":9},{"Tile":null,"x":2,"y":10},{"Tile":null,"x":2,"y":11},{"Tile":null,"x":2,"y":12},{"Tile":null,"x":2,"y":13},{"Tile":null,"x":2,"y":14},{"Tile":null,"x":3,"y":0},{"Tile":null,"x":3,"y":1},{"Tile":null,"x":3,"y":2},{"Tile":null,"x":3,"y":3},{"Tile":null,"x":3,"y":4},{"Tile":null,"x":3,"y":5},{"Tile":null,"x":3,"y":6},{"Tile":null,"x":3,"y":7},{"Tile":null,"x":3,"y":8},{"Tile":null,"x":3,"y":9},{"Tile":null,"x":3,"y":10},{"Tile":null,"x":3,"y":11},{"Tile":null,"x":3,"y":12},{"Tile":null,"x":3,"y":13},{"Tile":null,"x":3,"y":14},{"Tile":null,"x":4,"y":0},{"Tile":null,"x":4,"y":1},{"Tile":null,"x":4,"y":2},{"Tile":null,"x":4,"y":3},{"Tile":null,"x":4,"y":4},{"Tile":null,"x":4,"y":5},{"Tile":null,"x":4,"y":6},{"Tile":null,"x":4,"y":7},{"Tile":null,"x":4,"y":8},{"Tile":null,"x":4,"y":9},{"Tile":null,"x":4,"y":10},{"Tile":null,"x":4,"y":11},{"Tile":null,"x":4,"y":12},{"Tile":null,"x":4,"y":13},{"Tile":null,"x":4,"y":14},{"Tile":null,"x":5,"y":0},{"Tile":null,"x":5,"y":1},{"Tile":null,"x":5,"y":2},{"Tile":null,"x":5,"y":3},{"Tile":null,"x":5,"y":4},{"Tile":null,"x":5,"y":5},{"Tile":null,"x":5,"y":6},{"Tile":null,"x":5,"y":7},{"Tile":null,"x":5,"y":8},{"Tile":null,"x":5,"y":9},{"Tile":null,"x":5,"y":10},{"Tile":null,"x":5,"y":11},{"Tile":null,"x":5,"y":12},{"Tile":null,"x":5,"y":13},{"Tile":null,"x":5,"y":14},{"Tile":null,"x":6,"y":0},{"Tile":null,"x":6,"y":1},{"Tile":null,"x":6,"y":2},{"Tile":null,"x":6,"y":3},{"Tile":null,"x":6,"y":4},{"Tile":null,"x":6,"y":5},{"Tile":null,"x":6,"y":6},{"Tile":null,"x":6,"y":7},{"Tile":null,"x":6,"y":8},{"Tile":null,"x":6,"y":9},{"Tile":null,"x":6,"y":10},{"Tile":null,"x":6,"y":11},{"Tile":null,"x":6,"y":12},{"Tile":null,"x":6,"y":13},{"Tile":null,"x":6,"y":14},{"Tile":null,"x":7,"y":0},{"Tile":null,"x":7,"y":1},{"Tile":null,"x":7,"y":2},{"Tile":null,"x":7,"y":3},{"Tile":null,"x":7,"y":4},{"Tile":null,"x":7,"y":5},{"Tile":null,"x":7,"y":6},{"Tile":null,"x":7,"y":7},{"Tile":null,"x":7,"y":8},{"Tile":null,"x":7,"y":9},{"Tile":null,"x":7,"y":10},{"Tile":null,"x":7,"y":11},{"Tile":null,"x":7,"y":12},{"Tile":null,"x":7,"y":13},{"Tile":null,"x":7,"y":14},{"Tile":null,"x":8,"y":0},{"Tile":null,"x":8,"y":1},{"Tile":null,"x":8,"y":2},{"Tile":null,"x":8,"y":3},{"Tile":null,"x":8,"y":4},{"Tile":null,"x":8,"y":5},{"Tile":null,"x":8,"y":6},{"Tile":null,"x":8,"y":7},{"Tile":null,"x":8,"y":8},{"Tile":null,"x":8,"y":9},{"Tile":null,"x":8,"y":10},{"Tile":null,"x":8,"y":11},{"Tile":null,"x":8,"y":12},{"Tile":null,"x":8,"y":13},{"Tile":null,"x":8,"y":14},{"Tile":null,"x":9,"y":0},{"Tile":null,"x":9,"y":1},{"Tile":null,"x":9,"y":2},{"Tile":null,"x":9,"y":3},{"Tile":null,"x":9,"y":4},{"Tile":null,"x":9,"y":5},{"Tile":null,"x":9,"y":6},{"Tile":null,"x":9,"y":7},{"Tile":null,"x":9,"y":8},{"Tile":null,"x":9,"y":9},{"Tile":null,"x":9,"y":10},{"Tile":null,"x":9,"y":11},{"Tile":null,"x":9,"y":12},{"Tile":null,"x":9,"y":13},{"Tile":null,"x":9,"y":14},{"Tile":null,"x":10,"y":0},{"Tile":null,"x":10,"y":1},{"Tile":null,"x":10,"y":2},{"Tile":null,"x":10,"y":3},{"Tile":null,"x":10,"y":4},{"Tile":null,"x":10,"y":5},{"Tile":null,"x":10,"y":6},{"Tile":null,"x":10,"y":7},{"Tile":null,"x":10,"y":8},{"Tile":null,"x":10,"y":9},{"Tile":null,"x":10,"y":10},{"Tile":null,"x":10,"y":11},{"Tile":null,"x":10,"y":12},{"Tile":null,"x":10,"y":13},{"Tile":null,"x":10,"y":14},{"Tile":null,"x":11,"y":0},{"Tile":null,"x":11,"y":1},{"Tile":null,"x":11,"y":2},{"Tile":null,"x":11,"y":3},{"Tile":null,"x":11,"y":4},{"Tile":null,"x":11,"y":5},{"Tile":null,"x":11,"y":6},{"Tile":null,"x":11,"y":7},{"Tile":null,"x":11,"y":8},{"Tile":null,"x":11,"y":9},{"Tile":null,"x":11,"y":10},{"Tile":null,"x":11,"y":11},{"Tile":null,"x":11,"y":12},{"Tile":null,"x":11,"y":13},{"Tile":null,"x":11,"y":14}]},"cellUsed":[],"players":[],"scoreBoard":[]}

Qwirkle/QwirkleClassLibrary/Persistences/GamePersistenceJson.cs

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

Qwirkle/QwirkleClassLibrary/Persistences/GamePersistenceXml.cs

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

Qwirkle/QwirkleClassLibrary/Tiles/TileBag.cs

@@ -11,10 +11,11 @@ namespace QwirkleClassLibrary.Tiles
     [DataContract]
     public class TileBag
     {
-        public ReadOnlyCollection<Tile> TilesBag { get; private set; }
-        
         [DataMember]
         private readonly List<Tile> tiles = new List<Tile>();
+        
+        public ReadOnlyCollection<Tile> TilesBag { get; private set; }
+        
 
         /// <summary>
         /// This is the constructor for the TileBag. It will create a tile of each of the possibilities among the Color and Shape Enums.
@@ -40,7 +41,7 @@ namespace QwirkleClassLibrary.Tiles
                 }
             }
             
-            TilesBag = tiles.AsReadOnly();
+            Init();
         }
 
         /// <summary>
@@ -69,5 +70,11 @@ namespace QwirkleClassLibrary.Tiles
             }
             return false;
         }
+        
+        [OnDeserialized]
+        private void Init(StreamingContext sc = new())
+        {
+            TilesBag = tiles.AsReadOnly();
+        }
     }
 }

Qwirkle/QwirkleConsoleApp/Program.cs

@@ -218,12 +218,12 @@ static void MenuSwitch(Game game)
                 game.DrawTiles(game.GetPlayingPlayer());
                 game.CheckGameOver(game.GetPlayingPlayer());
 
-                IGamePersistence gameSave = new GamePersistenceJson();
+                IGamePersistence gameSave = new GamePersistenceXml();
                 gameSave.SaveGame(game);
                 
                 return;
             case 4:
-                IGamePersistence endGameSave = new GamePersistenceJson();
+                IGamePersistence endGameSave = new GamePersistenceXml();
                 endGameSave.SaveGame(game);
                 
                 game.GameRunning = false;
@@ -289,6 +289,27 @@ static void ShowLeaderboard(Leaderboard leaderboard)
     WriteLine();
 }
 
+static void GameLoop(Game game)
+{
+    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 MainMenu(Game game)
 {
     game.GiveTilesToPlayers();
@@ -326,24 +347,14 @@ 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 ! ------------------------");
+    NotificationClass nc = new NotificationClass();
 
-        MenuSwitch(game);
+    WriteLine(" --------------------- GAME ! ------------------------");
 
-        game.NextPlayerNotified -= nc.NotificationNextPlayer;
-        game.EndOfGameNotified -= nc.NotificationEndOfGame;
+    MenuSwitch(game);
 
-    } while (game.GameRunning);
+    GameLoop(game);
 }
 
 static void MainGame()
@@ -411,7 +422,7 @@ static void MainGame()
             case 2:
                 Game loadedGame;
                 
-                IGamePersistence gameLoad = new GamePersistenceJson();
+                IGamePersistence gameLoad = new GamePersistenceXml();
                 loadedGame = gameLoad.LoadGame();
 
                 ILeaderboardPersistence leaderboardLoad = new LeaderboardPersistenceJson();

Qwirkle/TestBase/TestPersistence.cs

@@ -13,10 +13,10 @@ namespace TestBase
         {
             var game = new Game();
 
-            var gamePersistence = new GamePersistenceJson();
+            var gamePersistence = new GamePersistenceXml();
             gamePersistence.SaveGame(game);
 
-            Assert.True(File.Exists("Game.json"));
+            Assert.True(File.Exists("Game.xml"));
         }
 
         [Fact]
@@ -29,7 +29,7 @@ namespace TestBase
             game.AddPlayerInGame(["Jules", "Jérémy"]);
             game.StartGame();
 
-            var gamePersistence = new GamePersistenceJson();
+            var gamePersistence = new GamePersistenceXml();
             gamePersistence.SaveGame(game);
 
             var loadedGame = gamePersistence.LoadGame();