Everything is working except ending rules
This commit is contained in:
@ -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<int> Numbers = new List<int>();
|
||||
|
||||
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)
|
||||
{
|
||||
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,10 +384,17 @@ namespace WinGreed
|
||||
var acttxt = (TextBox)this.Controls.Find($"txtChosenValue{i}", true).FirstOrDefault();
|
||||
totalSum += int.Parse(acttxt.Text);
|
||||
}
|
||||
TotPoints = totalSum;
|
||||
txtTotalPoints.Text = totalSum.ToString();
|
||||
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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user