Merge pull request #29 from lempamo/master

webchat plot intensifies

1 files changed, 33 insertions, 17 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index 7679c7a..85ac07c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -9,16 +9,25 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using TimeHACK.Engine;
 using System.Threading;
+using System.Media;
+using System.IO;
 
 namespace TimeHACK.OS.Win95.Win95Apps
 {
     public partial class WebChat1998 : UserControl
     {
         int chat_index = 0;
+        WindowManager wm = new WindowManager();
         WCMessageParser wcmp = new WCMessageParser();
         bool correctname = false;
         bool guessing = false;
 
+        SoundPlayer join = new SoundPlayer(Properties.Resources.AIMbuddyjoin);
+        SoundPlayer leave = new SoundPlayer(Properties.Resources.AIMbuddyleave);
+        SoundPlayer send = new SoundPlayer(Properties.Resources.AIMmessagesent);
+        SoundPlayer receive = new SoundPlayer(Properties.Resources.AIMmessagereceived);
+        SoundPlayer file = new SoundPlayer(Properties.Resources.AIMfile);
+
         public WebChat1998()
         {
             InitializeComponent();
@@ -32,23 +41,15 @@ namespace TimeHACK.OS.Win95.Win95Apps
         }
         private void Button1_Click(object sender, EventArgs e)
         {
-            if (txtscreenname.Text == "")
-            {
-                WindowManager wm = new WindowManager();
-                wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning);
-                return;
-            }
-            else if (txtscreenname.Text.Length > 12)
-            {
-                WindowManager wm = new WindowManager();
-                wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning);
-                return;
-            }
+            if (txtscreenname.Text == "") { wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning); return; }
+            if (txtscreenname.Text.Length > 12) { wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning); return; }
+            if (txtscreenname.Text.Contains(" ")) { wm.startInfobox95("Invalid Username", "Your username cannot contain spaces.", Properties.Resources.Win95Warning); return; }
             ParentForm.AcceptButton = button2;
             TitleScreen.username = txtscreenname.Text;
             login.Hide();
             listBox1.Items.Add(TitleScreen.username);
-            history.Text = "System: " + TitleScreen.username + " has joined the chat.\n";
+            history.AppendText("System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine);
+            join.Play();
             Chat.Start();
         }
 
@@ -56,11 +57,12 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             if (!guessing)
             {
-                history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + "\n";
+                history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine);
                 switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index))
                 {
                     case "addsh":
                         listBox1.Items.Add("SkyHigh");
+                        join.Play();
                         break;
                     case "nameguess":
                         typechat.Hide();
@@ -69,11 +71,23 @@ namespace TimeHACK.OS.Win95.Win95Apps
                         button4.Show();
                         Chat.Stop();
                         guessing = true;
+                        receive.Play();
                         break;
                     case "addrain":
                         listBox1.Items.Add("rain49");
+                        join.Play();
+                        break;
+                    case "addfile":
+                        label5.Show();
+                        button5.Show();
+                        file.Play();
+                        break;
+                    case "addpadams":
+                        listBox1.Items.Add("12padams");
+                        join.Play();
                         break;
                     default:
+                        receive.Play();
                         break;
                 }
                 Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
@@ -82,13 +96,14 @@ namespace TimeHACK.OS.Win95.Win95Apps
             {
                 if (correctname)
                 {
-                    history.Text += "SkyHigh: yay you got it right!\n";
+                    history.AppendText("SkyHigh: yay you got it right!" + Environment.NewLine);
                 }
                 else
                 {
-                    history.Text += "SkyHigh: sorry, my name is actually bill\n";
+                    history.AppendText("SkyHigh: sorry, my name is actually bill" + Environment.NewLine);
                 }
                 guessing = false;
+                receive.Play();
                 Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
             }
             chat_index++;
@@ -96,8 +111,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void Button2_Click(object sender, EventArgs e)
         {
-            if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + "\n";
+            if (typechat.Text != "") history.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine);
             typechat.Text = "";
+            send.Play();
         }
 
         private void Button3_Click(object sender, EventArgs e)