diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs index c0c70d3..4c56732 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs @@ -62,11 +62,11 @@ namespace ShiftOS.WinForms.Applications // this.lblword.Anchor = System.Windows.Forms.AnchorStyles.Top; this.lblword.AutoSize = true; - this.lblword.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F); - this.lblword.Location = new System.Drawing.Point(127, 31); + this.lblword.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F); + this.lblword.Location = new System.Drawing.Point(116, 34); this.lblword.Name = "lblword"; this.lblword.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lblword.Size = new System.Drawing.Size(72, 18); + this.lblword.Size = new System.Drawing.Size(89, 22); this.lblword.TabIndex = 1; this.lblword.Text = "Loading..."; // diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 19ee79e..6ff528a 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -44,6 +44,7 @@ namespace ShiftOS.WinForms.Applications int lives = 7; string word = ""; static Random rng = new Random(); + string guessedCharacters = ""; public ShiftLetters() { @@ -52,6 +53,7 @@ namespace ShiftOS.WinForms.Applications private void StartGame() { + guessedCharacters = ""; lives = 7; tbguess.Visible = true; lbllives.Visible = true; @@ -61,11 +63,24 @@ namespace ShiftOS.WinForms.Applications { "shiftos", "devx", - "delicious", + "artpad", "shifter", "pong", "shiftorium", - "codepoints" + "codepoints", + "shiftletters", + "shops", + "mud", + "notification", + "namechanger", + "skinning", + "skinloader", + "calculator", + "fileskimmer", + "lua", + "shiftnet", + "terminal", + "textpad" }; word = wordlist[rng.Next(wordlist.Count)]; lbllives.Text = "You have 7 lives left!"; @@ -100,7 +115,7 @@ namespace ShiftOS.WinForms.Applications { if (this.tbguess.Text.Length == 1) { - var charGuessed = this.tbguess.Text; + var charGuessed = this.tbguess.Text.ToLower(); bool correct = false; this.tbguess.Text = ""; for (int i=0; i < word.Length; i++) @@ -118,14 +133,15 @@ namespace ShiftOS.WinForms.Applications lives = 0; lbllives.Visible = true; btnrestart.Visible = true; - long cp = word.Length * oldlives; + int cp = word.Length * oldlives; lbllives.Text = "You earned: " + cp + " codepoints!"; - ShiftOS.Engine.SaveSystem.CurrentSave.Codepoints += cp; + SaveSystem.TransferCodepointsFrom("shiftletters", cp); } } } - if (correct == false & lives > 0) + if (correct == false & lives > 0 & !guessedCharacters.Contains(charGuessed)) { + guessedCharacters = guessedCharacters + charGuessed; lives--; lbllives.Text = "You have: " + lives + " lives left!"; if (lives == 0)