Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

18 files changed, 45 insertions, 12 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
index 1822c43..4f12ec7 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Media;
@@ -10,23 +11,36 @@ using TimeHACK.Engine;
 
 namespace TimeHACK.OS.Win95.Win95Apps.Story
 {
-    class Hack1
+    class Hack1 : NormalHack
     {
         WinClassicTerminal term = new WinClassicTerminal();
         WindowManager wm = new WindowManager();
-        private SoundPlayer startsound;
+
+        
 
         // This is the very first story script!
         public void startObjective()
         {
             
             wm.startWin95(term, "MS-DOS Prompt", null, true, true);
+
+            Thread theThread = new Thread(startObjectMAIN);
+
+            theThread.Start();
+
+        }
+
+        public void startObjectMAIN()
+        {
+            SoundPlayer startsound;
             term.WriteLine("192.168.0.1 Connecting...");
-            
+
             // Play Dial-up Sound
             Stream audio = Properties.Resources.modem_dial;
             startsound = new SoundPlayer(audio);
-            startsound.PlaySync();
+            startsound.Play();
+            Thread.Sleep(5000);
+            startsound.Stop();
             term.WriteLine("192.168.0.1 Connected.");
         }
     }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/NormalHack.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/NormalHack.cs
new file mode 100644
index 0000000..b5c63a6
--- /dev/null
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/NormalHack.cs
@@ -0,0 +1,15 @@
+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/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
index 24cb7dd..d25b409 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
@@ -10,6 +10,8 @@ using System.Windows.Forms;
 using System.Media;
 using System.IO;
 using System.Threading;
+using System.Reflection;
+using System.Linq.Expressions;
 
 namespace TimeHACK.OS.Win95.Win95Apps
 {
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 41dee88..795542d 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -123,6 +123,7 @@
   </ItemGroup>
   <ItemGroup>
     <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>
diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs
index d73269f..bf6e145 100644
--- a/TimeHACK.Main/TitleScreen.cs
+++ b/TimeHACK.Main/TitleScreen.cs
@@ -34,7 +34,6 @@ namespace TimeHACK
             }
             else {
                 // Time to decide which OS to start up!
-                MessageBox.Show(CurrentSave.CurrentOS);
 
                 switch (CurrentSave.CurrentOS)
                 {
diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application
index 90b813d..89d0fa5 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.application
+++ b/TimeHACK.Main/bin/Release/TimeHACK.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>axya6B1VuGVCDd3AFMwt1roZXHr5zdukXgh8gG8E78Y=</dsig:DigestValue>
+        <dsig:DigestValue>RNlfPf/pYd1sreRcbdQWeJvSqglLBCYiAZQvcsKH+eo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe
index 352d93e..af8869b 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.exe
+++ b/TimeHACK.Main/bin/Release/TimeHACK.exe
diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
index 72bc8fe..92fa380 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
+++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
@@ -56,14 +56,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="7088128">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="7089152">
       <assemblyIdentity name="TimeHACK" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>xlhY2eZZvmIMUX049vQl+iv2GhxMilZe6Z5oLOMXcVg=</dsig:DigestValue>
+        <dsig:DigestValue>aQVZXO5XeVI/LFH80SyMNiN6ifkT7noACX3Ul59+7VY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb
index d488493..91b1110 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.pdb
+++ b/TimeHACK.Main/bin/Release/TimeHACK.pdb
diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe
index 352d93e..af8869b 100644
--- a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe
+++ b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe
diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache
index d21734b..54632ce 100644
--- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache
+++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache
@@ -1 +1 @@
-afa2a0374774e62688929b1ade536ee4c8b42bf9
+4ea1307cf50b0551eb868fff46db4571513000aa
diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
index fc82f64..bff525a 100644
--- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
+++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
@@ -130,3 +130,5 @@ C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win
 C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources

 C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources

 C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources

+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources

+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources

diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache
index d0aa5ad..7492e15 100644
--- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache
+++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache
diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
index a25e678..bc2dff3 100644
--- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
+++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application
index 90b813d..89d0fa5 100644
--- a/TimeHACK.Main/obj/Release/TimeHACK.application
+++ b/TimeHACK.Main/obj/Release/TimeHACK.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>axya6B1VuGVCDd3AFMwt1roZXHr5zdukXgh8gG8E78Y=</dsig:DigestValue>
+        <dsig:DigestValue>RNlfPf/pYd1sreRcbdQWeJvSqglLBCYiAZQvcsKH+eo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe
index 352d93e..af8869b 100644
--- a/TimeHACK.Main/obj/Release/TimeHACK.exe
+++ b/TimeHACK.Main/obj/Release/TimeHACK.exe
diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
index 72bc8fe..92fa380 100644
--- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
+++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
@@ -56,14 +56,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="7088128">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="7089152">
       <assemblyIdentity name="TimeHACK" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>xlhY2eZZvmIMUX049vQl+iv2GhxMilZe6Z5oLOMXcVg=</dsig:DigestValue>
+        <dsig:DigestValue>aQVZXO5XeVI/LFH80SyMNiN6ifkT7noACX3Ul59+7VY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb
index d488493..91b1110 100644
--- a/TimeHACK.Main/obj/Release/TimeHACK.pdb
+++ b/TimeHACK.Main/obj/Release/TimeHACK.pdb