tfoman/Greed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Everything is working except ending rules

Browse Source
This commit is contained in:
Tommy Öman
2022-07-06 23:23:35 +02:00
parent 298c4e94ad
commit 125b669d93
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
WinGreed/frmPersonRound.cs
View File

@ -44,7 +44,10 @@ namespace WinGreed
Button btn = null; Button btn = null;
MarkGrayAndDisable(row); if (MarkGrayAndDisable(row))
{
result = _ht.Throw();
}
row++; row++;
@ -119,8 +122,9 @@ namespace WinGreed
AnalyseNumbers(Numbers); AnalyseNumbers(Numbers);
} }
private void MarkGrayAndDisable(int row) private bool MarkGrayAndDisable(int row)
{ {
var ok = false;
List<int> Numbers = new List<int>(); List<int> Numbers = new List<int>();
if (row > 0) if (row > 0)
@ -137,12 +141,14 @@ namespace WinGreed
} }
} }
} }
AnalyseNumbers(Numbers, false); ok =AnalyseNumbers(Numbers, false);
} }
return ok;
} }
private void AnalyseNumbers(List<int> numbers, bool before = true) private bool AnalyseNumbers(List<int> numbers, bool before = true)
{ {
var result = false;
if (before) if (before)
{ {
TextBox txt = null; TextBox txt = null;
@ -184,12 +190,13 @@ namespace WinGreed
&& _ht.Dices.Count(x => x.Chosen == true) == _ht.Dices.Count) && _ht.Dices.Count(x => x.Chosen == true) == _ht.Dices.Count)
{ {
_ht.Dices.ForEach(x => x.Chosen = false); _ht.Dices.ForEach(x => x.Chosen = false);
result = true;
} }
} }
numbers.ForEach(x => Debug.Write($"{x}, ")); numbers.ForEach(x => Debug.Write($"{x}, "));
Debug.WriteLine(" -"); Debug.WriteLine(" -");
return result;
} }
@ -377,10 +384,17 @@ namespace WinGreed
var acttxt = (TextBox)this.Controls.Find($"txtChosenValue{i}", true).FirstOrDefault(); var acttxt = (TextBox)this.Controls.Find($"txtChosenValue{i}", true).FirstOrDefault();
totalSum += int.Parse(acttxt.Text); totalSum += int.Parse(acttxt.Text);
} }
TotPoints = totalSum; if (_ht.Score == 0 && totalSum < 1000)
txtTotalPoints.Text = totalSum.ToString(); {
//Startspärr
}
else
{
_ht.Score += totalSum; _ht.Score += totalSum;
} }
TotPoints = _ht.Score;
txtTotalPoints.Text = _ht.Score.ToString();
}
private void frmPersonRound_Shown(object sender, EventArgs e) private void frmPersonRound_Shown(object sender, EventArgs e)
{ {