From 20dcdbf96d65bd92feec3509cd586cc324fb46c7 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 16:28:34 -0400 Subject: webchat extra things --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 21 ++++++++++++++-- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 27 ++++++++++++++++++--- TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5510144 -> 5512192 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5510144 -> 5512192 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 1818 -> 2729 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5510144 -> 5512192 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 15 files changed, 52 insertions(+), 14 deletions(-) (limited to 'TimeHACK.Main') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index c18ba20..4c5e8bf 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -37,6 +37,12 @@ namespace TimeHACK.OS.Win95.Win95Apps wm.startInfobox95("Invalid Username", "Your username cannot be blank."); return; } + else if (txtscreenname.Text.Length > 12) + { + WindowManager wm = new WindowManager(); + wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters."); + return; + } ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); @@ -88,16 +94,27 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button2_Click(object sender, EventArgs e) { if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + typechat.Text = ""; } private void Button3_Click(object sender, EventArgs e) { - correctname = true; Chat.Start(); + correctname = false; + button2.Show(); + button3.Hide(); + button4.Hide(); + typechat.Show(); + Chat.Start(); } private void Button4_Click(object sender, EventArgs e) { - correctname = false; Chat.Start(); + 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 7ab7db0..1ea52b5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -133,7 +133,7 @@ }, { "user": "SkyHigh", - "delay": 6000, + "delay": 5000, "message": "damn", "special": null, "userchat": true @@ -183,16 +183,37 @@ { "user": "SkyHigh", "delay": 6000, - "message": "hey man", + "message": "hey rain", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 6000, + "delay": 4000, "message": "ive sort of been waiting", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 5000, + "message": "sorry man", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 4000, + "message": "it took a while for this to load", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "anyway... let's get to it", + "special": null, + "userchat": true } ] } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 991b339..ccbc1c9 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f03f771..f28cad0 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 991b339..ccbc1c9 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 63f6ace..237f406 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 06dec4b..86e74b5 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 991b339..ccbc1c9 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f03f771..f28cad0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From ecd5324b48a1ed84bdbddb43040cb5ac8aa426a9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 16:32:53 -0400 Subject: set start sound to play slightly earlier --- TimeHACK.Main/OS/Win95/Win95.cs | 10 +++++----- TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5512192 -> 5512704 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5512192 -> 5512704 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 2729 -> 2880 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5512192 -> 5512704 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'TimeHACK.Main') diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 260d909..6ca7f10 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -26,6 +26,11 @@ namespace TimeHACK.OS.Win95 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { + // Play Windows 95 Start Sound + Stream audio = Properties.Resources.Win95Start; + startsound = new SoundPlayer(audio); + startsound.Play(); + // Hide the Startmenu startmenu.Hide(); @@ -38,11 +43,6 @@ namespace TimeHACK.OS.Win95 // Start the ClockTimer clockTimer.Start(); - // Play Windows 95 Start Sound - Stream audio = Properties.Resources.Win95Start; - startsound = new SoundPlayer(audio); - startsound.Play(); - // Set the StartMenu seperator startmenuitems.Items.Insert(6, new ToolStripSeparator()); diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 3a27e18..46a7c1b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= + VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index ccbc1c9..84a6386 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index f6a6b80..716c82e 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= + AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f28cad0..42e946f 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 3a27e18..46a7c1b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= + VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index f6a6b80..716c82e 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= + AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index ccbc1c9..84a6386 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 237f406..9966ca6 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 86e74b5..710aa84 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 3a27e18..46a7c1b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= + VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index ccbc1c9..84a6386 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index f6a6b80..716c82e 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= + AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f28cad0..42e946f 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 125e35fe984021d892b98acff614e61a2851a9b1 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 16:44:05 -0400 Subject: simpler new lines --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'TimeHACK.Main') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 4c5e8bf..79594ed 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -47,7 +47,7 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + history.Text = "System: " + TitleScreen.username + " has joined the chat.\n"; Chat.Start(); } @@ -55,7 +55,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (chat_index != 6) { - history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + "\n"; switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { case "addsh": @@ -80,11 +80,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (correctname) { - history.Text += "SkyHigh: yay you got it right!" + Environment.NewLine; + history.Text += "SkyHigh: yay you got it right!\n"; } else { - history.Text += "SkyHigh: sorry, my name is actually bill" + Environment.NewLine; + history.Text += "SkyHigh: sorry, my name is actually bill\n"; } Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } @@ -93,7 +93,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button2_Click(object sender, EventArgs e) { - if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + "\n"; typechat.Text = ""; } -- cgit v1.2.3