diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-11-04 09:50:43 +0000 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-11-04 09:50:43 +0000 |
| commit | f933ce9b841a5f302066336877f86119de034eb4 (patch) | |
| tree | 50e23551bae5ade3a263d9c1c054fb326a7ab5a6 /Histacom2/OS/Win95/Win95Apps | |
| parent | 6ab1468786f1e865e9ff408d32149f9c9620d844 (diff) | |
| parent | 382f0167714bbcad00ab710fe7dcfa05eaeb88ac (diff) | |
| download | histacom2-f933ce9b841a5f302066336877f86119de034eb4.tar.gz histacom2-f933ce9b841a5f302066336877f86119de034eb4.tar.bz2 histacom2-f933ce9b841a5f302066336877f86119de034eb4.zip | |
Updated my fork!
Conflicts:
Histacom2/TitleScreen.Designer.cs
Histacom2/TitleScreen.cs
Diffstat (limited to 'Histacom2/OS/Win95/Win95Apps')
11 files changed, 84 insertions, 35 deletions
diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs index 9f4bfbd..f55ee45 100644 --- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs +++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs @@ -15,6 +15,7 @@ namespace Histacom2.OS.Win95.Win95Apps.IE3Sites { public partial class _12padams1998 : UserControl { + bool clicked = false; public _12padams1998() { InitializeComponent(); @@ -47,6 +48,8 @@ namespace Histacom2.OS.Win95.Win95Apps.IE3Sites private void label17_Click(object sender, EventArgs e) { + if (clicked) return; + clicked = true; label16.Text = "1̧͙̙̦̪͙͇̜̥͍̟͍̹̰̝͖̫̩͘͡͡9̸̨͏̖̱̗̣̥͕̲͈̬̦9͠҉̶̢͔̹̖͇̫̩̻̪̬͔̥̟̺̼̺̟̫8̷̴̶̱̩͖̟̠̬̻̼̳̰̺͚͜͞:̧͟͏̰̣̠̹͍͔̼͕̲͇̪̥̗̞͚͇̖ͅ ͏̙͇̮̤̠͇̜͚͈͇͔̠̙͜͡ͅÀ͏̰̮̞̲̠̩̳͙͓͉̭̼̠͕̣͇̜͎ͅd̢̩̝̙̩̭̫͓̮͙͔̘̥͝d̻̻̪̙͖̬͈͟͝e͠҉̨̧҉̯̙̹̝̟̺̰͖̹̞̻̝̖̪͉͍͇̬#҉̵̻̜͇̻̹͈̀͟ ̨̡̘͓͔̜̭̫͖͔̰̦̘̀#̛͓̬̭̦̹̙̭͕̕#̧͢͠͏̖̙͚͉͇̣̜̖ͅ#̜̝͚͓̳̘̭̣̲̟̤̖͇̬̠̯̠̀͠ ̢͚̲̞̯͎͙̪̗̜̹͙͓͉͢ͅ#̡͙̻̫̝̪͙͚̺̝͓̘̬̬͙͔̀̕͠#̴҉͖̲̺̱͖͈̭̭ͅ#̸̸̷̼̫̪̖̻̻͈̭̬͓̘͓̦̟̻̪͇̞̕#̸̢̨̻̗̣̠̥̖̜̜̖̺͍̝̗͓̦̳̫#̛͡҉̭̝̙̟̘̩̬͖͎̘̞̭̖͔̪̼̠͢ͅ#̰̜̭̹̻̖̬̺͘͡#̛̬̣̳͔͔̘̟͜͢͟͡#̷̨̼̺̤̥̞́͢͡ ̢̞̬͙͍̬̪̪̰̰̰̙̮͙͚͕̩̟͇̕͜ͅ#̶͙̣̣̦͈͈̫̕͡#̸̡̥̹̮͇̱̱͍͜͜͢#̵̢̧̦͙̮̮͔͖̞̮͚͞#̧̗̤̱̪̜͓̠͖̞̰͍͢#̧̱̳̻̖̝͇͜͞#̛́҉͍̩̞̬͔̬̪̻̯̩"; Thread.Sleep(100); Refresh(); diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs index 7cf9dd4..a918cda 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs @@ -40,6 +40,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story { WinClassicTerminal Console = new WinClassicTerminal(true); WinClassic app = wm.Init(Console, "MS-DOS Prompt", null, true, true); + TitleScreen.frm95.AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", null); Console.WriteLine("telnet> 104.27.135.159 Connecting..."); await Task.Delay(2500); diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 77f63b5..9dcebfc 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -10,6 +10,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story { public class Hack2 : object { + public static bool Upgraded = false; static WindowManager wm = new WindowManager(); public static async void StartObjective() @@ -80,7 +81,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story await Task.Delay(2500); Console.WriteLine("Command> Show Start Button"); TitleScreen.frm95.startbutton.Show(); - TitleScreen.frm95.desktopicons.BackgroundImage = null; + if (SaveSystem.currentTheme.defaultWallpaper != null) TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(SaveSystem.currentTheme.defaultWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height); await Task.Delay(2900); Console.WriteLine("12padams> OKAY, NOW YOU'VE DONE IT!"); await Task.Delay(2500); @@ -273,6 +274,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story SaveSystem.CurrentSave.CurrentOS = "98"; SaveSystem.currentTheme = new Default98Theme(); SaveSystem.CurrentSave.ThemeName = "default98"; + Upgraded = true; TitleScreen.frm95.distort.ParentForm.Close(); foreach (Form frm in Application.OpenForms) if (frm is WinClassic) frm.Close(); Program.title.StartGame(); diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs index c986b23..5956276 100644 --- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs +++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs @@ -70,9 +70,9 @@ namespace Histacom2.OS.Win95.Win95Apps { if (!guessing) { - if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username)); - else history.Text = wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username); - switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) + if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username)); + else history.Text = wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username); + switch (wcmp.GetSpecial(Properties.Resources.webchat1998_convo, chat_index)) { case "addsh": listBox1.Items.Add("SkyHigh"); @@ -208,8 +208,8 @@ namespace Histacom2.OS.Win95.Win95Apps if (msgsound) receive.Play(); break; } - if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2; - else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index) / 2; + else Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index); } else { @@ -223,7 +223,7 @@ namespace Histacom2.OS.Win95.Win95Apps } guessing = false; receive.Play(); - Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index); } chat_index++; } diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 0f221af..8f946ab 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -304,7 +304,7 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "web chat setup": Win95Installer inst = new Win95Installer("Web Chat 1998"); - inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; + inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; SaveGame(); }; WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true); Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null); appInstaller.BringToFront(); @@ -318,6 +318,8 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "FTP Client", true, "FTP Client", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "FTP Client"), "ftpclint.exe", "ftp client", 19, 58395); TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true; + CurrentSave.installed95[1] = true; + SaveGame(); }; WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true); Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null); @@ -332,6 +334,8 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Time Distorter 0.1", true, "Time Distorter 0.1", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Time Distorter 0.1"), "tdistort.exe", "time distorter", 17, 23895); TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; + CurrentSave.installed95[5] = true; + SaveGame(); }; WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true); Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null); @@ -350,6 +354,8 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Guess The Number V1", true, "Guess The Number V1", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Guess The Number V1"), "guessnum.exe", "guess number", 18, 17483); TitleScreen.frm95.GuessTheNumberToolStripMenuItem.Visible = true; + CurrentSave.installed95[6] = true; + SaveGame(); }; WinClassic appGtn = wm.Init(instGtn, "Guess The Number Setup", null, true, true); Program.AddTaskbarItem(appGtn, appGtn.Tag.ToString(), "Guess The Number Setup", null); @@ -367,7 +373,7 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "eb95 setup": Win95Installer ebInstall = new Win95Installer("Error Blaster 95"); - ebInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; + ebInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; CurrentSave.installed95[3] = true; }; WinClassic installer = wm.Init(ebInstall, "Error Blaster 95 Setup", null, true, true); Program.AddTaskbarItem(installer, installer.Tag.ToString(), "Error Blaster 95 Setup", null); installer.BringToFront(); @@ -380,9 +386,9 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "sr95 setup": Win95Installer srInstall = new Win95Installer("Start Runner 95"); - srInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; + srInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.StartRunnerToolStripMenuItem.Visible = true; CurrentSave.installed95[2] = true; }; WinClassic install = wm.Init(srInstall, "Start Runner 95 Setup", null, true, true); - Program.AddTaskbarItem(install, install.Tag.ToString(), "Error Blaster 95 Setup", null); + Program.AddTaskbarItem(install, install.Tag.ToString(), "Start Runner 95 Setup", null); install.BringToFront(); break; default: diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 63e056b..c112e61 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -78,8 +78,12 @@ // // btnLogin // + this.btnLogin.AdaptBackColorWithTheme = true; + this.btnLogin.AdaptFontWithTheme = true; + this.btnLogin.AdaptForeColorWithTheme = true; this.btnLogin.BackColor = System.Drawing.Color.Silver; - this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnLogin.DialogResult = System.Windows.Forms.DialogResult.None; + this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.btnLogin.ForeColor = System.Drawing.Color.Black; this.btnLogin.Location = new System.Drawing.Point(585, 4); this.btnLogin.Name = "btnLogin"; @@ -184,7 +188,12 @@ // // btnCancel // + this.btnCancel.AdaptBackColorWithTheme = true; + this.btnCancel.AdaptFontWithTheme = true; + this.btnCancel.AdaptForeColorWithTheme = true; this.btnCancel.BackColor = System.Drawing.Color.Silver; + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.None; + this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.btnCancel.ForeColor = System.Drawing.Color.Black; this.btnCancel.Location = new System.Drawing.Point(3, 2); this.btnCancel.Name = "btnCancel"; @@ -227,7 +236,7 @@ this.ftpFiles.UseCompatibleStateImageBehavior = false; this.ftpFiles.View = System.Windows.Forms.View.List; this.ftpFiles.Visible = false; - this.ftpFiles.Click += new System.EventHandler(this.ftpItems_Click); + this.ftpFiles.DoubleClick += new System.EventHandler(this.ftpFiles_DoubleClick); // // fileIcons // diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index 55a4ee2..df531c3 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -56,7 +56,23 @@ namespace Histacom2.OS.Win95.Win95Apps } } - private void ftpItems_Click(object sender, EventArgs e) + + private void btnCancel_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } + + private void WinClassicFTPClient_Load(object sender, EventArgs e) + { + + } + + private void topBar_Paint(object sender, PaintEventArgs e) + { + topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor; + } + + private void ftpFiles_DoubleClick(object sender, EventArgs e) { try { @@ -120,20 +136,5 @@ namespace Histacom2.OS.Win95.Win95Apps } } catch { } // Try catch due to if you have more then one item selected the game crashing. } - - private void btnCancel_Click(object sender, EventArgs e) - { - ParentForm.Close(); - } - - private void WinClassicFTPClient_Load(object sender, EventArgs e) - { - - } - - private void topBar_Paint(object sender, PaintEventArgs e) - { - topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor; - } } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 9dd3ac3..e03fcd1 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - EgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBAwEAAUABAAFAAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs index de2e4b0..34828cc 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs @@ -34,6 +34,7 @@ namespace Histacom2.OS.Win95.Win95Apps public static async void GoToPage(string url) { + string newURL = url; UserControl uc = new UserControl(); switch (url) @@ -50,12 +51,24 @@ namespace Histacom2.OS.Win95.Win95Apps case "www.12padams.com": uc = new _12padams1998(); break; + case "12padams.com": + uc = new _12padams1998(); + newURL = "www.12padams.com"; + break; + case "google.com": + uc = new GoogleHome(); + newURL = "www.google.com"; + break; + case "google.stanford.edu": + uc = new GooglePrototype(); + newURL = "www.google.stanford.edu"; + break; default: uc = new IENoPage(); break; } - addressbar.Text = url; + addressbar.Text = newURL; uc.Dock = DockStyle.Fill; await Task.Delay(new Random().Next(500, 1500)); diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs index d87dc4e..6e2371a 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs @@ -54,10 +54,16 @@ namespace Histacom2.OS.Win95.Win95Apps { actionPanel.Hide(); cmdPrompt.ReadOnly = true; + if (SaveSystem.CurrentSave.CurrentOS == "xpbad") + { + cmdPrompt.BorderStyle = BorderStyle.None; + cmdPrompt.ScrollBars = RichTextBoxScrollBars.Vertical; + } } else { - cmdPrompt.AppendText("\nMicrosoft<R> Windows 95\n <C>Copyright Microsoft Corp 1981-1995.\n\n"); + if (SaveSystem.CurrentSave.CurrentOS == "95") cmdPrompt.AppendText("\nMicrosoft<R> Windows 95\n <C>Copyright Microsoft Corp 1981-1995.\n\n"); + if (SaveSystem.CurrentSave.CurrentOS == "98") cmdPrompt.AppendText("\nMicrosoft<R> Windows 98\n <C>Copyright Microsoft Corp 1981-1998.\n\n"); cmdPrompt.AppendText(prefix); } } @@ -68,7 +74,8 @@ namespace Histacom2.OS.Win95.Win95Apps public void WriteLine(string Text) { cmdPrompt.AppendText(Text + "\n"); - this.Update(); + cmdPrompt.Update(); + cmdPrompt.ScrollToCaret(); } /// <summary> diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs index 33ab4f2..9421bdc 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs @@ -104,10 +104,17 @@ // // btnGo // - this.btnGo.Location = new System.Drawing.Point(162, 133); + this.btnGo.AdaptBackColorWithTheme = true; + this.btnGo.AdaptFontWithTheme = true; + this.btnGo.AdaptForeColorWithTheme = true; + this.btnGo.BackColor = System.Drawing.Color.Silver; + this.btnGo.DialogResult = System.Windows.Forms.DialogResult.None; + this.btnGo.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.btnGo.ForeColor = System.Drawing.Color.Black; + this.btnGo.Location = new System.Drawing.Point(155, 133); this.btnGo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnGo.Name = "btnGo"; - this.btnGo.Size = new System.Drawing.Size(124, 23); + this.btnGo.Size = new System.Drawing.Size(131, 23); this.btnGo.TabIndex = 7; this.btnGo.Text = "Go To Destination Year"; this.btnGo.Click += new System.EventHandler(this.btnGo_Click); |
