diff options
Diffstat (limited to 'ShiftOS.WinForms/Applications')
| -rw-r--r-- | ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs | 35 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ShiftLetters.cs | 38 |
2 files changed, 61 insertions, 12 deletions
diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs index 4c56732..48e77bf 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs @@ -56,19 +56,20 @@ namespace ShiftOS.WinForms.Applications this.tbguess = new System.Windows.Forms.TextBox(); this.lbllives = new System.Windows.Forms.Label(); this.btnrestart = new System.Windows.Forms.Button(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); this.SuspendLayout(); // // lblword // this.lblword.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblword.AutoSize = true; - this.lblword.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F); - this.lblword.Location = new System.Drawing.Point(116, 34); + this.lblword.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.75F); + this.lblword.Location = new System.Drawing.Point(5, 41); this.lblword.Name = "lblword"; this.lblword.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lblword.Size = new System.Drawing.Size(89, 22); + this.lblword.Size = new System.Drawing.Size(302, 22); this.lblword.TabIndex = 1; - this.lblword.Text = "Loading..."; + this.lblword.Text = "Choose a wordlist from the box below."; + this.lblword.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // tbguess // @@ -80,28 +81,39 @@ namespace ShiftOS.WinForms.Applications // // lbllives // - this.lbllives.AutoSize = true; - this.lbllives.Location = new System.Drawing.Point(127, 190); + this.lbllives.Anchor = System.Windows.Forms.AnchorStyles.None; + this.lbllives.Location = new System.Drawing.Point(9, 201); this.lbllives.Name = "lbllives"; - this.lbllives.Size = new System.Drawing.Size(69, 13); + this.lbllives.Size = new System.Drawing.Size(310, 13); this.lbllives.TabIndex = 3; - this.lbllives.Text = "Still loading..."; + this.lbllives.Text = "To play, guess letters by typing in the box."; + this.lbllives.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // btnrestart // - this.btnrestart.Location = new System.Drawing.Point(130, 148); + this.btnrestart.Location = new System.Drawing.Point(121, 148); this.btnrestart.Name = "btnrestart"; this.btnrestart.Size = new System.Drawing.Size(75, 23); this.btnrestart.TabIndex = 4; - this.btnrestart.Text = "Restart"; + this.btnrestart.Text = "Play"; this.btnrestart.UseVisualStyleBackColor = true; this.btnrestart.Visible = false; this.btnrestart.Click += new System.EventHandler(this.btnrestart_Click); // + // comboBox1 + // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(99, 81); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 21); + this.comboBox1.TabIndex = 5; + // // ShiftLetters // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.comboBox1); this.Controls.Add(this.btnrestart); this.Controls.Add(this.lbllives); this.Controls.Add(this.tbguess); @@ -118,5 +130,6 @@ namespace ShiftOS.WinForms.Applications private System.Windows.Forms.TextBox tbguess; private System.Windows.Forms.Label lbllives; private System.Windows.Forms.Button btnrestart; + private System.Windows.Forms.ComboBox comboBox1; } } diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 2578669..aa3bf18 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -46,6 +46,11 @@ namespace ShiftOS.WinForms.Applications string word = ""; static Random rng = new Random(); string guessedCharacters = ""; + List<String> shiftWordlist = new List<string> { "shiftos", "devx", "artpad", "shifter", "pong", + "shiftorium", "codepoints", "shiftletters", "shops", "mud", "notification", "namechanger", + "skinning", "skinloader", "calculator", "fileskimmer", "lua", "shiftnet", "terminal", "textpad"}; + List<String> contributorsWordlist = new List<string> { "philipadams", "carverh", "computelinux", "lempamo", + "wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"}; public ShiftLetters() { @@ -56,10 +61,12 @@ namespace ShiftOS.WinForms.Applications { guessedCharacters = ""; lives = 7; + comboBox1.Visible = false; tbguess.Visible = true; lbllives.Visible = true; lblword.Visible = true; btnrestart.Visible = false; + var wordlist = new List<string> { "shiftos", @@ -83,6 +90,20 @@ namespace ShiftOS.WinForms.Applications "terminal", "textpad" }; + foreach(var w in shiftWordlist) + { + if (!wordlist.Contains(w.ToLower()) + { + wordlist.Add(w.ToLower()); + } + } + foreach(var w in contributorsWordlist) + { + if (!wordlist.Contains(w.ToLower()) + { + wordlist.Add(w.ToLower()); + } + } //This can diversify the amount of ShiftOS-related words in the game. foreach(var upg in Shiftorium.GetDefaults()) { @@ -108,7 +129,10 @@ namespace ShiftOS.WinForms.Applications public void OnLoad() { - StartGame(); + tbguess.Visible = false; + comboBox1.Items.Add("ShiftOS"); + if (ShiftoriumFrontend.UpgradeInstalled("sl_contributors_wordlist")) comboBox1.Items.Add("Contributors"); + btnrestart.Visible = true; } public void OnUpgrade() @@ -150,6 +174,8 @@ namespace ShiftOS.WinForms.Applications lives = 0; lbllives.Visible = true; btnrestart.Visible = true; + btnrestart.Text = "Restart"; + comboBox1.Visible = true; int cp = word.Length * oldlives; lbllives.Text = "You earned: " + cp + " codepoints!"; SaveSystem.TransferCodepointsFrom("shiftletters", cp); @@ -166,6 +192,8 @@ namespace ShiftOS.WinForms.Applications tbguess.Visible = false; lbllives.Visible = false; btnrestart.Visible = true; + btnrestart.Text = "Restart"; + comboBox1.Visible = true; } } } @@ -175,5 +203,13 @@ namespace ShiftOS.WinForms.Applications { StartGame(); } + + private class NullWordlistException : Exception + { + public NullWordlistException(string message) : base("ShiftLetters tried to use a Null Wordlist.") + { + + } + } } } |