From 19ea483b2ba7974ffcfbe06b73c160a5ca418f45 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 14:36:15 -0400 Subject: starting work on the actual webchat98 app --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 123 ++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx new file mode 100644 index 0000000..51a63d1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file -- cgit v1.2.3 From b2873bc67093dfdae2566ede9bda85230a37ff44 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 16:12:18 -0400 Subject: finished webchat1998 ui --- .vs/TimeHACK/v14/.suo | Bin 122368 -> 122368 bytes .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 254 ++++++++++++++++++++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 10 + 3 files changed, 263 insertions(+), 1 deletion(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index eed9ac0..363d666 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 4348cf3..c3a5964 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -29,25 +29,277 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); this.Chat = new System.Windows.Forms.Timer(this.components); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.label1 = new System.Windows.Forms.Label(); + this.history = new System.Windows.Forms.TextBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label5 = new System.Windows.Forms.Label(); + this.button5 = new System.Windows.Forms.Button(); + this.label6 = new System.Windows.Forms.Label(); + this.typechat = new System.Windows.Forms.TextBox(); + this.login = new System.Windows.Forms.Panel(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.txtscreenname = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.panel1.SuspendLayout(); + this.login.SuspendLayout(); this.SuspendLayout(); // // Chat // this.Chat.Interval = 15000; // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.Location = new System.Drawing.Point(504, 32); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(195, 329); + this.listBox1.TabIndex = 0; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(501, 13); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(85, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Users Logged In"; + // + // history + // + this.history.BackColor = System.Drawing.Color.White; + this.history.Location = new System.Drawing.Point(22, 32); + this.history.Multiline = true; + this.history.Name = "history"; + this.history.ReadOnly = true; + this.history.Size = new System.Drawing.Size(471, 377); + this.history.TabIndex = 2; + // + // panel1 + // + this.panel1.Controls.Add(this.label5); + this.panel1.Controls.Add(this.button5); + this.panel1.Location = new System.Drawing.Point(504, 393); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(195, 51); + this.panel1.TabIndex = 3; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(13, 18); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(68, 13); + this.label5.TabIndex = 1; + this.label5.Text = "Skindows 95"; + // + // button5 + // + this.button5.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; + this.button5.Location = new System.Drawing.Point(97, 13); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 0; + this.button5.Text = "Download"; + this.button5.UseVisualStyleBackColor = true; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(504, 374); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(62, 13); + this.label6.TabIndex = 4; + this.label6.Text = "File Sharing"; + // + // typechat + // + this.typechat.Location = new System.Drawing.Point(20, 415); + this.typechat.Name = "typechat"; + this.typechat.Size = new System.Drawing.Size(395, 20); + this.typechat.TabIndex = 5; + // + // login + // + this.login.Controls.Add(this.label2); + this.login.Controls.Add(this.txtscreenname); + this.login.Controls.Add(this.button1); + this.login.Controls.Add(this.label3); + this.login.Controls.Add(this.label4); + this.login.Controls.Add(this.textBox1); + this.login.Controls.Add(this.textBox2); + this.login.Location = new System.Drawing.Point(92, 94); + this.login.Name = "login"; + this.login.Size = new System.Drawing.Size(497, 251); + this.login.TabIndex = 6; + // + // textBox1 + // + this.textBox1.BackColor = System.Drawing.Color.Silver; + this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox1.Location = new System.Drawing.Point(26, 72); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(276, 159); + this.textBox1.TabIndex = 1; + this.textBox1.Text = resources.GetString("textBox1.Text"); + // + // textBox2 + // + this.textBox2.BackColor = System.Drawing.Color.Silver; + this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox2.Location = new System.Drawing.Point(331, 72); + this.textBox2.Multiline = true; + this.textBox2.Name = "textBox2"; + this.textBox2.ReadOnly = true; + this.textBox2.Size = new System.Drawing.Size(151, 86); + this.textBox2.TabIndex = 0; + this.textBox2.Text = "A screen name is a temporary name which will be displayed in place of your real n" + + "ame. To keep your identity safe, please do not enter your real name in this chat" + + "room."; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(118, 56); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(93, 13); + this.label4.TabIndex = 2; + this.label4.Text = "Chat Room Rules:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(196, 16); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(112, 13); + this.label3.TabIndex = 3; + this.label3.Text = "Welcome to WebChat"; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(331, 208); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(151, 23); + this.button1.TabIndex = 4; + this.button1.Text = "Login"; + this.button1.UseVisualStyleBackColor = true; + // + // txtscreenname + // + this.txtscreenname.Location = new System.Drawing.Point(331, 181); + this.txtscreenname.Name = "txtscreenname"; + this.txtscreenname.Size = new System.Drawing.Size(151, 20); + this.txtscreenname.TabIndex = 5; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(328, 161); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(149, 13); + this.label2.TabIndex = 6; + this.label2.Text = "Please type in a screen name."; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(22, 13); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(406, 13); + this.label7.TabIndex = 7; + this.label7.Text = "To speak, just type in the bottom textbox, then click the Speak button or press E" + + "nter."; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(422, 415); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(71, 23); + this.button2.TabIndex = 8; + this.button2.Text = "Speak"; + this.button2.UseVisualStyleBackColor = true; + // + // button3 + // + this.button3.Location = new System.Drawing.Point(149, 427); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(75, 23); + this.button3.TabIndex = 9; + this.button3.Text = "Paul"; + this.button3.UseVisualStyleBackColor = true; + // + // button4 + // + this.button4.Location = new System.Drawing.Point(235, 427); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 10; + this.button4.Text = "Bill"; + this.button4.UseVisualStyleBackColor = true; + // // WebChat1998 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.button4); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.label7); + this.Controls.Add(this.login); + this.Controls.Add(this.typechat); + this.Controls.Add(this.label6); + this.Controls.Add(this.panel1); + this.Controls.Add(this.history); + this.Controls.Add(this.label1); + this.Controls.Add(this.listBox1); this.Name = "WebChat1998"; - this.Size = new System.Drawing.Size(724, 482); + this.Size = new System.Drawing.Size(724, 462); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.login.ResumeLayout(false); + this.login.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.Timer Chat; + private System.Windows.Forms.ListBox listBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox history; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox typechat; + private System.Windows.Forms.Panel login; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TextBox txtscreenname; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button4; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 51a63d1..61225ed 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -120,4 +120,14 @@ 17, 17 + + If you do not agree to the following rules below DO NOT log into the chat: + +No Bullying +No Swearing +No Hacking +No Illegal Files/ Piracy + +Failure to follow these rules will result in serious irreversible consequences. + \ No newline at end of file -- cgit v1.2.3 From 27419aa0dce06f9af5ee28f64aace365dcb7d816 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 17:44:01 -0400 Subject: webchat things --- .vs/TimeHACK/v14/.suo | Bin 122368 -> 122368 bytes TimeHACK.Engine/WCMessageParser.cs | 8 ++++- TimeHACK.Engine/WindowManager.cs | 2 +- .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 7 ++++ TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 39 +++++++++++++++++++-- 6 files changed, 53 insertions(+), 4 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 363d666..c679976 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/WCMessageParser.cs index ed16afd..44c9002 100644 --- a/TimeHACK.Engine/WCMessageParser.cs +++ b/TimeHACK.Engine/WCMessageParser.cs @@ -13,12 +13,18 @@ namespace TimeHACK.Engine { JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); string newmsg = message["message"].ToString().Replace("@user", user); - return message["user"].ToString() + ": " + newmsg; + if (message["userchat"].ToObject()) return message["user"].ToString() + ": " + newmsg; + else return newmsg; } public int GetMessageDelay(string json, int index) { JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); return message["delay"].ToObject(); } + public string GetSpecial(string json, int index) + { + JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); + return message["special"].ToString(); + } } } diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 193985a..4a1cf4e 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -9,7 +9,7 @@ namespace TimeHACK.Engine { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); - public WinClassic startWinClassic(UserControl content, String title, PictureBox icon, Boolean MaxButton, Boolean MinButton) + public WinClassic startWinClassic(UserControl content, string title, PictureBox icon, bool MaxButton, bool MinButton) { // Setup Window WinClassic app = new WinClassic(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index c3a5964..80aab11 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -269,6 +269,7 @@ this.Controls.Add(this.listBox1); this.Name = "WebChat1998"; this.Size = new System.Drawing.Size(724, 462); + this.Load += new System.EventHandler(this.WebChat1998_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.login.ResumeLayout(false); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index ce87665..3f4810e 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -16,5 +16,12 @@ namespace TimeHACK.OS.Win95.Win95Apps { InitializeComponent(); } + private void WebChat1998_Load(object sender, EventArgs e) + { + button5.Hide(); + button4.Hide(); + button3.Hide(); + label5.Hide(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 61225ed..cb2c52a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -117,9 +117,44 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 17, 17 - + + + { + "messages": [ + { + "user": "System", + "delay": 5000, + "message": "SkyHigh has joined the chat.", + "special": "addsh", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "damn", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "I thought my friend rain49 was going to be on...", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "hmm... how about we play a game while we wait for my friend to come", + "special": null, + "userchat": true + } + ] +} + If you do not agree to the following rules below DO NOT log into the chat: -- cgit v1.2.3 From 7841180fc0f60f6eb1fff1503f89ff2cad117e85 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 20:22:59 -0400 Subject: webchat98 things --- .vs/TimeHACK/v14/.suo | Bin 131584 -> 131072 bytes TimeHACK.Engine/WCMessageParser.cs | 2 +- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95.cs | 8 +++++++ .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 3 ++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 24 ++++++++++++++++++++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 16 +++++++++++++- .../OS/Win95/Win95Apps/WinClassicIE4.Designer.cs | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 2 +- TimeHACK.Main/TitleScreen.cs | 1 + 10 files changed, 53 insertions(+), 6 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 930f2b8..dc49232 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/WCMessageParser.cs index 44c9002..ef7efd0 100644 --- a/TimeHACK.Engine/WCMessageParser.cs +++ b/TimeHACK.Engine/WCMessageParser.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace TimeHACK.Engine { - class WCMessageParser + public class WCMessageParser { public string ParseMessage(string json, int index, string user) { diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 0bacc55..2d58db3 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -322,6 +322,7 @@ this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; + this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // // MultimediaToolStripMenuItem // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index f0e9174..260d909 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -4,6 +4,7 @@ using System.IO; using System.Media; using System.Windows.Forms; using TimeHACK.Engine; +using TimeHACK.OS.Win95.Win95Apps; using TimeHACK.WinClassicForms; namespace TimeHACK.OS.Win95 @@ -185,6 +186,13 @@ namespace TimeHACK.OS.Win95 { wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text)!"); } + private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) + { + WebChat1998 wc = new WebChat1998(); + Engine.Template.WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true); + app.BringToFront(); + startmenu.Hide(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 2b8a48d..b849893 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); + this.resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); this.Chat = new System.Windows.Forms.Timer(this.components); this.listBox1 = new System.Windows.Forms.ListBox(); this.label1 = new System.Windows.Forms.Label(); @@ -302,5 +302,6 @@ private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button4; + private System.ComponentModel.ComponentResourceManager resources; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 8df610f..94179d6 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using TimeHACK.Engine; +using System.Threading; namespace TimeHACK.OS.Win95.Win95Apps { @@ -29,7 +30,28 @@ namespace TimeHACK.OS.Win95.Win95Apps if (txtscreenname.Text == "") { WindowManager wm = new WindowManager(); - wm.startInfobox95("test", "test"); + wm.startInfobox95("Invalid Username", "Your username cannot be blank."); + return; + } + TitleScreen.username = txtscreenname.Text; + login.Hide(); + listBox1.Items.Add(TitleScreen.username); + chatLoop(); + } + + private void chatLoop() + { + WCMessageParser wcmp = new WCMessageParser(); + Thread.Sleep(15000); + for (int i = 0; i < 200; i++) + { + 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)); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index cb2c52a..db61d93 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -148,9 +148,23 @@ { "user": "SkyHigh", "delay": 6000, - "message": "hmm... how about we play a game while we wait for my friend to come", + "message": "hmm... how about we play a game while we wait for my friend to come?", "special": null, "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "alright, go ahead and guess what my name is!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 500, + "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/WinClassicIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs index 1445e04..1e9affc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { partial class WinClassicIE4 { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index 2b2fc4e..912fc8f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; using TimeHACK.Engine; -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { public partial class WinClassicIE4 : UserControl { diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 8f3a3aa..4cd9043 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -11,6 +11,7 @@ namespace TimeHACK { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); public static Windows95 frm95; + public static string username; public TitleScreen() { -- cgit v1.2.3 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 (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') 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 From a02ef083865152de3a5d99090e5e15cf30ff3fe7 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 12:18:36 -0400 Subject: a little more conversation --- .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 3 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 65 +++++++++++++++++----- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 28 ++++++++++ 3 files changed, 81 insertions(+), 15 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 545a796..af44554 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -233,6 +233,7 @@ this.button2.TabIndex = 8; this.button2.Text = "Speak"; this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.Button2_Click); // // button3 // @@ -242,6 +243,7 @@ this.button3.TabIndex = 9; this.button3.Text = "Paul"; this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.Button3_Click); // // button4 // @@ -251,6 +253,7 @@ this.button4.TabIndex = 10; this.button4.Text = "Bill"; this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.Button4_Click); // // WebChat1998 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index fa0837f..c18ba20 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -16,6 +16,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { int chat_index = 0; WCMessageParser wcmp = new WCMessageParser(); + bool correctname = false; public WebChat1998() { @@ -36,6 +37,7 @@ namespace TimeHACK.OS.Win95.Win95Apps wm.startInfobox95("Invalid Username", "Your username cannot be blank."); return; } + ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); @@ -45,24 +47,57 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Chat_Tick(object sender, EventArgs e) { - history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; - switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) + if (chat_index != 6) { - case "addsh": - listBox1.Items.Add("SkyHigh"); - break; - case "nameguess": - typechat.Hide(); - button2.Hide(); - button3.Show(); - button4.Show(); - Chat.Stop(); - break; - default: - break; + history.Text += 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"); + break; + case "nameguess": + typechat.Hide(); + button2.Hide(); + button3.Show(); + button4.Show(); + Chat.Stop(); + break; + case "addrain": + listBox1.Items.Add("rain49"); + break; + default: + break; + } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + } + else + { + if (correctname) + { + history.Text += "SkyHigh: yay you got it right!" + Environment.NewLine; + } + else + { + history.Text += "SkyHigh: sorry, my name is actually bill" + Environment.NewLine; + } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } - Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); chat_index++; } + + private void Button2_Click(object sender, EventArgs e) + { + if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + } + + private void Button3_Click(object sender, EventArgs e) + { + correctname = true; Chat.Start(); + } + + private void Button4_Click(object sender, EventArgs e) + { + correctname = false; Chat.Start(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 6734aab..7ab7db0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -165,6 +165,34 @@ "message": "ill make 2 buttons pop up, you click the one you want to guess", "special": "nameguess", "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "actually, if ya dont wanna do that its fine, i guess", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 3000, + "message": "rain49 has joined the chat.", + "special": "addrain", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "hey man", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "ive sort of been waiting", + "special": null, + "userchat": true } ] } -- cgit v1.2.3 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/OS/Win95/Win95Apps/WebChat1998.resx') 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 d0b92c3e07c87a63aac29c647bbfd7c78d5f1a50 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 17:59:16 -0400 Subject: more conversation --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 5 ++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 42 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 79594ed..a259fa5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -17,6 +17,7 @@ namespace TimeHACK.OS.Win95.Win95Apps int chat_index = 0; WCMessageParser wcmp = new WCMessageParser(); bool correctname = false; + bool guessing = false; public WebChat1998() { @@ -53,7 +54,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Chat_Tick(object sender, EventArgs e) { - if (chat_index != 6) + if (!guessing) { history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + "\n"; switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) @@ -67,6 +68,7 @@ namespace TimeHACK.OS.Win95.Win95Apps button3.Show(); button4.Show(); Chat.Stop(); + guessing = true; break; case "addrain": listBox1.Items.Add("rain49"); @@ -86,6 +88,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { history.Text += "SkyHigh: sorry, my name is actually bill\n"; } + guessing = false; 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 1ea52b5..db829e3 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -214,6 +214,48 @@ "message": "anyway... let's get to it", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 5000, + "message": "wait, who's this @user guy?", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "oh, he's someone who just came on. doesnt seem to talk much", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 5000, + "message": "ah ok", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4500, + "message": "i would remove him from this chat but i cant", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "i dont think he should know about, well, ya know..", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3000, + "message": "right, that", + "special": null, + "userchat": true } ] } -- cgit v1.2.3 From ddb713407859352c35fa3a9644aedcafbd8584c4 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 18:29:26 -0400 Subject: fixed font --- .vs/TimeHACK/v14/.suo | Bin 131072 -> 131072 bytes TimeHACK.Main/OS/Win95/Win95.Designer.cs | 4 ++-- TimeHACK.Main/OS/Win95/Win95.cs | 17 +++++++++++++++ TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 23 ++++++++++++++++++++- TimeHACK.Main/TitleScreen.cs | 1 + TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5512704 -> 5488128 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 5512704 -> 5488128 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 2880 -> 4277 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 162603 -> 137217 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5512704 -> 5488128 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 19 files changed, 51 insertions(+), 12 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 15137ab..870ac10 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 7628e46..8221889 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -229,7 +229,7 @@ this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(141, 292); + this.startmenuitems.Size = new System.Drawing.Size(144, 311); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -284,7 +284,7 @@ this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 6ca7f10..8efa6d3 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -26,6 +26,9 @@ namespace TimeHACK.OS.Win95 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { + // Make Font Mandatory + fontLoad(); + // Play Windows 95 Start Sound Stream audio = Properties.Resources.Win95Start; startsound = new SoundPlayer(audio); @@ -49,6 +52,20 @@ namespace TimeHACK.OS.Win95 this.SendToBack(); } + private void fontLoad() + { + this.taskbartime.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ProgramsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.DocumentsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SettingsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FindToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HelpToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.RunToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SuspendToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ShutdownToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.desktopicons.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + } + #region StartMenu // Paint StartMenu diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index db829e3..d20d707 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -252,10 +252,31 @@ }, { "user": "rain49", - "delay": 3000, + "delay": 5000, "message": "right, that", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 3500, + "message": "since he's here should we just tell him?", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "well i suppose we have to", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 2500, + "message": "ok then", + "special": null, + "userchat": true } ] } diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 4cd9043..38086b9 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -47,6 +47,7 @@ namespace TimeHACK // Initialize Font pfc.AddFontFile(AppDomain.CurrentDomain.BaseDirectory + "\\LeviWindows.ttf"); + gameversion.Font = new Font(pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, (0)); // Start the VM Mode timer vmModeTimer.Start(); diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 46a7c1b..f2f8480 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= + 6MuDghOX8Wol+CMA46s4ZSHKmlZueYu5xV8CBVmiN5g= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 84a6386..bb82bb7 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 716c82e..f45e923 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= + gRboXh/lVHhw5uJ901V8Zmg4BAnhmp+nImuxQADJew8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 42e946f..623bf90 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 46a7c1b..f2f8480 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= + 6MuDghOX8Wol+CMA46s4ZSHKmlZueYu5xV8CBVmiN5g= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 716c82e..f45e923 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= + gRboXh/lVHhw5uJ901V8Zmg4BAnhmp+nImuxQADJew8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 84a6386..bb82bb7 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 9966ca6..4347c4d 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 710aa84..09910d8 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.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources index 2337d1d..52102be 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 46a7c1b..f2f8480 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= + 6MuDghOX8Wol+CMA46s4ZSHKmlZueYu5xV8CBVmiN5g= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 84a6386..bb82bb7 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 716c82e..f45e923 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= + gRboXh/lVHhw5uJ901V8Zmg4BAnhmp+nImuxQADJew8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 42e946f..623bf90 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 3afc5f0362cba789e1d4049401566f711dd08065 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Apr 2017 20:17:19 -0400 Subject: fixed textbox not auto scrolling to bottom --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 10 +- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 220 +++++++++++++++++++++- 2 files changed, 220 insertions(+), 10 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index de03b93..85ac07c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -48,7 +48,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.AppendText("System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine); join.Play(); Chat.Start(); } @@ -57,7 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (!guessing) { - history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine); switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { case "addsh": @@ -96,11 +96,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (correctname) { - history.Text += "SkyHigh: yay you got it right!" + Environment.NewLine; + history.AppendText("SkyHigh: yay you got it right!" + Environment.NewLine); } else { - history.Text += "SkyHigh: sorry, my name is actually bill" + Environment.NewLine; + history.AppendText("SkyHigh: sorry, my name is actually bill" + Environment.NewLine); } guessing = false; receive.Play(); @@ -111,7 +111,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.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine); typechat.Text = ""; send.Play(); } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index d20d707..30ebbbf 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -182,21 +182,21 @@ }, { "user": "SkyHigh", - "delay": 6000, + "delay": 3000, "message": "hey rain", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 4000, + "delay": 3000, "message": "ive sort of been waiting", "special": null, "userchat": true }, { "user": "rain49", - "delay": 5000, + "delay": 4000, "message": "sorry man", "special": null, "userchat": true @@ -224,7 +224,7 @@ }, { "user": "SkyHigh", - "delay": 3000, + "delay": 2500, "message": "oh, he's someone who just came on. doesnt seem to talk much", "special": null, "userchat": true @@ -273,10 +273,220 @@ }, { "user": "rain49", - "delay": 2500, + "delay": 5000, "message": "ok then", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 5500, + "message": "so @user, we are going to break the chat rules here..", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3000, + "message": "so if you dont wanna get banned i recommend you just logout now", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "let's give him some time", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 9000, + "message": "to leave the chat", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3500, + "message": "...", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3000, + "message": "i guess he wants to risk it", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "tell him what we will do", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2000, + "message": "you haven't said that yet", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 6000, + "message": "right, right", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 4000, + "message": "so there's this really cool program on the 12padams website called skindows95", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 5500, + "message": "normally youd have to pay for it", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "Yeah... it's really hard to even get to the buy button - stupid", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 6500, + "message": "But.. i have a copy i can send to you and skyhigh", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2000, + "message": "Yeah... kind of not pirating because he managed to steal a copy from someone else who bought it", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1500, + "message": "So hey...", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1500, + "message": "You haven't left", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "Send it now...", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1500, + "message": "I really want to skin my system", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 2500, + "message": "sending!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "thx man", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 3000, + "message": "File \"skin95setup.exe\" has been uploaded.", + "special": "addfile", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "yay!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "im downloading it now", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3500, + "message": "and @user, why dont you go and download it too?", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "i think he already is ;)", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "OH THIS IS SO COOL", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "lemme send a screenshot", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 2000, + "message": "12padams has joined the chat.", + "special": "addpadams", + "userchat": true + }, + { + "user": "rain49", + "delay": 500, + "message": "CRAP", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 500, + "message": "ah NO WE ARE DED", + "special": null, + "userchat": true } ] } -- cgit v1.2.3 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(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx') 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