Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ShiftOS.WinForms/Resources/Shiftorium.txt

5 files changed, 145 insertions, 48 deletions

diff --git a/ShiftOS.WinForms/Applications/ColorPicker.cs b/ShiftOS.WinForms/Applications/ColorPicker.cs
index a8c0b3f..bf35567 100644
--- a/ShiftOS.WinForms/Applications/ColorPicker.cs
+++ b/ShiftOS.WinForms/Applications/ColorPicker.cs
@@ -1049,7 +1049,6 @@ namespace ShiftOS.WinForms.Applications
                 case 1:
                     pnlpink1.BackColor = Color.HotPink;
                     pnlpink1.Show();
-                    break;
                     pnlpink1.BackColor = Color.DeepPink;
                     pnlpink1.Show();
                     pnlpink2.BackColor = Color.HotPink;
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
index 6426562..02fe868 100644
--- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs
+++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
@@ -243,8 +243,7 @@ namespace ShiftOS.WinForms.Applications
         }
 
         private Shop editingShop = null;
-        private string editingShopOldName = "";
-
+        
         public void ShowCreateShop()
         {
             this.Invoke(new Action(() =>
diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs
index 4c56732..0692244 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs
@@ -56,19 +56,22 @@ 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.Tag = "header3";
+            this.lblword.Text = "Choose a wordlist from the box below.";
+            this.lblword.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.lblword.TextChanged += new System.EventHandler(this.lblword_TextChanged);
             // 
             // tbguess
             // 
@@ -80,28 +83,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 +132,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..32a1ed4 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -46,6 +46,52 @@ 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"};
+
+        List<string> osWordlist = new List<string>
+        {
+            "windows",
+            "longhorn",
+            "memphis",
+            "neptune",
+            "vista",
+            "visopsys",
+            "ubuntu",
+            "linux",
+            "arch",
+            "debian",
+            "redhat",
+            "fedora",
+            "opensuse",
+            "kubuntu",
+            "lubuntu",
+            "xubuntu",
+            "mythbuntu",
+            "ubuntumate",
+            "zorin",
+            "lindows",
+            "msdos",
+            "freedos",
+            "freebsd",
+            "netbsd",
+            "pcbsd",
+            "android",
+            "ios",
+            "macos",
+            "mint",
+            "mikeos",
+            "raspbian",
+            "cosmos",
+            "chicago",
+            "vienna",
+            "whistler",
+            "windowsxp",
+            "windowsforworkgroups"
+        };
 
         public ShiftLetters()
         {
@@ -56,40 +102,58 @@ 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>
+
+            bool isShiftOS = comboBox1.SelectedItem.ToString().ToLower() == "shiftos";
+            bool isContributors = comboBox1.SelectedItem.ToString().ToLower() == "contributors";
+            bool isOSes = comboBox1.SelectedItem.ToString().ToLower() == "operating systems";
+
+
+            var wordlist = new List<string>();
+            if (isOSes)
             {
-                "shiftos",
-                "devx",
-                "artpad",
-                "shifter",
-                "pong",
-                "shiftorium",
-                "codepoints",
-                "shiftletters",
-                "shops",
-                "mud",
-                "notification",
-                "namechanger",
-                "skinning",
-                "skinloader",
-                "calculator",
-                "fileskimmer",
-                "lua",
-                "shiftnet",
-                "terminal",
-                "textpad"
-            };
-            //This can diversify the amount of ShiftOS-related words in the game.
-            foreach(var upg in Shiftorium.GetDefaults())
+                foreach (var w in osWordlist)
+                {
+                    if (!wordlist.Contains(w.ToLower()))
+                    {
+                        wordlist.Add(w.ToLower());
+                    }
+                }
+            }
+            if (isShiftOS)
             {
-                foreach(var w in upg.Name.Split(' '))
+                foreach (var w in shiftWordlist)
                 {
                     if (!wordlist.Contains(w.ToLower()))
+                    {
                         wordlist.Add(w.ToLower());
+                    }
+                }
+            }
+            else if (isContributors)
+            {
+                foreach (var w in contributorsWordlist)
+                {
+                    if (!wordlist.Contains(w.ToLower()))
+                    {
+                        wordlist.Add(w.ToLower());
+                    }
+                }
+            }
+            if (isShiftOS)
+            {
+                //This can diversify the amount of ShiftOS-related words in the game.
+                foreach (var upg in Shiftorium.GetDefaults())
+                {
+                    foreach (var w in upg.Name.Split(' '))
+                    {
+                        if (!wordlist.Contains(w.ToLower()))
+                            wordlist.Add(w.ToLower());
+                    }
                 }
             }
             word = wordlist[rng.Next(wordlist.Count)];
@@ -108,7 +172,12 @@ 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");
+            if (Shiftorium.UpgradeInstalled("sl_operating_systems_wordlist")) comboBox1.Items.Add("Operating Systems");
+            btnrestart.Visible = true;
+            lblword.Left = (this.Width - lblword.Width) / 2;
         }
 
         public void OnUpgrade()
@@ -123,7 +192,7 @@ namespace ShiftOS.WinForms.Applications
 
         public void OnSkinLoad()
         {
-
+            lblword.Left = (this.Width - lblword.Width) / 2;
         }
 
         string lastword = "";
@@ -146,13 +215,9 @@ namespace ShiftOS.WinForms.Applications
                         if (!lblword.Text.Contains("_"))
                         {
                             int oldlives = lives;
-                            tbguess.Visible = false;
-                            lives = 0;
-                            lbllives.Visible = true;
-                            btnrestart.Visible = true;
                             int cp = word.Length * oldlives;
-                            lbllives.Text = "You earned: " + cp + " codepoints!";
                             SaveSystem.TransferCodepointsFrom("shiftletters", cp);
+                            StartGame();
                         }
                     }
                 }
@@ -160,12 +225,19 @@ namespace ShiftOS.WinForms.Applications
                 {
                     guessedCharacters = guessedCharacters + charGuessed;
                     lives--;
-                    lbllives.Text = "You have: " + lives + " lives left!";
+                    if (lives == 1)
+                    {
+                        lbllives.Text = "You have 1 life left! Be careful...";
+                    } else {
+                        lbllives.Text = "You have " + lives + " lives left!";
+                    }
                     if (lives == 0)
                     {
                         tbguess.Visible = false;
                         lbllives.Visible = false;
                         btnrestart.Visible = true;
+                        btnrestart.Text = "Restart";
+                        comboBox1.Visible = true;
                     }
                 }
             }
@@ -175,5 +247,18 @@ namespace ShiftOS.WinForms.Applications
         {
             StartGame();
         }
+
+        private class NullWordlistException : Exception
+        {
+            public NullWordlistException(string message) : base("ShiftLetters tried to use a Null Wordlist.")
+            {
+
+            }
+        }
+
+        private void lblword_TextChanged(object sender, EventArgs e)
+        {
+            lblword.Left = (this.Width - lblword.Width) / 2;
+        }
     }
 }
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index ff3569b..7bab213 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -187,7 +187,6 @@ namespace ShiftOS.WinForms.Applications
 
 
         public static event TextSentEventHandler TextSent;
-        public event EventHandler OnComplete;
 
         public void ResetAllKeywords()
         {