Moving card count check to the reported non-fatal errors

1 files changed, 10 insertions, 0 deletions

diff --git a/src/PBNBoard.cs b/src/PBNBoard.cs
index fb36f00..15acbe0 100644
--- a/src/PBNBoard.cs
+++ b/src/PBNBoard.cs
@@ -463,10 +463,13 @@ namespace BCDD
             List<String> errors = new List<string>();

 

             BoardLayout layout = new BoardLayout(this.GetLayout());

+

             foreach (KeyValuePair<String, Dictionary<String, List<String>>> hand in layout.Hands)

             {

+                int handCount = 0;

                 foreach (KeyValuePair<String, List<String>> suit in hand.Value)

                 {

+                    handCount += suit.Value.Count;

                     foreach (String card in suit.Value)

                     {

                         if (cards.Contains(card.ToUpper()))

@@ -479,6 +482,13 @@ namespace BCDD
                         }

                     }

                 }

+                if (handCount != 13)

+                {

+                    errors.Add(String.Format("Hand in {0} does not contain 13 cards: {1}",

+                        hand.Key,

+                        String.Join(".", hand.Value.Select(suit => String.Join("", suit.Value.ToArray())).ToArray())

+                    ));

+                }

             }

 

             foreach (KeyValuePair<String, List<String>> card in deck)