From be95039389999476d338e3f27ab94dad598e568e Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 14 Apr 2017 19:27:36 -0400 Subject: 12padams is removing things! --- .vs/TimeHACK/v14/.suo | Bin 96256 -> 95744 bytes TimeHACK.Engine/BSODCreator.cs | 12 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 32 ++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 232 ++++++++++++++++++++- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6123008 -> 6128640 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 8 +- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6123008 -> 6128640 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 9300 -> 14314 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6123008 -> 6128640 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes 23 files changed, 283 insertions(+), 23 deletions(-) diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 74e305a..903e396 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/BSODCreator.cs b/TimeHACK.Engine/BSODCreator.cs index fe19dfd..59eeb16 100644 --- a/TimeHACK.Engine/BSODCreator.cs +++ b/TimeHACK.Engine/BSODCreator.cs @@ -15,7 +15,8 @@ namespace TimeHACK.Engine public enum BSODCauses { Testing, - ExitChat98Early + WimpEnding, + PiracyEnding, } public Win9XBSOD throw9XBSOD(bool except, BSODCauses type) @@ -33,9 +34,16 @@ namespace TimeHACK.Engine case BSODCauses.Testing: bsod.textBox1.Text = "This is the testing type of BSOD. Hurrah."; break; - case BSODCauses.ExitChat98Early: + case BSODCauses.WimpEnding: bsod.textBox1.Text = "An unknown but fatal exception has occured has occured in the program \"wchat98.exe\". The current processes will be terminated."; break; + case BSODCauses.PiracyEnding: + bsod.textBox1.Text = "Vital elements of Windows were removed, but recovered. However, your data has been lost."; + bsod.BackColor = System.Drawing.Color.Black; + foreach (Control ctrl in bsod.Controls) ctrl.ForeColor = System.Drawing.Color.Silver; + bsod.label1.BackColor = System.Drawing.Color.Silver; + bsod.label1.ForeColor = System.Drawing.Color.Black; + break; default: break; } diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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 6cbffa8..f5117fb 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 f410e47..100b587 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.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index afca54c..1f00286 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -31,12 +31,15 @@ namespace TimeHACK.OS.Win95.Win95Apps BSODCreator bc = new BSODCreator(); Win9XBSOD bsod = null; + Win9XBSOD bsod2 = null; public WebChat1998() { InitializeComponent(); - bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.ExitChat98Early); + 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) { @@ -50,6 +53,7 @@ namespace TimeHACK.OS.Win95.Win95Apps 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(); @@ -93,12 +97,36 @@ namespace TimeHACK.OS.Win95.Win95Apps 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; default: receive.Play(); break; } - Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + 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 { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 30ebbbf..6f40ce8 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -455,21 +455,21 @@ }, { "user": "SkyHigh", - "delay": 3000, + "delay": 2000, "message": "OH THIS IS SO COOL", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 4000, + "delay": 3000, "message": "lemme send a screenshot", "special": null, "userchat": true }, { "user": "System", - "delay": 2000, + "delay": 1500, "message": "12padams has joined the chat.", "special": "addpadams", "userchat": true @@ -483,10 +483,234 @@ }, { "user": "SkyHigh", - "delay": 500, + "delay": 1000, "message": "ah NO WE ARE DED", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 2500, + "message": "quick guys, LOGOUT!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1000, + "message": "i cant! the close button isnt working!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "caught ya pirating my software!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 1500, + "message": "now that i have you, lets have some fun, shall we?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 1500, + "message": "guys, shutdown the pc from start!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2000, + "message": "not so fast!", + "special": "nostart", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "where did the start button go?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 2000, + "message": "12padams disabled it, CRAP!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "feeling scared yet?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3500, + "message": "no, cuz i can just unplug my computer!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "i wouldnt do that if i were you..", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 1000, + "message": "oh yeah? just watch this!", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 1500, + "message": "rain49 has left the chat.", + "special": "removerain", + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "all your computers are infected with a virus that makes them unable to boot.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "and now, theres only two, SkyHigh, and @user.", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "please just let us go!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "you downloaded pirated software, so you both shall be punished!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "dont worry @user, ill look online for help!", + "special": "iconsded", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "why cant i open anything?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4500, + "message": "i told you that you are going to be punished.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "your computers have a lethal virus that i call \"Win9X.Plague\"", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "what does it do?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "well, it disables your computers functions one by one, slowly killing it", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "anyways, time to let it do its work!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "no please dont, just remove this virus!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 6000, + "message": "remove the virus, you say?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "well the whole of windows 95 is a virus! now where do i begin...", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4500, + "message": "i see a taskbar at the bottom of the screen.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4000, + "message": "the taskbar was made by microsoft making its debut in windows 95", + "special": "taskbarded", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 7000, + "message": "hey! give me back my taskbar!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4000, + "message": "you wanted me to remove viruses, didnt you? the taskbar was infected since it had no start button", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "and your icons are infected too so you dont need them", + "special": "iconsgone", + "userchat": true } ] } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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 e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 06a2beb..39b2aac 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 5843c47..8561823 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 4abf160..0661141 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 e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 5843c47..8561823 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 06a2beb..39b2aac 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.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 324e2c5..c01182e 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 d7b182d..0ae036b 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 e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 06a2beb..39b2aac 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 5843c47..8561823 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 4abf160..0661141 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3