From 298c4e94ad588024f9f9192eb6e0de528d771b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tommy=20=C3=96man?= Date: Wed, 6 Jul 2022 22:46:47 +0200 Subject: [PATCH] Step against more reasonable behavior , Handle rethrow , but the rethrow not ready --- WinGreed/HandleThrow.cs | 8 +- WinGreed/frmPersonRound.Designer.cs | 27 +++--- WinGreed/frmPersonRound.cs | 12 +++ WinGreed/frmPersonRound.resx | 133 ++++++++++++++-------------- WinGreed/frmStart.cs | 9 +- 5 files changed, 103 insertions(+), 86 deletions(-) diff --git a/WinGreed/HandleThrow.cs b/WinGreed/HandleThrow.cs index 3ba8adf..ed780f3 100644 --- a/WinGreed/HandleThrow.cs +++ b/WinGreed/HandleThrow.cs @@ -10,14 +10,16 @@ namespace WinGreed { public string Who { get; set; } public int Score { get; set; } + //private List _dices = new List(); - private List _dices = new List(); + public List Dices { get; set; } = new List(); + int roll; public HandleThrow() { for (int i = 1; i < 7; i++) { - _dices.Add(new Dice(i)); + Dices.Add(new Dice(i)); } roll = 0; } @@ -26,7 +28,7 @@ namespace WinGreed { var rolled = new List(); roll += 1; - foreach (Dice dice in _dices) + foreach (Dice dice in Dices) { if (!dice.Chosen) { diff --git a/WinGreed/frmPersonRound.Designer.cs b/WinGreed/frmPersonRound.Designer.cs index b114832..d1c8c06 100644 --- a/WinGreed/frmPersonRound.Designer.cs +++ b/WinGreed/frmPersonRound.Designer.cs @@ -33,9 +33,9 @@ this.label1 = new System.Windows.Forms.Label(); this.btnThrow = new System.Windows.Forms.Button(); this.btnDiceTmpl1 = new System.Windows.Forms.Button(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.btnDiceTmpl2 = new System.Windows.Forms.Button(); this.btnDiceTmpl4 = new System.Windows.Forms.Button(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.btnDiceTmpl3 = new System.Windows.Forms.Button(); this.btnDiceTmpl6 = new System.Windows.Forms.Button(); this.btnDiceTmpl5 = new System.Windows.Forms.Button(); @@ -79,6 +79,18 @@ this.btnDiceTmpl1.Visible = false; this.btnDiceTmpl1.Click += new System.EventHandler(this.btnDiceTmpl_Click); // + // imageList1 + // + this.imageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "dice1.ico"); + this.imageList1.Images.SetKeyName(1, "dice2.ico"); + this.imageList1.Images.SetKeyName(2, "dice3.ico"); + this.imageList1.Images.SetKeyName(3, "dice4.ico"); + this.imageList1.Images.SetKeyName(4, "dice5.ico"); + this.imageList1.Images.SetKeyName(5, "dice6.ico"); + // // btnDiceTmpl2 // this.btnDiceTmpl2.ImageKey = "dice2.ico"; @@ -103,18 +115,6 @@ this.btnDiceTmpl4.Visible = false; this.btnDiceTmpl4.Click += new System.EventHandler(this.btnDiceTmpl_Click); // - // imageList1 - // - this.imageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "dice1.ico"); - this.imageList1.Images.SetKeyName(1, "dice2.ico"); - this.imageList1.Images.SetKeyName(2, "dice3.ico"); - this.imageList1.Images.SetKeyName(3, "dice4.ico"); - this.imageList1.Images.SetKeyName(4, "dice5.ico"); - this.imageList1.Images.SetKeyName(5, "dice6.ico"); - // // btnDiceTmpl3 // this.btnDiceTmpl3.ImageKey = "dice3.ico"; @@ -229,6 +229,7 @@ this.Name = "frmPersonRound"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Din tur -"; + this.Shown += new System.EventHandler(this.frmPersonRound_Shown); this.ResumeLayout(false); this.PerformLayout(); diff --git a/WinGreed/frmPersonRound.cs b/WinGreed/frmPersonRound.cs index 848f82f..74b8dbc 100644 --- a/WinGreed/frmPersonRound.cs +++ b/WinGreed/frmPersonRound.cs @@ -179,6 +179,12 @@ namespace WinGreed var actTxtBox = ((TextBox)this.Controls.Find($"txtChosenValue{row}", true).FirstOrDefault()); actTxtBox.Text = outPut; actTxtBox.Refresh(); + if(((TextBox)this.Controls.Find($"txtMaxValue{row}", true).FirstOrDefault()).Text == actTxtBox.Text + && int.Parse(actTxtBox.Text.Trim()) > 0 + && _ht.Dices.Count(x => x.Chosen == true) == _ht.Dices.Count) + { + _ht.Dices.ForEach(x => x.Chosen = false); + } } numbers.ForEach(x => Debug.Write($"{x}, ")); @@ -375,5 +381,11 @@ namespace WinGreed txtTotalPoints.Text = totalSum.ToString(); _ht.Score += totalSum; } + + private void frmPersonRound_Shown(object sender, EventArgs e) + { + txtTotalPoints.Text = TotPoints.ToString(); + _ht.Score = TotPoints; + } } } diff --git a/WinGreed/frmPersonRound.resx b/WinGreed/frmPersonRound.resx index d7420e1..bc28fd7 100644 --- a/WinGreed/frmPersonRound.resx +++ b/WinGreed/frmPersonRound.resx @@ -64,8 +64,8 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu - SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAA9BUAAAJNU0Z0AUkBTAIBAQYB - AAEQAQABEAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAYADAAFAAwABAQEAAQgG + SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAnhUAAAJNU0Z0AUkBTAIBAQYB + AAEYAQABGAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAYADAAFAAwABAQEAAQgG AAEgGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEAAfABygGmAQABMwUAATMB AAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEAAYABfAH/AQACUAH/AQAB kwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFmAwABmQMAAcwCAAEzAwAC @@ -93,72 +93,71 @@ AAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEAAcwB/wFmAQAC/wGZAQAC /wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEAASEBAAGlAQADXwEAA3cB AAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7Af8BAAGkAqABAAOAAwAB - /wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/8BAAf/AfQB7wHqDEMBEwGSAfMH/wb1AfEB7wHtAfgM - 6wHsAe0B7wHzAf8F9UAABf8B8QEVAW0B8gH0Df8B8wHsAREBBwX/BPUB8wH3AfgBkgEHAfEM8gHxAQcB - 7QH4Ae8B9AT1QAAE/wLrFP8B7wETAfQD/wP1AfAB+AGSAfIS/wHxAe0B7AHzA/VAAAP/AUMB8Rb/AfQB - DwP/AvUB8AHrAQcW/wHvAewB8wL1QAAC/wHsAfAY/wHzAUMC/wH1AfMB+AEHGP8B7wHsAfQB9UAAAf8B - 8AFtBf8BvAH0DP8B9AG8Bf8BBwGSAf8B9QL3BP8BvAHvAfEL/wH0AgcB8gT/AewBBwH1QAAB/wEUBP8B - BwMAAewK/wHsAwABBwT/AUMB/wHwAfgB8wP/AewBDwEOARAB9wn/AfMBbQIOAUMBBwP/AfAB+AHzQAAB - /wFtBP8FAAG8CP8B8gUAAfQD/wEHAbwCkgP/Ae8BDgMAARAB8Aj/AewEAAEUAfMD/wHsAQdAAAHvAbwD - /wG8BQAB7Qj/AewFAAHzBP8BFAH4AfAD/wHsBQAB7wj/AeoEAAEPAfAD/wEHAZJAAAHqAfQE/wUAAQcI - /wHxBQAB9AT/ARAB+AHzA/8B9wQAAQ4BvAj/AfgEAAFDAfID/wG8AfhAAAEUBf8B7QMAARMK/wESAwAB - 7AX/AQ8B6wH0A/8B8wFtAgABDgHsCf8B8QEUAgABDwH3BP8B8QHrQAABFAf/AbwO/wG8B/8BDwHrAfQE - /wH0Ae8B7AEHC/8B8gH3Ae0BvAX/AfEB60AAARQe/wEPAesB9AX/AfQB8w3/AfQB8wb/AfEB60AAARQN - /wFtAgABbQ3/AQ8B6wH0BP8BBwETAREB6gHwCv8B9wEVAREBbQHyBP8B8QHrQAABFAz/AesEAAFtDP8B - DwHrAfQD/wG8ARADAAEUAfMI/wHvAQ4DAAFtAfQD/wHxAetAAAEUDP8BDgQAAQ8M/wEPAesB9AP/AewE - AAEOAe8I/wFtBAABEAHxA/8B8QHrQAABFAz/AQ4EAAERDP8BDwHrAfQD/wHtBAABDgEHCP8BbQQAARAB - 8QP/AfEB60AAARQM/wHwBAABBwz/AQ8B6wH0A/8B8QFDAwABEgH0CP8BBwEPAwAB+AT/AfEB60AAARQN - /wHzAm0B8w3/AQ8B6wH0BP8BvAFtARIB+AHyCv8BBwFtARIB7AH0BP8B8QHrQAABFB7/AQ8B6wH0Bv8B - 9A7/AfQG/wHxAetAAAEUBv8BEgEPARUB9Ar/AfQBFQEPAeoG/wEPAesB9AT/AfIB7AFtAZIB8wr/AfAB - 7AFtAe8F/wHxAetAAAETBf8BDwQAAfQJ/wEOAwABEAX/AQ8B6wH0A/8B8gETAwABbQH0CP8B8AFDAgAB - DgHsBP8B8AH4QAAB7QHxA/8B8gUAAfcI/wHvBQAB8wT/AUMB+AHyA/8BkgQAAQ4BBwj/AesEAAERAfID - /wEHAexAAAH0AZID/wHxBQAB9wj/AfcFAAHzA/8B8QHtAewBBwP/AewEAAEOAe8I/wHqBAABDwHwA/8B - 7wH3QAAB/wFDBP8BDwQAAfQJ/wEOAwABDwT/AW0B/wHvAewD/wEHAQ8DAAFDAfII/wH3AQ4DAAESAfQC - /wH0AfgBvEAAAf8BkgEHBP8B6gEQARQB9Ar/AfMBFAEQAeoE/wH0ARIB/wHzAfgB8QP/AfcBQwEPARQB - Bwn/AfQB7AERARABEgHwA/8BBwHsAfRAAAL/AUMa/wEQAfQB/wH1AQcB7AH0A/8B8gHwAfMM/wHyAfEB - 9AP/AfMB+AHwAfVAAAL/AfQBDhj/ARIB8gL/AfUB9AHtAZIX/wH0AewB7wL1QAAD/wHzARAB8xX/AUMB - vAP/AvUB8wLtAfMU/wHyAewB9wP1QAAF/wHrARIB8xD/AfQB6wETAfME/wP1AfQB9wH4Ae8B8xD/AfIB - 9wH4Ae8E9UAABv8B9AHsAUMBEgxtAeoBEQHrAfMG/wX1AfAB7QHsAe0N7wH3Ae0B+AH3AfIF9UAAIP8H - 9QHyAQcB7wuSAfcB7wG8AfMH9UAABfUB/wHzAQcB7QH4DOsB+AHtAe8B8gz1AfEB7wHsAfgM6wHsAe0B - BwHzAf8M9QHyAQcB7wySAe8B7gHyB/UH/wH3ARUBEwxtARIBQwHrAfMG/wT1AfQBBwH4AewBBwHxDPIB - 8QEHAZIB6wHvAfMI9QHzAfcB+AGSAbwB8QzyAfEBBwHsAfgBBwH0CfUB8AHtAewBkg7vAe0B+AGSAfEF - 9QX/AfcBFQG8EP8B9AFtAeoB9AT/A/UB8wLsAfES/wHyAZIB+AHwBvUBvAH4AfcB8xL/AfAC7AHzBvUB - 9AH3AfgB7wHzEP8B8wHvAfgB7wH0A/UD/wH0AUMBBxX/ARAB8wP/AvUB8wHsAfcW/wEHAesB8AT1AbwB - +AG8Fv8B9wHsAfME9QHzAu0B8xT/AfIB7AGSAfQC9QP/AREB9Bf/AQ4B8wL/AfUB9AHsAfcY/wEHAfgB - 8wL1AfIB+AG8GP8B9wHtAfQC9QH0Ae0Bkhf/AfQB7QH3AvUC/wHsAfAZ/wEQAfQB/wH1AQcB7Br/AZIB - 9wL1Ae0B7xL/AfQCBwHzA/8B9AHsAQcC9QEHAewB9BL/AfMB8gT/AfQB7AG8AfUB/wHzAW0E/wHwAesB - kgz/Ae8BbQEHBP8B8wHsAf8B8wH4AfAa/wHzAfgB8QHwAfgB9BH/AfIB6gIOARUBvAP/AfAB7AH0AfMB - 7AHxEv8B9wEVAREBbQHxA/8BvAHsAfQB/wESBP8BkgMAAQ4K/wEOAwAB6gT/ARUB/wEHAewc/wGSAfcB - kgHvEv8B7AQAARIB9AP/AewBvAHvAewS/wHvAQ4DAAESAfQD/wHsAe4B/wEUBP8FAAGSCP8BBwUAAfQD - /wHvAQcB9wHvHP8BvAH4AW0B8BL/AeoEAAEQAfID/wH3AZIB7AEHEv8BbQQAAQ8B8AP/Ae8B9wH/AZIE - /wUAARQI/wH3BQAB8AT/AW0B7AG8HP8B8wH4AW0B8xL/AesEAAEUAfQD/wEHAvgB8hL/AesEAAEQAfAD - /wG8AfgB8gG8BP8BEAQAAfII/wHxBQAF/wEVAfgB8Bz/AfQB6wFtAfQS/wHwARUCAAEQAe8E/wG8AesB - +AHzEv8BvAERAwAB+AT/AfEB6wG8AfAE/wH0AwAB6wr/AQcDAAHyBf8BEQHrAfEc/wH0AesBbQH0E/8B - 8gGSAe0BvAX/AfAB6wH4AfQT/wG8AesB6gGSAfQE/wHxAW0BvAHwBv8B8w7/AfMH/wERAesB8Q3/AvQN - /wH0AesBbQH0HP8B8AHrAfgB9Bz/AfEBbQG8AfAd/wERAesB8Qz/AfcCEgH3DP8B9AHrAW0B9Bz/AfAB - 6wH4AfQL/wH0AZIBEgFtAQcM/wHxAW0BvAHwHf8BEQHrAfEL/wGSAQ4CAAEOAfcL/wH0AesBbQH0HP8B - 8AHrAfgB9Av/AewBDgIAAQ8BBwv/AfEBbQG8AfAd/wERAesB8Qr/AfQBFAQAARQB9Ar/AfQB6wFtAfQc - /wHwAesB+AH0Cv8B8gERBAABbQv/AfEBbQG8AfAd/wERAesB8Qr/AfQBFAQAARUB8wr/AfQB6wFtAfQc - /wHwAesB+AH0Cv8B8QEQBAAB6gv/AfEBbQG8AfAd/wERAesB8Qv/AewEAAHsC/8B9AHrAW0B9Bz/AfAB - 6wH4AfQL/wFtAwABDgH3C/8B8QFtAbwB8B3/AREB6wHxC/8B8wH4AkMB+AHzC/8B9AHrAW0B9Bz/AfAB - 6wH4AfQL/wHyAesBQwEUAZIM/wHxAW0BvAHwHf8BEQHrAfEN/wLyDf8B9AHrAW0B9Bz/AfAB6wH4AfQN - /wLzDf8B8QFtAbwB8B3/AREB6wHxHP8B9AHrAW0B9AT/AfEB7AFtAfcB9BP/AfAB6wH4AfQE/wHzAe8B - 7AHvAfQT/wHxAW0BvAHwBf8BEwIAAfAK/wHzAQ4BAAEQBv8BEQH4AfAc/wH0AesBbQH0A/8B8QEUAwAB - 6wH0Ev8BvAHrAfgB8wP/AfQBbQIAAQ4B6wH0Ev8B8QHrAfIBvAT/ARUEAAHzCP8B9AQAAQ4F/wEVAewB - vBz/AfMB+AFtAfID/wGSBAABDwHwEv8BBwHsAfgB8gP/Ae8EAAEOAQcS/wG8AfgB/wGSBP8FAAHqCP8B - 7wUAAfEE/wFtAfcB7xz/AbwC+AG8A/8B7AQAAQ4BBxL/Ae0B9wHsAQcD/wHtBQAB9xL/Ae8B9wH/ARQE + /wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/8BAAf/AfQB7wHqDEMBEwGSAfMN/wHxAe8B7QHsDOsB + 7AHtAe8B8wb/QAAF/wHxARUBbQHyAfQN/wHzAewBEQEHCf8B8wH3AewBkgEHAfEM8gHxAQcB7QHsAe8B + 9AT/QAAE/wLrFP8B7wETAfQG/wHwAewBkgHyEv8B8QHtAewB8wP/QAAD/wFDAfEW/wH0AQ8F/wHwAesB + Bxb/Ae8B7AHzAv9AAAL/AewB8Bj/AfMBQwP/AfMB7AEHGP8B7wHsAfQB/0AAAf8B8AFtBf8BvAH0DP8B + 9AG8Bf8BBwGSAv8C9wT/AbwB7wHxC/8B9AIHAfIE/wHsAQcB/0AAAf8BFAT/AQcDAAHsCv8B7AMAAQcE + /wFDAf8B8AHsAfMD/wHsAQ8BDgEQAfcJ/wHzAW0CDgFDAQcD/wHwAewB80AAAf8BbQT/BQABvAj/AfIF + AAH0A/8BBwG8ApID/wHvAQ4DAAEQAfAI/wHsBAABFAHzA/8B7AEHQAAB7wG8A/8BvAUAAe0I/wHsBQAB + 8wT/ARQB7AHwA/8B7AUAAe8I/wHqBAABDwHwA/8BBwGSQAAB6gH0BP8FAAEHCP8B8QUAAfQE/wEQAewB + 8wP/AfcEAAEOAbwI/wHsBAABQwHyA/8BvAHsQAABFAX/Ae0DAAETCv8BEgMAAewF/wEPAesB9AP/AfMB + bQIAAQ4B7An/AfEBFAIAAQ8B9wT/AfEB60AAARQH/wG8Dv8BvAf/AQ8B6wH0BP8B9AHvAewBBwv/AfIB + 9wHtAbwF/wHxAetAAAEUHv8BDwHrAfQF/wH0AfMN/wH0AfMG/wHxAetAAAEUDf8BbQIAAW0N/wEPAesB + 9AT/AQcBEwERAeoB8Ar/AfcBFQERAW0B8gT/AfEB60AAARQM/wHrBAABbQz/AQ8B6wH0A/8BvAEQAwAB + FAHzCP8B7wEOAwABbQH0A/8B8QHrQAABFAz/AQ4EAAEPDP8BDwHrAfQD/wHsBAABDgHvCP8BbQQAARAB + 8QP/AfEB60AAARQM/wEOBAABEQz/AQ8B6wH0A/8B7QQAAQ4BBwj/AW0EAAEQAfED/wHxAetAAAEUDP8B + 8AQAAQcM/wEPAesB9AP/AfEBQwMAARIB9Aj/AQcBDwMAAewE/wHxAetAAAEUDf8B8wJtAfMN/wEPAesB + 9AT/AbwBbQESAewB8gr/AQcBbQESAewB9AT/AfEB60AAARQe/wEPAesB9Ab/AfQO/wH0Bv8B8QHrQAAB + FAb/ARIBDwEVAfQK/wH0ARUBDwHqBv8BDwHrAfQE/wHyAewBbQGSAfMK/wHwAewBbQHvBf8B8QHrQAAB + EwX/AQ8EAAH0Cf8BDgMAARAF/wEPAesB9AP/AfIBEwMAAW0B9Aj/AfABQwIAAQ4B7AT/AfAB7EAAAe0B + 8QP/AfIFAAH3CP8B7wUAAfME/wFDAewB8gP/AZIEAAEOAQcI/wHrBAABEQHyA/8BBwHsQAAB9AGSA/8B + 8QUAAfcI/wH3BQAB8wP/AfEB7QHsAQcD/wHsBAABDgHvCP8B6gQAAQ8B8AP/Ae8B90AAAf8BQwT/AQ8E + AAH0Cf8BDgMAAQ8E/wFtAf8B7wHsA/8BBwEPAwABQwHyCP8B9wEOAwABEgH0Av8B9AHsAbxAAAH/AZIB + BwT/AeoBEAEUAfQK/wHzARQBEAHqBP8B9AESAf8B8wHsAfED/wH3AUMBDwEUAQcJ/wH0AewBEQEQARIB + 8AP/AQcB7AH0QAAC/wFDGv8BEAH0Av8BBwHsAfQD/wHyAfAB8wz/AfIB8QH0A/8B8wHsAfAB/0AAAv8B + 9AEOGP8BEgHyA/8B9AHtAZIX/wH0AewB7wL/QAAD/wHzARAB8xX/AUMBvAX/AfMC7QHzFP8B8gHsAfcD + /0AABf8B6wESAfMQ/wH0AesBEwHzB/8B9AH3AewB7wHzEP8B8gH3AewB7wT/QAAG/wH0AewBQwESDG0B + 6gERAesB8wv/AfAB7QHsAe0N7wH3Ae0B7AH3AfIF/0AAJ/8B8gEHAe8LkgH3Ae8BvAHzB/9AAAb/AfMB + BwHtAewM6wHsAe0B7wHyDP8B8QHvAuwM6wHsAe0BBwHzDf8B8gEHAe8MkgHvAbwB8g7/AfcBFQETDG0B + EgFDAesB8wr/AfQBBwLsAQcB8QzyAfEBBwGSAesB7wHzCP8B8wH3AewBkgG8AfEM8gHxAQcC7AEHAfQJ + /wHwAe0B7AGSDu8B7QHsAZIB8Qr/AfcBFQG8EP8B9AFtAeoB9Af/AfMC7AHxEv8B8gGSAewB8Ab/AbwB + 7AH3AfMS/wHwAuwB8wb/AfQB9wHsAe8B8xD/AfMB7wHsAe8B9Ab/AfQBQwEHFf8BEAHzBf8B8wHsAfcW + /wEHAesB8AT/AbwB7AG8Fv8B9wHsAfME/wHzAu0B8xT/AfIB7AGSAfQF/wERAfQX/wEOAfMD/wH0AewB + 9xj/AQcB7AHzAv8B8gHsAbwY/wH3Ae0B9AL/AfQB7QGSF/8B9AHtAfcE/wHsAfAZ/wEQAfQC/wEHAewa + /wGSAfcC/wHtAe8S/wH0AgcB8wP/AfQB7AEHAv8BBwHsAfQS/wHzAfIE/wH0AewBvAL/AfMBbQT/AfAB + 6wGSDP8B7wFtAQcE/wHzAewB/wHzAewB8Br/AfMB7AHxAfAB7AH0Ef8B8gHqAg4BFQG8A/8B8AHsAfQB + 8wHsAfES/wH3ARUBEQFtAfED/wG8AewB9AH/ARIE/wGSAwABDgr/AQ4DAAHqBP8BFQH/AQcB7Bz/AZIB + 9wGSAe8S/wHsBAABEgH0A/8B7AG8Ae8B7BL/Ae8BDgMAARIB9AP/AewBvAH/ARQE/wUAAZII/wEHBQAB + 9AP/Ae8BBwH3Ae8c/wG8AewBbQHwEv8B6gQAARAB8gP/AfcBkgHsAQcS/wFtBAABDwHwA/8B7wH3Af8B + kgT/BQABFAj/AfcFAAHwBP8BbQHsAbwc/wHzAewBbQHzEv8B6wQAARQB9AP/AQcC7AHyEv8B6wQAARAB + 8AP/AbwB7AHyAbwE/wEQBAAB8gj/AfEFAAX/ARUB7AHwHP8B9AHrAW0B9BL/AfABFQIAARAB7wT/AbwB + 6wHsAfMS/wG8AREDAAHsBP8B8QHrAbwB8AT/AfQDAAHrCv8BBwMAAfIF/wERAesB8Rz/AfQB6wFtAfQT + /wHyAZIB7QG8Bf8B8AHrAewB9BP/AbwB6wHqAZIB9AT/AfEBbQG8AfAG/wHzDv8B8wf/AREB6wHxDf8C + 9A3/AfQB6wFtAfQc/wHwAesB7AH0HP8B8QFtAbwB8B3/AREB6wHxDP8B9wISAfcM/wH0AesBbQH0HP8B + 8AHrAewB9Av/AfQBkgESAW0BBwz/AfEBbQG8AfAd/wERAesB8Qv/AZIBDgIAAQ4B9wv/AfQB6wFtAfQc + /wHwAesB7AH0C/8B7AEOAgABDwEHC/8B8QFtAbwB8B3/AREB6wHxCv8B9AEUBAABFAH0Cv8B9AHrAW0B + 9Bz/AfAB6wHsAfQK/wHyAREEAAFtC/8B8QFtAbwB8B3/AREB6wHxCv8B9AEUBAABFQHzCv8B9AHrAW0B + 9Bz/AfAB6wHsAfQK/wHxARAEAAHqC/8B8QFtAbwB8B3/AREB6wHxC/8B7AQAAewL/wH0AesBbQH0HP8B + 8AHrAewB9Av/AW0DAAEOAfcL/wHxAW0BvAHwHf8BEQHrAfEL/wHzAewCQwHsAfML/wH0AesBbQH0HP8B + 8AHrAewB9Av/AfIB6wFDARQBkgz/AfEBbQG8AfAd/wERAesB8Q3/AvIN/wH0AesBbQH0HP8B8AHrAewB + 9A3/AvMN/wHxAW0BvAHwHf8BEQHrAfEc/wH0AesBbQH0BP8B8QHsAW0B9wH0E/8B8AHrAewB9AT/AfMB + 7wHsAe8B9BP/AfEBbQG8AfAF/wETAgAB8Ar/AfMBDgEAARAG/wERAewB8Bz/AfQB6wFtAfQD/wHxARQD + AAHrAfQS/wG8AesB7AHzA/8B9AFtAgABDgHrAfQS/wHxAesB8gG8BP8BFQQAAfMI/wH0BAABDgX/ARUB + 7AG8HP8B8wHsAW0B8gP/AZIEAAEPAfAS/wEHAuwB8gP/Ae8EAAEOAQcS/wG8AewB/wGSBP8FAAHqCP8B + 7wUAAfEE/wFtAfcB7xz/AbwC7AG8A/8B7AQAAQ4BBxL/Ae0B9wHsAQcD/wHtBQAB9xL/Ae8B9wH/ARQE /wUAAesI/wHvBQAB8gP/Ae8CBwHsHP8BkgH3Ae8BkgP/AQcBDgMAARUB8hH/AfQB7AHxAe8B7AP/AQcB - DgMAARAB8BL/AewB7gH/ARIE/wFtBAAB9An/BAABEAT/ARUB/wHzAfgB8Br/AfMB+AHxAfIB+AHxA/8B - 7QFDARABFAEHEv8B7wHtAfUB8wHsAfED/wGSAREBDgFDAe8S/wG8AewB9AH/AfMBbQT/Ae0BQwETAfIK - /wH0AeoBQwHsBP8B8wHsAv8BBwHsGv8BkgH3AvUB7wHsBP8B8gHwAfMS/wHyAesB8AL1AQcB7AH0A/8B - 8QG8AfIS/wH0AewBvAH1Av8B7AHwGf8BEAH0Af8B9QH0AewB9xj/AQcB+AHzAvUB9AHsAfcX/wHzAfgB - 7wP1AfQB7QGSF/8B9AHtAfcC9QP/AREB9Bf/AQ4B8wL/AvUB8wHsAfcW/wEHAesB8AT1AfMB7AGSAfQU - /wHxAfgB7wX1AfMC7QHzFP8B8gHsAZIB9AL1A/8B9AFDAQcV/wEQAfMD/wP1AfMC7AHxEv8B8gGSAfgB - 8Ab1AfQBkgHsAQcB8xD/AfIB9wH4AQcH9QH0AfcB+AHvAfMQ/wHzAe8B+AHvAfQD9QX/AfcBFQG8EP8B - 9AFtAeoB9AT/BPUB9AEHAfgB7AEHAfEM8gHxAQcBkgHrAe8B8wn1AfAC7AGSDe8B9wHtAfgB9wHyCvUB - 8AHtAewBkg7vAe0B+AGSAfEF9Qf/AfcBFQETDG0BEgFDAesB8wb/BfUB/wHzAQcB7QH4DOsB+AHtAe8B - 8g31AfEBBwHvC5IB9wHvAbwB8w71AfIBBwHvDJIB7wHuAfIH9SD/AUIBTQE+BwABPgMAASgDAAGAAwAB - QAMAAQEBAAEBBgABBBYAA///AP8A/wD/AAUACw== + DgMAARAB8BL/AewBvAH/ARIE/wFtBAAB9An/BAABEAT/ARUB/wHzAewB8Br/AfMB7AHxAfIB7AHxA/8B + 7QFDARABFAEHEv8B7wHtAf8B8wHsAfED/wGSAREBDgFDAe8S/wG8AewB9AH/AfMBbQT/Ae0BQwETAfIK + /wH0AeoBQwHsBP8B8wHsAv8BBwHsGv8BkgH3Av8B7wHsBP8B8gHwAfMS/wHyAesB8AL/AQcB7AH0A/8B + 8QG8AfIS/wH0AewBvAP/AewB8Bn/ARAB9AL/AfQB7AH3GP8BBwHsAfMC/wH0AewB9xf/AfMB7AHvA/8B + 9AHtAZIX/wH0Ae0B9wX/AREB9Bf/AQ4B8wT/AfMB7AH3Fv8BBwHrAfAE/wHzAewBkgH0FP8B8QHsAe8F + /wHzAu0B8xT/AfIB7AGSAfQF/wH0AUMBBxX/ARAB8wb/AfMC7AHxEv8B8gGSAewB8Ab/AfQBkgHsAQcB + 8xD/AfIB9wHsAQcH/wH0AfcB7AHvAfMQ/wHzAe8B7AHvAfQI/wH3ARUBvBD/AfQBbQHqAfQI/wH0AQcC + 7AEHAfEM8gHxAQcBkgHrAe8B8wn/AfAC7AGSDe8B9wHtAewB9wHyCv8B8AHtAewBkg7vAe0B7AGSAfEM + /wH3ARUBEwxtARIBQwHrAfMM/wHzAQcB7QHsDOsB7AHtAe8B8g3/AfEBBwHvC5IB9wHvAbwB8w7/AfIB + BwHvDJIB7wG8AfIn/wFCAU0BPgcAAT4DAAEoAwABgAMAAUADAAEBAQABAQYAAQQWAAP//wD/AP8A/wAF + AAs= \ No newline at end of file diff --git a/WinGreed/frmStart.cs b/WinGreed/frmStart.cs index 864e366..4ac58c3 100644 --- a/WinGreed/frmStart.cs +++ b/WinGreed/frmStart.cs @@ -13,9 +13,12 @@ namespace WinGreed { if (lvMemberList.Items.Count > 0) { - var nextPlayerName = lvMemberList.Items[NextLvItem()].Text; + var nextLvInstance = lvMemberList.Items[NextLvItem()]; + var nextPlayerName = nextLvInstance.Text; fPR = new frmPersonRound(nextPlayerName); - fPR.Show(); + fPR.TotPoints = int.Parse( nextLvInstance.SubItems[2].Text); + fPR.ShowDialog(); + nextLvInstance.SubItems[2].Text = fPR.TotPoints.ToString(); } } @@ -25,7 +28,7 @@ namespace WinGreed if (lvMemberList.Items.Count > 1) { actPlayerNo++; - if(actPlayerNo > lvMemberList.Items.Count) + if(actPlayerNo > lvMemberList.Items.Count-1) { actPlayerNo = 0; }