From 24db8beb1b5f487d567f911bf5f1a5fcb6844526 Mon Sep 17 00:00:00 2001 From: "jeremy.mouyon" Date: Fri, 17 May 2024 15:27:26 +0200 Subject: [PATCH] push now --- Qwirkle/QwirkleClassLibrary/Game.cs | 2 +- Qwirkle/QwirkleClassLibrary/TileBag.cs | 35 +++++++++++--------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/Qwirkle/QwirkleClassLibrary/Game.cs b/Qwirkle/QwirkleClassLibrary/Game.cs index fea389c..93785ff 100644 --- a/Qwirkle/QwirkleClassLibrary/Game.cs +++ b/Qwirkle/QwirkleClassLibrary/Game.cs @@ -160,7 +160,7 @@ namespace QwirkleClassLibrary { foreach (var p in players) { - for (int j = 0; j < 1; j++) // 6 + for (int j = 0; j < 6; j++) { int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count); diff --git a/Qwirkle/QwirkleClassLibrary/TileBag.cs b/Qwirkle/QwirkleClassLibrary/TileBag.cs index 7c74188..21f1381 100644 --- a/Qwirkle/QwirkleClassLibrary/TileBag.cs +++ b/Qwirkle/QwirkleClassLibrary/TileBag.cs @@ -14,27 +14,22 @@ namespace QwirkleClassLibrary public TileBag(int nbSet) { - /* if (nbSet < 0 || nbSet > 3) - { - throw new ArgumentException(nbSet.ToString()); - } - - for (int i = 0; i < nbSet; i++) - { - foreach (Shape s in Enum.GetValues(typeof(Shape))) - { - foreach (Color c in Enum.GetValues(typeof(Color))) - { - Tile t = new Tile(s, c); - tiles.Add(t); - } - } - }*/ + if (nbSet < 0 || nbSet > 3) + { + throw new ArgumentException(nbSet.ToString()); + } - Tile t1 = new Tile(Shape.Square, Color.Red); - tiles.Add(t1); - Tile t2 = new Tile(Shape.Star, Color.Yellow); - tiles.Add(t2); + for (int i = 0; i < nbSet; i++) + { + foreach (Shape s in Enum.GetValues(typeof(Shape))) + { + foreach (Color c in Enum.GetValues(typeof(Color))) + { + Tile t = new Tile(s, c); + tiles.Add(t); + } + } + } TilesBag = tiles.AsReadOnly(); }