From 125b669d9389ad716900d5afe6112a3b485afde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tommy=20=C3=96man?= Date: Wed, 6 Jul 2022 23:23:35 +0200 Subject: [PATCH] Everything is working except ending rules --- WinGreed/frmPersonRound.cs | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/WinGreed/frmPersonRound.cs b/WinGreed/frmPersonRound.cs index 74b8dbc..8774ea9 100644 --- a/WinGreed/frmPersonRound.cs +++ b/WinGreed/frmPersonRound.cs @@ -44,7 +44,10 @@ namespace WinGreed Button btn = null; - MarkGrayAndDisable(row); + if (MarkGrayAndDisable(row)) + { + result = _ht.Throw(); + } row++; @@ -119,8 +122,9 @@ namespace WinGreed AnalyseNumbers(Numbers); } - private void MarkGrayAndDisable(int row) + private bool MarkGrayAndDisable(int row) { + var ok = false; List Numbers = new List(); if (row > 0) @@ -137,12 +141,14 @@ namespace WinGreed } } } - AnalyseNumbers(Numbers, false); + ok =AnalyseNumbers(Numbers, false); } + return ok; } - private void AnalyseNumbers(List numbers, bool before = true) + private bool AnalyseNumbers(List numbers, bool before = true) { + var result = false; if (before) { TextBox txt = null; @@ -184,12 +190,13 @@ namespace WinGreed && _ht.Dices.Count(x => x.Chosen == true) == _ht.Dices.Count) { _ht.Dices.ForEach(x => x.Chosen = false); + result = true; } } numbers.ForEach(x => Debug.Write($"{x}, ")); Debug.WriteLine(" -"); - + return result; } @@ -377,9 +384,16 @@ namespace WinGreed var acttxt = (TextBox)this.Controls.Find($"txtChosenValue{i}", true).FirstOrDefault(); totalSum += int.Parse(acttxt.Text); } - TotPoints = totalSum; - txtTotalPoints.Text = totalSum.ToString(); - _ht.Score += totalSum; + if (_ht.Score == 0 && totalSum < 1000) + { + //Startspärr + } + else + { + _ht.Score += totalSum; + } + TotPoints = _ht.Score; + txtTotalPoints.Text = _ht.Score.ToString(); } private void frmPersonRound_Shown(object sender, EventArgs e)