aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/OS
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-04-02 19:19:26 -0600
committerGitHub <[email protected]>2017-04-02 19:19:26 -0600
commit8cadfe503559d1413cf5823dc4ceba5ca85f5ce0 (patch)
tree2d00eef6ea1d2266afd71946a8391dc0a1f108c2 /TimeHACK.Main/OS
parent4df4250f29c2fb19f547b9a7e28de72b265eb1b1 (diff)
parent3afc5f0362cba789e1d4049401566f711dd08065 (diff)
downloadhistacom2-8cadfe503559d1413cf5823dc4ceba5ca85f5ce0.tar.gz
histacom2-8cadfe503559d1413cf5823dc4ceba5ca85f5ce0.tar.bz2
histacom2-8cadfe503559d1413cf5823dc4ceba5ca85f5ce0.zip
Merge pull request #29 from lempamo/master
webchat plot intensifies
Diffstat (limited to 'TimeHACK.Main/OS')
-rw-r--r--TimeHACK.Main/OS/Win95/Win95.cs20
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs1
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs50
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx220
4 files changed, 259 insertions, 32 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 85039ef..afe1644 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -54,16 +54,16 @@ namespace TimeHACK.OS.Win95
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)));
+ this.taskbartime.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+ this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+ this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.SettingsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.FindToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.HelpToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.RunToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.SuspendToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.ShutdownToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.desktopicons.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
}
#region StartMenu
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
index af44554..9ab490a 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
@@ -87,6 +87,7 @@
this.history.ReadOnly = true;
this.history.Size = new System.Drawing.Size(471, 377);
this.history.TabIndex = 2;
+ this.history.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
//
// panel1
//
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index 7679c7a..85ac07c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -9,16 +9,25 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using TimeHACK.Engine;
using System.Threading;
+using System.Media;
+using System.IO;
namespace TimeHACK.OS.Win95.Win95Apps
{
public partial class WebChat1998 : UserControl
{
int chat_index = 0;
+ WindowManager wm = new WindowManager();
WCMessageParser wcmp = new WCMessageParser();
bool correctname = false;
bool guessing = false;
+ SoundPlayer join = new SoundPlayer(Properties.Resources.AIMbuddyjoin);
+ SoundPlayer leave = new SoundPlayer(Properties.Resources.AIMbuddyleave);
+ SoundPlayer send = new SoundPlayer(Properties.Resources.AIMmessagesent);
+ SoundPlayer receive = new SoundPlayer(Properties.Resources.AIMmessagereceived);
+ SoundPlayer file = new SoundPlayer(Properties.Resources.AIMfile);
+
public WebChat1998()
{
InitializeComponent();
@@ -32,23 +41,15 @@ namespace TimeHACK.OS.Win95.Win95Apps
}
private void Button1_Click(object sender, EventArgs e)
{
- if (txtscreenname.Text == "")
- {
- WindowManager wm = new WindowManager();
- wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning);
- return;
- }
- else if (txtscreenname.Text.Length > 12)
- {
- WindowManager wm = new WindowManager();
- wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning);
- return;
- }
+ 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; }
ParentForm.AcceptButton = button2;
TitleScreen.username = txtscreenname.Text;
login.Hide();
listBox1.Items.Add(TitleScreen.username);
- history.Text = "System: " + TitleScreen.username + " has joined the chat.\n";
+ history.AppendText("System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine);
+ join.Play();
Chat.Start();
}
@@ -56,11 +57,12 @@ namespace TimeHACK.OS.Win95.Win95Apps
{
if (!guessing)
{
- history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + "\n";
+ history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine);
switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index))
{
case "addsh":
listBox1.Items.Add("SkyHigh");
+ join.Play();
break;
case "nameguess":
typechat.Hide();
@@ -69,11 +71,23 @@ namespace TimeHACK.OS.Win95.Win95Apps
button4.Show();
Chat.Stop();
guessing = true;
+ receive.Play();
break;
case "addrain":
listBox1.Items.Add("rain49");
+ join.Play();
+ break;
+ case "addfile":
+ label5.Show();
+ button5.Show();
+ file.Play();
+ break;
+ case "addpadams":
+ listBox1.Items.Add("12padams");
+ join.Play();
break;
default:
+ receive.Play();
break;
}
Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
@@ -82,13 +96,14 @@ namespace TimeHACK.OS.Win95.Win95Apps
{
if (correctname)
{
- history.Text += "SkyHigh: yay you got it right!\n";
+ history.AppendText("SkyHigh: yay you got it right!" + Environment.NewLine);
}
else
{
- history.Text += "SkyHigh: sorry, my name is actually bill\n";
+ history.AppendText("SkyHigh: sorry, my name is actually bill" + Environment.NewLine);
}
guessing = false;
+ receive.Play();
Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
}
chat_index++;
@@ -96,8 +111,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
private void Button2_Click(object sender, EventArgs e)
{
- if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + "\n";
+ if (typechat.Text != "") history.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine);
typechat.Text = "";
+ send.Play();
}
private void Button3_Click(object sender, EventArgs e)
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
}
]
}</value>