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

Qwirkle/QwirkleClassLibrary/Game.cs

@@ -50,7 +50,7 @@ namespace QwirkleClassLibrary
 
             foreach(Tile tile in tiles)
             {
-                r = (r + tile.NameColorTile());
+                r = (r + " " + tile.NameColorTile());
             }
             Console.WriteLine(r);
 
@@ -80,6 +80,20 @@ namespace QwirkleClassLibrary
             }
         }
 
+        public void NextPlayer()
+        {
+            int posPlayerPlay = PositionPlayerPlay();
+
+            int posPlayerNextPlay = PositionPlayerPlay() + 1;
+
+            if (posPlayerNextPlay >= GetNbPlayers)
+            {
+                posPlayerNextPlay = 0;
+            }
+
+            SetNextPlayer(posPlayerPlay, posPlayerNextPlay);
+        }
+
     }
 
 

Qwirkle/QwirkleClassLibrary/Tile.cs

@@ -20,7 +20,7 @@ namespace QwirkleClassLibrary
 
         public string NameColorTile() 
         {
-            return (color.ToString() + " , " + shape.ToString());
+            return color.ToString() + shape.ToString();
         }
         public Shape GetShape
         {

Qwirkle/QwirkleConsoleApp/Program.cs

@@ -55,32 +55,16 @@ static Game InitializerGame()
     return new Game(Players);
 }
 
-static void NextPlayer(Game game)
-{
-    int posPlayerPlay = game.PositionPlayerPlay();
-
-    int posPlayerNextPlay = game.PositionPlayerPlay() + 1;
-
-    if (posPlayerNextPlay >= game.GetNbPlayers)
-    {
-        posPlayerNextPlay = 0;
-    }
-
-    game.SetNextPlayer(posPlayerPlay, posPlayerNextPlay);
-}
-
-
-
 
 static void testJeremy()
 {
     Game game = InitializerGame();
     Write("\n -------------------------------------------------------- \n");
 
-    NextPlayer(game);
-    NextPlayer(game);
-    NextPlayer(game);
-    NextPlayer(game);
+    game.NextPlayer();
+    game.NextPlayer();
+    game.NextPlayer();
+    game.NextPlayer();
 
     game.TilsBagPlayer();