From 6ecb36cc462081895a92ff7fb5b23f3259fc1f1e Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 21:19:13 -0400 Subject: webchat1998 messages are working --- .vs/TimeHACK/v14/.suo | Bin 131072 -> 131072 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 34 +++++++++++++-------- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 2 +- .../Win95Apps/WinClassicDownloader.Designer.cs | 2 +- .../OS/Win95/Win95Apps/WinClassicDownloader.cs | 3 +- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5509120 -> 5510144 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 122368 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 6 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5509120 -> 5510144 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 4 +-- .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 1453 -> 1818 bytes ....Win95.Win95Apps.WinClassicDownloader.resources | Bin 0 -> 180 bytes ...HACK.OS.Win95.Win95Apps.WinClassicIE4.resources | Bin 0 -> 3209 bytes ....WinClassicForms.WinClassicDownloader.resources | Bin 180 -> 0 bytes ...imeHACK.WinClassicForms.WinClassicIE4.resources | Bin 3209 -> 0 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5509120 -> 5510144 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 122368 -> 124416 bytes 31 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index dc49232..15137ab 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 12776da..af31efa 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index bcd072f..d19e0f7 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 12776da..af31efa 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index bcd072f..d19e0f7 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index b849893..545a796 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -58,6 +58,7 @@ // Chat // this.Chat.Interval = 15000; + this.Chat.Tick += new System.EventHandler(this.Chat_Tick); // // listBox1 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 94179d6..fa0837f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -14,6 +14,9 @@ namespace TimeHACK.OS.Win95.Win95Apps { public partial class WebChat1998 : UserControl { + int chat_index = 0; + WCMessageParser wcmp = new WCMessageParser(); + public WebChat1998() { InitializeComponent(); @@ -36,23 +39,30 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - chatLoop(); + history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + Chat.Start(); } - private void chatLoop() + private void Chat_Tick(object sender, EventArgs e) { - WCMessageParser wcmp = new WCMessageParser(); - Thread.Sleep(15000); - for (int i = 0; i < 200; i++) + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { - history.Text = wcmp.ParseMessage(resources.GetString("convo"), i, TitleScreen.username); - switch (wcmp.GetSpecial(resources.GetString("convo"), i)) - { - default: - break; - } - Thread.Sleep(wcmp.GetMessageDelay(resources.GetString("convo"), i)); + case "addsh": + listBox1.Items.Add("SkyHigh"); + break; + case "nameguess": + typechat.Hide(); + button2.Hide(); + button3.Show(); + button4.Show(); + Chat.Stop(); + break; + default: + break; } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + chat_index++; } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index db61d93..6734aab 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -161,7 +161,7 @@ }, { "user": "SkyHigh", - "delay": 500, + "delay": 1000, "message": "ill make 2 buttons pop up, you click the one you want to guess", "special": "nameguess", "userchat": true diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs index cd0b55c..fd182fa 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { partial class WinClassicDownloader { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs index 9df4811..418444a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs @@ -1,8 +1,7 @@ using System; using System.Windows.Forms; -using TimeHACK.OS.Win95; -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { public partial class WinClassicDownloader : UserControl { diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 12776da..af31efa 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index bcd072f..d19e0f7 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 0c8fdea..991b339 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 106a594..7b1fe16 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index e0ba070..f03f771 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 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 106a594..7b1fe16 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 0c8fdea..991b339 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.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index eb0b568..b6ab8e4 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -25,8 +25,6 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicDownloader.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicIE4.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources @@ -37,3 +35,5 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 091a82b..63f6ace 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.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 71db36c..3be4ddc 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.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 ef6fd62..06dec4b 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.OS.Win95.Win95Apps.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources new file mode 100644 index 0000000..9cbc1d1 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources deleted file mode 100644 index 9cbc1d1..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 3e20261..406cc0c 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 0c8fdea..991b339 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 106a594..7b1fe16 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index e0ba070..f03f771 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3