diff --git a/Qwirkle/QwirkleClassLibrary/Game.cs b/Qwirkle/QwirkleClassLibrary/Game.cs index 1f800c6..828a995 100644 --- a/Qwirkle/QwirkleClassLibrary/Game.cs +++ b/Qwirkle/QwirkleClassLibrary/Game.cs @@ -57,7 +57,7 @@ namespace QwirkleClassLibrary { List tiles = players[posplayer].Tiles; - string r = ("Tile of " + posplayer); + string r = ("Tile of " + posplayer + " : "); foreach(Tile tile in tiles) { diff --git a/Qwirkle/QwirkleClassLibrary/Player.cs b/Qwirkle/QwirkleClassLibrary/Player.cs index 82a7093..367291f 100644 --- a/Qwirkle/QwirkleClassLibrary/Player.cs +++ b/Qwirkle/QwirkleClassLibrary/Player.cs @@ -11,11 +11,13 @@ namespace QwirkleClassLibrary private string nameTag; private List tiles; private bool isPlaying = false; + private Score s; public Player(string name) { nameTag = name; tiles = new List(); + s = new Score(this); Console.WriteLine("Player created. Name : " + nameTag + "\n"); } @@ -23,6 +25,7 @@ namespace QwirkleClassLibrary { nameTag = "Unknow"; tiles = new List(); + s = new Score(this); Console.WriteLine("Player created. Name : " + nameTag + "\n"); } diff --git a/Qwirkle/QwirkleClassLibrary/Score.cs b/Qwirkle/QwirkleClassLibrary/Score.cs index f855527..9989d92 100644 --- a/Qwirkle/QwirkleClassLibrary/Score.cs +++ b/Qwirkle/QwirkleClassLibrary/Score.cs @@ -10,5 +10,12 @@ namespace QwirkleClassLibrary { private int score; private string playerTag; + + public Score(Player p) + { + score = 0; + playerTag = p.GetName; + } + } } diff --git a/Qwirkle/QwirkleConsoleApp/Program.cs b/Qwirkle/QwirkleConsoleApp/Program.cs index bdd8a07..a03a265 100644 --- a/Qwirkle/QwirkleConsoleApp/Program.cs +++ b/Qwirkle/QwirkleConsoleApp/Program.cs @@ -85,19 +85,23 @@ static void TilsBagPlayer(Game game) } -Game game = InitializerGame(); -Write("\n -------------------------------------------------------- \n"); +static void testJeremy() +{ + Game game = InitializerGame(); + Write("\n -------------------------------------------------------- \n"); + NextPlayer(game); + NextPlayer(game); + NextPlayer(game); + NextPlayer(game); + TilsBagPlayer(game); -NextPlayer(game); -NextPlayer(game); -NextPlayer(game); -NextPlayer(game); + for (int i = 0; i < game.GetNbPlayers; i++) + { + game.ShowTileOfPlayer(i); + } +} -TilsBagPlayer(game); -game.ShowTileOfPlayer(0); -game.ShowTileOfPlayer(1); -game.ShowTileOfPlayer(2); -game.ShowTileOfPlayer(3); +testJeremy();