From 3a8ada000aebbe5de46dce584a5d2b4432ddb5ad Mon Sep 17 00:00:00 2001
From: Alex-TIMEHACK <alexbu2015@hotmail.com>
Date: Sat, 17 Jun 2017 08:56:10 +0100
Subject: Updated my fork

---
 TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'TimeHACK.Main/OS')

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
index 4a2c988..a8a1323 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -7,6 +7,7 @@ using System.Media;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using TimeHACK.Engine;
 
 namespace TimeHACK.OS.Win95.Win95Apps.Story
@@ -21,20 +22,33 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
         // This is the very first story script!
         public void startObjective()
         {
-            
+            Thread terminalThread = new Thread(main);
+            terminalThread.Start();
+        }
+
+        public void main()
+        {
             wm.startWin95(term, "MS-DOS Prompt", null, true, true);
             term.WriteLine("192.168.0.1 Connecting...");
+
+            term.Invalidate();
+            Application.DoEvents();
+
             Thread soundThread = new Thread(dialup_sound_play);
             soundThread.Start();
-            soundThread.Join();
+            soundThread.Join();           
+
             term.WriteLine("192.168.0.1 Connected.");
 
-        }
+            Application.DoEvents();
 
+            Boolean ended = false;
+            while (!ended) {
+            }
+        }
         public void dialup_sound_play()
         {
-            SoundPlayer dialup_sound; 
-
+            SoundPlayer dialup_sound;
             // Play Dial-up Sound
             Stream audio = Properties.Resources.modem_dial;
             dialup_sound = new SoundPlayer(audio);
-- 
cgit v1.2.3


From 2f9031e0ace7ddadec9c441551ccfecf80b6df28 Mon Sep 17 00:00:00 2001
From: Alex-TIMEHACK <alexbu2015@hotmail.com>
Date: Sat, 17 Jun 2017 22:25:33 +0100
Subject: A LOT of tweaks - more to come

---
 TimeHACK.Engine/SaveSystem.cs                      | 14 ++-----
 TimeHACK.Main/OS/Win95/Win95.Designer.cs           | 18 ++++-----
 TimeHACK.Main/OS/Win95/Win95.cs                    | 17 ++++----
 TimeHACK.Main/OS/Win95/Win95.resx                  |  2 +-
 TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs    | 45 ++++++++++++++--------
 .../OS/Win95/Win95Apps/Story/NormalHack.cs         | 15 --------
 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs  |  3 +-
 TimeHACK.Main/Program.cs                           | 13 +++++++
 TimeHACK.Main/TimeHACK.Main.csproj                 |  1 -
 9 files changed, 65 insertions(+), 63 deletions(-)
 delete mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/Story/NormalHack.cs

(limited to 'TimeHACK.Main/OS')

diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 56a71a4..e217bf4 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -61,7 +61,7 @@ namespace TimeHACK.Engine
         {
             get
             {
-                return Path.Combine(ProfileMyComputerDirectory, "Settings");
+                    return Path.Combine(ProfileMyComputerDirectory, "Settings");
             }
         }
 
@@ -69,13 +69,7 @@ namespace TimeHACK.Engine
         {
             get
             {
-                if (CurrentSave.CurrentOS == "95")
-                {
-                    return Path.Combine(ProfileMyComputerDirectory, "Doc");
-                } else {
-                    return Path.Combine(ProfileSettingsDirectory, "Doc");
-                }
-                
+                return Path.Combine(ProfileMyComputerDirectory, "Doc");                
             }
         }
 
@@ -145,8 +139,8 @@ namespace TimeHACK.Engine
 
             SaveDirectoryInfo(ProfileFileSystemDirectory, false, "My Computer", false);            
             SaveDirectoryInfo(ProfileMyComputerDirectory, false, "Win95", true);
-            SaveDirectoryInfo(ProfileDocumentsDirectory, false, "My Documents", true);
-            SaveDirectoryInfo(ProfileSettingsDirectory, false, "Documents and Settings", true);
+            if (CurrentSave.CurrentOS == "95") SaveDirectoryInfo(ProfileDocumentsDirectory, false, "My Documents", true);
+            if (CurrentSave.CurrentOS != "95") SaveDirectoryInfo(ProfileSettingsDirectory, false, "Documents and Settings", true);
             SaveDirectoryInfo(ProfileProgramsDirectory, true, "Program Files", true);
             SaveDirectoryInfo(ProfileWindowsDirectory, true, "Windows", true);
         }
diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index 27749a2..5a35e3d 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -92,6 +92,7 @@ namespace TimeHACK.OS.Win95
             this.windowManagerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.SettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -129,7 +130,6 @@ namespace TimeHACK.OS.Win95
             this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.MicrosoftDataLinkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.panel1.SuspendLayout();
             this.taskbar.SuspendLayout();
             this.clockPanel.SuspendLayout();
@@ -778,6 +778,14 @@ namespace TimeHACK.OS.Win95
             this.installerTestToolStripMenuItem.Text = "InstallerTest";
             this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click);
             // 
+            // storyTest1ToolStripMenuItem
+            // 
+            this.storyTest1ToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
+            this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem";
+            this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+            this.storyTest1ToolStripMenuItem.Text = "StoryTest1";
+            this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click);
+            // 
             // SettingsToolStripMenuItem
             // 
             this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
@@ -1147,14 +1155,6 @@ namespace TimeHACK.OS.Win95
             this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(150, 22);
             this.PropertiesToolStripMenuItem1.Text = "Properties";
             // 
-            // storyTest1ToolStripMenuItem
-            // 
-            this.storyTest1ToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
-            this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem";
-            this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
-            this.storyTest1ToolStripMenuItem.Text = "StoryTest1";
-            this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click);
-            // 
             // Windows95
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 8b272ec..bd706cb 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -109,12 +109,7 @@ namespace TimeHACK.OS.Win95
         // Shutdown button
         private void ShutdownToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            startsound.Stop();
-            Stream audio = Properties.Resources.tada;
-            stopsound = new SoundPlayer(audio);
-            stopsound.Play();
-            System.Threading.Thread.Sleep(1500);
-            Application.Exit();
+            Program.ShutdownApplication(Properties.Resources.tada);
         }
 
         #endregion //Region
@@ -343,11 +338,17 @@ namespace TimeHACK.OS.Win95
 
         private void storyTest1ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Win95Apps.Story.Hack1 story = new Win95Apps.Story.Hack1();
-            story.startObjective();
+            Hack1.startObjective();
         }
 
         private void temp_for_std(object sender, EventArgs e)
+        {
+            System.Threading.Thread thread = new System.Threading.Thread(StartSurviveTheDay);
+
+            thread.Start();
+        }
+
+        void StartSurviveTheDay()
         {
             Win2K.Win2KApps.SurviveTheDay std = new Win2K.Win2KApps.SurviveTheDay();
             WinClassic app = wm.startWin95(std, "Survive The Day", null, false, false);
diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx
index 72d7350..38f1073 100644
--- a/TimeHACK.Main/OS/Win95/Win95.resx
+++ b/TimeHACK.Main/OS/Win95/Win95.resx
@@ -407,7 +407,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
-        ggAAAk1TRnQBSQFMAgEBDAEAAVgBAQFYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        ggAAAk1TRnQBSQFMAgEBDAEAAWABAQFgAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
index a8a1323..2310af4 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -12,41 +12,52 @@ using TimeHACK.Engine;
 
 namespace TimeHACK.OS.Win95.Win95Apps.Story
 {
-    class Hack1 : NormalHack
+    static class Hack1 : Object
     {
-        WinClassicTerminal term = new WinClassicTerminal();
-        WindowManager wm = new WindowManager();
-
-        
+        static WinClassicTerminal term = new WinClassicTerminal();
+        static WindowManager wm = new WindowManager();
+        static Boolean ended = false;
+        static Thread soundThread = new Thread(dialup_sound_play);
 
         // This is the very first story script!
-        public void startObjective()
+        public static void startObjective()
         {
-            Thread terminalThread = new Thread(main);
-            terminalThread.Start();
-        }
+            System.Windows.Forms.Timer tmr = new System.Windows.Forms.Timer();
 
-        public void main()
-        {
             wm.startWin95(term, "MS-DOS Prompt", null, true, true);
             term.WriteLine("192.168.0.1 Connecting...");
 
             term.Invalidate();
-            Application.DoEvents();
+            Application.DoEvents();           
+
+            tmr.Interval = 1;
+            tmr.Tick += new EventHandler(CheckIfSoundFinished);
 
-            Thread soundThread = new Thread(dialup_sound_play);
             soundThread.Start();
-            soundThread.Join();           
 
+            tmr.Start();
+        }
+
+        public static void continueObjective()
+        {
             term.WriteLine("192.168.0.1 Connected.");
 
             Application.DoEvents();
+        }
+        
+        public static void CheckIfSoundFinished(Object sender, EventArgs e)
+        {
+            if (soundThread.IsAlive == false)
+            {
+                // Continue from where we were
+                System.Windows.Forms.Timer trm = sender as System.Windows.Forms.Timer;
 
-            Boolean ended = false;
-            while (!ended) {
+                continueObjective();
+                trm.Stop();
             }
         }
-        public void dialup_sound_play()
+
+        public static void dialup_sound_play()
         {
             SoundPlayer dialup_sound;
             // Play Dial-up Sound
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/NormalHack.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/NormalHack.cs
deleted file mode 100644
index b5c63a6..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/NormalHack.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace TimeHACK.OS.Win95.Win95Apps.Story
-{
-    class NormalHack
-    {
-        
-    }
-}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
index 97a0581..e3423a8 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
@@ -60,8 +60,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     googlealpha.Show();
                     break;
                 case "www.12padams.com":
-                    Story.Hack1 startStory = new Story.Hack1();
-                    startStory.startObjective();
+                    Win95Apps.Story.Hack1.startObjective();
                     hidePrograms();
                     break;
                 case "www.microsoft.com/internetexplorer4/welcome":
diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs
index 839a0c8..673ab07 100644
--- a/TimeHACK.Main/Program.cs
+++ b/TimeHACK.Main/Program.cs
@@ -17,6 +17,8 @@ namespace TimeHACK
 {
     static class Program
     {
+        static System.Media.SoundPlayer stopsound;
+
         internal static bool nightly = true;
         internal static string gameID;
         internal static TitleScreen title = null;
@@ -87,5 +89,16 @@ namespace TimeHACK
                 return "";
             }           
         }
+
+        public static void ShutdownApplication(System.IO.UnmanagedMemoryStream audio)
+        {
+            
+            System.IO.Stream audioPlay = audio;
+            stopsound = new System.Media.SoundPlayer(audioPlay);
+            stopsound.Play();
+
+            System.Threading.Thread.Sleep(1500);
+            Application.Exit();
+        }
     }
 }
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index f57c688..0378561 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -129,7 +129,6 @@
       <DependentUpon>SurviveTheDay.cs</DependentUpon>
     </Compile>
     <Compile Include="OS\Win95\Win95Apps\Story\Hack1.cs" />
-    <Compile Include="OS\Win95\Win95Apps\Story\NormalHack.cs" />
     <Compile Include="OS\Win95\Win95Apps\WinClassicFTPClient.cs">
       <SubType>UserControl</SubType>
     </Compile>
-- 
cgit v1.2.3


From bf7fcf52ad5373e25fbe399f4f1dd1091f53c159 Mon Sep 17 00:00:00 2001
From: AShifter <loganr.lowe@gmail.com>
Date: Sun, 18 Jun 2017 18:39:27 -0700
Subject: Some more terminal work

IT WORKS! IT WWOOOOORRRKKKSS!!! YOu can now use Thread.Sleep(); without
issues.
---
 TimeHACK.Engine/TimeHACK.Engine.csproj             |  5 ++--
 TimeHACK.Engine/packages.config                    |  2 +-
 TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs    | 28 ++++++++++++----------
 .../Win95/Win95Apps/WinClassicTerminal.Designer.cs |  1 +
 .../OS/Win95/Win95Apps/WinClassicTerminal.cs       |  4 ++--
 TimeHACK.Main/TimeHACK.Main.csproj                 |  4 ++--
 TimeHACK.Main/packages.config                      |  2 +-
 7 files changed, 26 insertions(+), 20 deletions(-)

(limited to 'TimeHACK.Main/OS')

diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj
index 980f7fb..7ee8e6e 100644
--- a/TimeHACK.Engine/TimeHACK.Engine.csproj
+++ b/TimeHACK.Engine/TimeHACK.Engine.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\TimeHACK.Main\bin\Release\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BSODCreator.cs" />
+    <None Include="packages.config" />
     <None Include="Resources\WinClassic\Window\pjBg6mKP.bin" />
     <Compile Include="FileDialogBoxManager.cs" />
     <Compile Include="SaveSystem.cs" />
diff --git a/TimeHACK.Engine/packages.config b/TimeHACK.Engine/packages.config
index f54866f..810e559 100644
--- a/TimeHACK.Engine/packages.config
+++ b/TimeHACK.Engine/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
index 2310af4..faafdea 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -14,35 +14,39 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
 {
     static class Hack1 : Object
     {
-        static WinClassicTerminal term = new WinClassicTerminal();
+        static WinClassicTerminal Console = new WinClassicTerminal();
         static WindowManager wm = new WindowManager();
         static Boolean ended = false;
         static Thread soundThread = new Thread(dialup_sound_play);
+        static Boolean devMode = false;
 
         // This is the very first story script!
         public static void startObjective()
         {
             System.Windows.Forms.Timer tmr = new System.Windows.Forms.Timer();
 
-            wm.startWin95(term, "MS-DOS Prompt", null, true, true);
-            term.WriteLine("192.168.0.1 Connecting...");
-
-            term.Invalidate();
-            Application.DoEvents();           
+            wm.startWin95(Console, "MS-DOS Prompt", null, true, true);
+            Console.WriteLine("telnet> 104.27.135.159 Connecting...");          
 
             tmr.Interval = 1;
             tmr.Tick += new EventHandler(CheckIfSoundFinished);
 
-            soundThread.Start();
-
-            tmr.Start();
+            if (devMode == true)
+            {
+                continueObjective();
+            }
+            else
+            {
+                soundThread.Start();
+                tmr.Start();
+            }
         }
 
         public static void continueObjective()
         {
-            term.WriteLine("192.168.0.1 Connected.");
-
-            Application.DoEvents();
+            Console.WriteLine("telnet> 104.27.135.159 Connected.");
+            Thread.Sleep(2500);
+            Console.WriteLine("telnet> 104.27.135.159 set hostname to 'TheHiddenHacker'.");
         }
         
         public static void CheckIfSoundFinished(Object sender, EventArgs e)
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs
index d7e9781..ddae557 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs
@@ -35,6 +35,7 @@
             // 
             this.richTextBox1.BackColor = System.Drawing.Color.Black;
             this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.richTextBox1.Font = new System.Drawing.Font("Lucida Console", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.richTextBox1.ForeColor = System.Drawing.Color.White;
             this.richTextBox1.Location = new System.Drawing.Point(0, 0);
             this.richTextBox1.Name = "richTextBox1";
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
index d25b409..174c5b4 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
@@ -20,9 +20,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public WinClassicTerminal()
         {
             InitializeComponent();
-            this.richTextBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
         }
-        private SoundPlayer startsound;
         /// <summary>
         /// Write text to the Terminal and create a new line. Very similar to the Win32 Console.WriteLine Function.
         /// </summary>
@@ -30,6 +28,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public void WriteLine(string Text)
         {
             richTextBox1.AppendText(Text + "\n");
+            richTextBox1.Update();
         }
 
         /// <summary>
@@ -39,6 +38,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public void Write(String Text)
         {
             richTextBox1.AppendText(Text);
+            richTextBox1.Update();
         }
     }
 }
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 0378561..fe54247 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -106,8 +106,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Release\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -345,6 +344,7 @@
     <EmbeddedResource Include="TitleScreen.resx">
       <DependentUpon>TitleScreen.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/TimeHACK.Main/packages.config b/TimeHACK.Main/packages.config
index f54866f..810e559 100644
--- a/TimeHACK.Main/packages.config
+++ b/TimeHACK.Main/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3


From 5c0af49eb6d2af973132d5c219af27c50ea41e27 Mon Sep 17 00:00:00 2001
From: AShifter <loganr.lowe@gmail.com>
Date: Sun, 18 Jun 2017 19:38:27 -0700
Subject: Start storyline

Actually add some story!
---
 TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'TimeHACK.Main/OS')

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
index faafdea..38962fe 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -18,7 +18,7 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
         static WindowManager wm = new WindowManager();
         static Boolean ended = false;
         static Thread soundThread = new Thread(dialup_sound_play);
-        static Boolean devMode = false;
+        static Boolean devMode = true;
 
         // This is the very first story script!
         public static void startObjective()
@@ -44,9 +44,27 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
 
         public static void continueObjective()
         {
-            Console.WriteLine("telnet> 104.27.135.159 Connected.");
+            Console.WriteLine("\ntelnet> 104.27.135.159 Connected.");
             Thread.Sleep(2500);
-            Console.WriteLine("telnet> 104.27.135.159 set hostname to 'TheHiddenHacker'.");
+            Console.WriteLine("\ntelnet> 104.27.135.159 set hostname to 'TheHiddenHacker'.");
+            Thread.Sleep(2500);
+            Console.WriteLine("\nTheHiddenHacker> I see you have access to 12padams.com.");
+            Thread.Sleep(4500);
+            Console.WriteLine("\nTheHiddenHacker> Though it doesn't seem obvious, only a very limited amount of people can access the site.");
+            Thread.Sleep(6000);
+            Console.WriteLine("\nTheHiddenHacker> 12padams has a secret, and I need you to help me find it.");
+            Thread.Sleep(3500);
+            Console.WriteLine("\nTheHiddenHacker> I was snooping around his website, when he blacklisted my IP address.");
+            Thread.Sleep(4000);
+            Console.WriteLine("\nTheHiddenHacker> While I was serching, I noticed a file that I didn't have permission to download. I need you to get it for me.");
+            Thread.Sleep(6500);
+            Console.WriteLine("\nTheHiddenHacker> First, I'll need you to download an FTP client, avalible under the software section of 12padams' website.");
+            Thread.Sleep(5000);
+            Console.WriteLine("\nTheHiddenHacker> Once that's downloaded, You'll need to type in a Hostname, Username, and Password.");
+            Thread.Sleep(4500);
+            Console.WriteLine("\nTheHiddenHacker> The hostname is 172.68.119.42, and the username is most likely 12padams. I'm not too sure what the password is, however.");
+            Thread.Sleep(3500);
+            Console.WriteLine("\nTheHiddenHacker> You'll need to figure out where you can get the password. Try looking for any odd text on the website.");
         }
         
         public static void CheckIfSoundFinished(Object sender, EventArgs e)
-- 
cgit v1.2.3


From 858d1e7062331c33ed8fe613574aa021351428c7 Mon Sep 17 00:00:00 2001
From: AShifter <loganr.lowe@gmail.com>
Date: Mon, 19 Jun 2017 00:14:34 -0700
Subject: Start BIOS

aww yeah baby
---
 TimeHACK.Main/OS/BIOS/BIOS.Designer.cs |  61 +++++++++++++++++
 TimeHACK.Main/OS/BIOS/BIOS.cs          |  38 +++++++++++
 TimeHACK.Main/OS/BIOS/BIOS.resx        | 120 +++++++++++++++++++++++++++++++++
 TimeHACK.Main/TimeHACK.Main.csproj     |   9 +++
 4 files changed, 228 insertions(+)
 create mode 100644 TimeHACK.Main/OS/BIOS/BIOS.Designer.cs
 create mode 100644 TimeHACK.Main/OS/BIOS/BIOS.cs
 create mode 100644 TimeHACK.Main/OS/BIOS/BIOS.resx

(limited to 'TimeHACK.Main/OS')

diff --git a/TimeHACK.Main/OS/BIOS/BIOS.Designer.cs b/TimeHACK.Main/OS/BIOS/BIOS.Designer.cs
new file mode 100644
index 0000000..ec89495
--- /dev/null
+++ b/TimeHACK.Main/OS/BIOS/BIOS.Designer.cs
@@ -0,0 +1,61 @@
+namespace TimeHACK.OS.BIOS
+{
+    partial class BIOS
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.BIOSConsole = new TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal();
+            this.SuspendLayout();
+            // 
+            // BIOSConsole
+            // 
+            this.BIOSConsole.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.BIOSConsole.Location = new System.Drawing.Point(0, 0);
+            this.BIOSConsole.Name = "BIOSConsole";
+            this.BIOSConsole.Size = new System.Drawing.Size(528, 305);
+            this.BIOSConsole.TabIndex = 0;
+            this.BIOSConsole.Load += new System.EventHandler(this.BIOSConsole_Load);
+            // 
+            // BIOS
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(528, 305);
+            this.Controls.Add(this.BIOSConsole);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "BIOS";
+            this.Text = "BIOS";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public Win95.Win95Apps.WinClassicTerminal BIOSConsole;
+    }
+}
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/BIOS/BIOS.cs b/TimeHACK.Main/OS/BIOS/BIOS.cs
new file mode 100644
index 0000000..5c607e1
--- /dev/null
+++ b/TimeHACK.Main/OS/BIOS/BIOS.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TimeHACK.Engine;
+using TimeHACK.OS.Win95.Win95Apps;
+using TimeHACK.Engine.Template;
+using System.Threading;
+
+namespace TimeHACK.OS.BIOS
+{
+    public partial class BIOS : Form
+    {
+        public BIOS()
+        {
+            InitializeComponent();
+        }
+
+        private void BIOSConsole_Load(object sender, EventArgs e)
+        {
+            BIOSConsole.WriteLine("TiemHARK BIOS v.1.337, An Shift Soft Ally.");
+            Console.Beep(575, 100);
+            Thread.Sleep(1000);
+            BIOSConsole.WriteLine("Copyright (C) 1984-1998, AShift Software, Inc.");
+            Console.Beep(575, 100);
+            Thread.Sleep(1500);
+            BIOSConsole.WriteLine("\nAntel More a8-1700x at 1.337 ghz");
+            Console.Beep(575, 100);
+            Thread.Sleep(500);
+            
+        }
+    }
+}
diff --git a/TimeHACK.Main/OS/BIOS/BIOS.resx b/TimeHACK.Main/OS/BIOS/BIOS.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/TimeHACK.Main/OS/BIOS/BIOS.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index fe54247..f17eb29 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -121,6 +121,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="OS\BIOS\BIOS.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OS\BIOS\BIOS.Designer.cs">
+      <DependentUpon>BIOS.cs</DependentUpon>
+    </Compile>
     <Compile Include="OS\Win2K\Win2KApps\SurviveTheDay.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -267,6 +273,9 @@
     <Compile Include="TitleScreen.Designer.cs">
       <DependentUpon>TitleScreen.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="OS\BIOS\BIOS.resx">
+      <DependentUpon>BIOS.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="OS\Win2K\Win2KApps\SurviveTheDay.resx">
       <DependentUpon>SurviveTheDay.cs</DependentUpon>
     </EmbeddedResource>
-- 
cgit v1.2.3