Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

4 files changed, 248 insertions, 208 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 32d619f..dc0368e 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -13,8 +13,6 @@ using TimeHACK.OS.Win95.Win95Apps.Story;
 using static TimeHACK.Engine.SaveSystem;
 namespace TimeHACK.OS.Win95
 {
-    
-   
     public partial class Windows95 : Form
     {
         private SoundPlayer startsound;
@@ -73,7 +71,7 @@ namespace TimeHACK.OS.Win95
         //  When New Game is clicked in TitleScreen.cs
         private void Desktop_Load(object sender, EventArgs e)
         {
-            if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, desktopicons.Width, desktopicons.Height);
+            if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height);
             //Start Menu Color - Commented until it works reliably
             //startmenuitems.Renderer = new MyRenderer();
             //ProgramsToolStripMenuItem.DropDown.Renderer = new MyRenderer();
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index 8af7099..87793e6 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -1,199 +1,199 @@
-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Drawing;

-using System.Data;

-using System.Linq;

-using System.Text;

-using System.Threading.Tasks;

-using System.Windows.Forms;

-using TimeHACK.Engine;

-using System.Threading;

-using System.Media;

-using System.IO;

-using TimeHACK.Engine.Template;

-

-namespace TimeHACK.OS.Win95.Win95Apps

-{

-    public partial class WebChat1998 : UserControl

-    {

-        int chat_index = 0;

-        WindowManager wm = new WindowManager();

-        MessageParser wcmp = new MessageParser();

-        bool correctname = false;

-        bool guessing = false;

-

-        bool wimponclose = 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);

-

-        BSODCreator bc = new BSODCreator();

-        Win9XBSOD bsod = null;

-        Win9XBSOD bsod2 = null;

-

-        public WebChat1998()

-        {

-            InitializeComponent();

-            bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.WimpEnding);

-            bsod2 = bc.throw9XBSOD(false, BSODCreator.BSODCauses.PiracyEnding);

-            bsod.Hide();

-            bsod2.Hide();

-        }

-        private void WebChat1998_Load(object sender, EventArgs e)

-        {

-            button5.Hide();

-            button4.Hide();

-            button3.Hide();

-            label5.Hide();

-        }

-        private void Button1_Click(object sender, EventArgs e)

-        {

-            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; }

-            if (txtscreenname.Text == "SkyHigh" | txtscreenname.Text == "rain49" | txtscreenname.Text == "12padams") { wm.StartInfobox95("Invalid Username", "That username is already taken.", Properties.Resources.Win95Warning); return; }

-            ParentForm.AcceptButton = button2;

-            TitleScreen.username = txtscreenname.Text;

-            login.Hide();

-            listBox1.Items.Add(TitleScreen.username);

-            history.AppendText("System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine);

-            join.Play();

-            Chat.Start();

-        }

-

-        private void Chat_Tick(object sender, EventArgs e)

-        {

-            if (!guessing)

-            {

-                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();

-                        this.ParentForm.FormClosing += WebChatClosing;

-                        wimponclose = true;

-                        break;

-                    case "nameguess":

-                        typechat.Hide();

-                        button2.Hide();

-                        button3.Show();

-                        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();

-                        ((WinClassic)this.ParentForm).closeDisabled = true;

-                        TitleScreen.frm95.startbutton.Enabled = false;

-                        TitleScreen.frm95.startmenu.Hide();

-                        break;

-                    case "nostart":

-                        TitleScreen.frm95.startbutton.Hide();

-                        TitleScreen.frm95.startmenu.Hide();

-                        receive.Play();

-                        break;

-                    case "removerain":

-                        listBox1.Items.Remove("rain49");

-                        leave.Play();

-                        break;

-                    case "iconsded":

-                        TitleScreen.frm95.desktopicons.Enabled = false;

-                        receive.Play();

-                        break;

-                    case "taskbarded":

-                        TitleScreen.frm95.taskbar.Hide();

-                        receive.Play();

-                        break;

-                    case "iconsgone":

-                        TitleScreen.frm95.desktopicons.Hide();

-                        receive.Play();

-                        break;

-                    case "bigtext":

-                        history.Font = new Font("Arial", 12F, FontStyle.Regular, GraphicsUnit.Point, ((0)));

-                        ((WinClassic)this.ParentForm).maximizebutton.Enabled = false;

-                        ((WinClassic)this.ParentForm).WindowState = FormWindowState.Maximized;

-                        receive.Play();

-                        break;

-                    case "notopbar":

-                        ((WinClassic)this.ParentForm).programtopbar = null;

-                        receive.Play();

-                        break; // TODO: Finish WebChat 1998

-                    default:

-                        receive.Play();

-                        break;

-                }

-                if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2;

-                else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);

-            }

-            else

-            {

-                if (correctname)

-                {

-                    history.AppendText("SkyHigh: yay you got it right!" + Environment.NewLine);

-                }

-                else

-                {

-                    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++;

-        }

-

-        private void WebChatClosing(object sender, FormClosingEventArgs e)

-        {

-            if (wimponclose)

-            {

-                bsod.FormClosing += new FormClosingEventHandler(Program.title.BSODRewind);

-                bsod.Show();

-                bsod.BringToFront();

-                bsod2.Close();

-            }

-        }

-

-        private void Button2_Click(object sender, EventArgs e)

-        {

-            if (typechat.Text != "") history.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine);

-            typechat.Text = "";

-            send.Play();

-        }

-

-        private void Button3_Click(object sender, EventArgs e)

-        {

-            correctname = false;

-            button2.Show();

-            button3.Hide();

-            button4.Hide();

-            typechat.Show();

-            Chat.Start();

-        }

-

-        private void Button4_Click(object sender, EventArgs e)

-        {

-            correctname = true;

-            button2.Show();

-            button3.Hide();

-            button4.Hide();

-            typechat.Show();

-            Chat.Start();

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TimeHACK.Engine;
+using System.Threading;
+using System.Media;
+using System.IO;
+using TimeHACK.Engine.Template;
+
+namespace TimeHACK.OS.Win95.Win95Apps
+{
+    public partial class WebChat1998 : UserControl
+    {
+        int chat_index = 0;
+        WindowManager wm = new WindowManager();
+        MessageParser wcmp = new MessageParser();
+        bool correctname = false;
+        bool guessing = false;
+
+        bool wimponclose = 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);
+
+        BSODCreator bc = new BSODCreator();
+        Win9XBSOD bsod = null;
+        Win9XBSOD bsod2 = null;
+
+        public WebChat1998()
+        {
+            InitializeComponent();
+            bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.WimpEnding);
+            bsod2 = bc.throw9XBSOD(false, BSODCreator.BSODCauses.PiracyEnding);
+            bsod.Hide();
+            bsod2.Hide();
+        }
+        private void WebChat1998_Load(object sender, EventArgs e)
+        {
+            button5.Hide();
+            button4.Hide();
+            button3.Hide();
+            label5.Hide();
+        }
+        private void Button1_Click(object sender, EventArgs e)
+        {
+            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; }
+            if (txtscreenname.Text == "SkyHigh" | txtscreenname.Text == "rain49" | txtscreenname.Text == "12padams") { wm.StartInfobox95("Invalid Username", "That username is already taken.", Properties.Resources.Win95Warning); return; }
+            ParentForm.AcceptButton = button2;
+            TitleScreen.username = txtscreenname.Text;
+            login.Hide();
+            listBox1.Items.Add(TitleScreen.username);
+            history.AppendText("System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine);
+            join.Play();
+            Chat.Start();
+        }
+
+        private void Chat_Tick(object sender, EventArgs e)
+        {
+            if (!guessing)
+            {
+                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();
+                        this.ParentForm.FormClosing += WebChatClosing;
+                        wimponclose = true;
+                        break;
+                    case "nameguess":
+                        typechat.Hide();
+                        button2.Hide();
+                        button3.Show();
+                        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();
+                        ((WinClassic)this.ParentForm).closeDisabled = true;
+                        TitleScreen.frm95.startbutton.Enabled = false;
+                        TitleScreen.frm95.startmenu.Hide();
+                        break;
+                    case "nostart":
+                        TitleScreen.frm95.startbutton.Hide();
+                        TitleScreen.frm95.startmenu.Hide();
+                        receive.Play();
+                        break;
+                    case "removerain":
+                        listBox1.Items.Remove("rain49");
+                        leave.Play();
+                        break;
+                    case "iconsded":
+                        TitleScreen.frm95.desktopicons.Enabled = false;
+                        receive.Play();
+                        break;
+                    case "taskbarded":
+                        TitleScreen.frm95.taskbar.Hide();
+                        receive.Play();
+                        break;
+                    case "iconsgone":
+                        TitleScreen.frm95.desktopicons.Hide();
+                        receive.Play();
+                        break;
+                    case "bigtext":
+                        history.Font = new Font("Arial", 12F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
+                        ((WinClassic)this.ParentForm).maximizebutton.Enabled = false;
+                        ((WinClassic)this.ParentForm).WindowState = FormWindowState.Maximized;
+                        receive.Play();
+                        break;
+                    case "notopbar":
+                        ((WinClassic)this.ParentForm).programtopbar = null;
+                        receive.Play();
+                        break; // TODO: Finish WebChat 1998
+                    default:
+                        receive.Play();
+                        break;
+                }
+                if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2;
+                else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
+            }
+            else
+            {
+                if (correctname)
+                {
+                    history.AppendText("SkyHigh: yay you got it right!" + Environment.NewLine);
+                }
+                else
+                {
+                    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++;
+        }
+
+        private void WebChatClosing(object sender, FormClosingEventArgs e)
+        {
+            if (wimponclose)
+            {
+                bsod.FormClosing += new FormClosingEventHandler(Program.title.BSODRewind);
+                bsod.Show();
+                bsod.BringToFront();
+                bsod2.Close();
+            }
+        }
+
+        private void Button2_Click(object sender, EventArgs e)
+        {
+            if (typechat.Text != "") history.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine);
+            typechat.Text = "";
+            send.Play();
+        }
+
+        private void Button3_Click(object sender, EventArgs e)
+        {
+            correctname = false;
+            button2.Show();
+            button3.Hide();
+            button4.Hide();
+            typechat.Show();
+            Chat.Start();
+        }
+
+        private void Button4_Click(object sender, EventArgs e)
+        {
+            correctname = true;
+            button2.Show();
+            button3.Hide();
+            button4.Hide();
+            typechat.Show();
+            Chat.Start();
+        }
+    }
+}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx
index 6f40ce8..1088c6a 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx
@@ -693,7 +693,7 @@
     },
     {
       "user": "SkyHigh",
-      "delay": 7000,
+      "delay": 6000,
       "message": "hey! give me back my taskbar!",
       "special": null,
       "userchat": true
@@ -707,10 +707,52 @@
     },
     {
       "user": "12padams",
-      "delay": 2500,
+      "delay": 1500,
       "message": "and your icons are infected too so you dont need them",
       "special": "iconsgone",
       "userchat": true
+    },
+    {
+      "user": "SkyHigh",
+      "delay": 3000,
+      "message": "please stop!",
+      "special": null,
+      "userchat": true
+    },
+    {
+      "user": "12padams",
+      "delay": 4000,
+      "message": "you want to know how to stop this?",
+      "special": null,
+      "userchat": true
+    },
+    {
+      "user": "SkyHigh",
+      "delay": 3000,
+      "message": "please just let us go and forget this happened!",
+      "special": null,
+      "userchat": true
+    },
+    {
+      "user": "12padams",
+      "delay": 9000,
+      "message": "well first, i need your full attention.",
+      "special": "bigtext",
+      "userchat": true
+    },
+    {
+      "user": "SkyHigh",
+      "delay": 3500,
+      "message": "please this is enough! you've done everything to convince me that I won't illegally download your software again!",
+      "special": null,
+      "userchat": true
+    },
+    {
+      "user": "12padams",
+      "delay": 5000,
+      "message": "i've done everything? no, what about this?",
+      "special": "notopbar",
+      "userchat": true
     }
   ]
 }</value>
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index 4e731fe..5534b3c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -72,13 +72,13 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     SaveSystem.CurrentSave.ThemeName = "dangeranimals";
                     SaveSystem.currentTheme = new DangerousCreaturesTheme();
                     TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG;
-                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height);
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
                 case "Inside Your Computer":
                     SaveSystem.CurrentSave.ThemeName = "insidepc";
                     SaveSystem.currentTheme = new InsideComputerTheme();
                     TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG;
-                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height);
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
             }
         }
@@ -97,13 +97,13 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     SaveSystem.CurrentSave.ThemeName = "dangeranimals";
                     SaveSystem.currentTheme = new DangerousCreaturesTheme();
                     TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG;
-                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height);
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
                 case "Inside Your Computer":
                     SaveSystem.CurrentSave.ThemeName = "insidepc";
                     SaveSystem.currentTheme = new InsideComputerTheme();
                     TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG;
-                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height);
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
             }
             ParentForm.Close();