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

11 files changed, 165 insertions, 9 deletions

diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs
index 0153858..b0186e9 100644
--- a/TimeHACK.Engine/Properties/Resources.Designer.cs
+++ b/TimeHACK.Engine/Properties/Resources.Designer.cs
@@ -200,6 +200,43 @@ namespace TimeHACK.Engine.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Win95PlusDangerousCreaturesStart {
+            get {
+                return ResourceManager.GetStream("Win95PlusDangerousCreaturesStart", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Win95PlusDangerousCreaturesWallpaper {
+            get {
+                object obj = ResourceManager.GetObject("Win95PlusDangerousCreaturesWallpaper", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Win95Start {
+            get {
+                return ResourceManager.GetStream("Win95Start", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Win95Stop {
+            get {
+                return ResourceManager.GetStream("Win95Stop", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Win95Warning {
@@ -210,6 +247,24 @@ namespace TimeHACK.Engine.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Win98Start {
+            get {
+                return ResourceManager.GetStream("Win98Start", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Win98Stop {
+            get {
+                return ResourceManager.GetStream("Win98Stop", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap WinAboutSeparator95 {
diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx
index ce1326d..aeb1500 100644
--- a/TimeHACK.Engine/Properties/Resources.resx
+++ b/TimeHACK.Engine/Properties/Resources.resx
@@ -181,4 +181,22 @@
   <data name="CHORD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\chord.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Win95PlusDangerousCreaturesStart" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win95PlusDangerousCreaturesStart.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Win95PlusDangerousCreaturesWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win95PlusDangerousCreaturesWallpaper.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Win95Start" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win95Start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Win95Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win95Stop.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Win98Start" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win98Start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Win98Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win98Stop.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesStart.WAV b/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesStart.WAV
new file mode 100644
index 0000000..3b9666f
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesStart.WAV
diff --git a/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesWallpaper.JPG b/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesWallpaper.JPG
new file mode 100644
index 0000000..eb31a05
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesWallpaper.JPG
diff --git a/TimeHACK.Engine/Resources/Win95Start.wav b/TimeHACK.Engine/Resources/Win95Start.wav
new file mode 100644
index 0000000..d6ef0e2
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win95Start.wav
diff --git a/TimeHACK.Engine/Resources/Win95Stop.wav b/TimeHACK.Engine/Resources/Win95Stop.wav
new file mode 100644
index 0000000..b3127d1
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win95Stop.wav
diff --git a/TimeHACK.Engine/Resources/Win98Start.wav b/TimeHACK.Engine/Resources/Win98Start.wav
new file mode 100644
index 0000000..4d27f3d
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win98Start.wav
diff --git a/TimeHACK.Engine/Resources/Win98Stop.WAV b/TimeHACK.Engine/Resources/Win98Stop.WAV
new file mode 100644
index 0000000..2bc524e
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win98Stop.WAV
diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 7a6eed0..7110995 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using System.Diagnostics;
 
 namespace TimeHACK.Engine
 {
@@ -12,10 +13,12 @@ namespace TimeHACK.Engine
     {
         public static Save CurrentSave { get; set; }
         public static FileSystemFolderInfo filesystemflinfo { get; set; }
-        public static Boolean DevMode = false;
+        public static bool DevMode = false;
 
         public static FileAssociation IconChanger = new FileAssociation();
 
+        public static Theme currentTheme { get; set; }
+
         public static string GameDirectory
         {
             get
@@ -113,12 +116,30 @@ namespace TimeHACK.Engine
 
         public static void NewGame()
         {
-
             //TODO: User must set a username....somehow            
 
             var save = new Save();
             save.ExperiencedStories = new List<string>();
-            save.CurrentOS = "95";
+            if (DevMode == true)
+            {
+                if (ProfileName == "98")
+                {
+                    save.CurrentOS = "98";
+                    save.ThemeName = "default98";
+                }
+                else
+                {
+                    save.CurrentOS = "95";
+                    save.ThemeName = "default95";
+                    currentTheme = new Default95Theme();
+                }
+            }
+            else
+            {
+                save.CurrentOS = "95";
+                save.ThemeName = "default95";
+                currentTheme = new Default95Theme();
+            }
             CurrentSave = save;
                       
             CheckFiles();
@@ -158,16 +179,16 @@ namespace TimeHACK.Engine
             SaveDirectoryInfo(Path.Combine(ProfileWindowsDirectory, "Help"), true, "Help", true);
             SaveDirectoryInfo(Path.Combine(ProfileWindowsDirectory, "Temp"), true, "Temp", true);
 
-            CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Calc.exe"), "Calculator");
+            CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "calc.exe"), "Calculator");
             CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "explorer.exe"), "windowsexplorer");
         }
 
-        public static void CreateWindowsFile(String filepath, String contents)
+        public static void CreateWindowsFile(string filepath, string contents)
         {
             File.WriteAllText(filepath, contents);
         }
 
-        public static void SaveDirectoryInfo(String directory, Boolean isProtected, String label, Boolean allowback)
+        public static void SaveDirectoryInfo(string directory, bool isProtected, string label, bool allowback)
         {
             if (!Directory.Exists(directory))
                 Directory.CreateDirectory(directory);
@@ -208,12 +229,14 @@ namespace TimeHACK.Engine
         public string CurrentOS { get; set; }
         // public Dictionary<string, bool> InstalledPrograms { get; set; } InstallProgram is no longer needed... we have that data in the FileSystem
         public List<string> ExperiencedStories { get; set; }
+        public bool FTime95 { get; set; }
+        public string ThemeName { get; set; }
     }
 
     public class FileSystemFolderInfo
     {
-        public Boolean Isprotected { get; set; }
-        public String label { get; set; }
-        public Boolean allowback { get; set; }
+        public bool Isprotected { get; set; }
+        public string label { get; set; }
+        public bool allowback { get; set; }
     }
 }
diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs
new file mode 100644
index 0000000..cd82fac
--- /dev/null
+++ b/TimeHACK.Engine/Theme.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TimeHACK.Engine
+{
+    public class Theme
+    {
+        public Stream startSound { get; set; }
+        public Stream stopSound { get; set; }
+
+        public Stream asteriskSound { get; set; }
+        public Stream critStopSound { get; set; }
+        public Stream progErrorSound { get; set; }
+        public Stream questionSound { get; set; }
+
+        public Image defaultWallpaper { get; set; }
+
+        public string themeName { get; set; }
+    }
+
+    public class Default95Theme: Theme
+    {
+        public Default95Theme()
+        {
+            startSound = Properties.Resources.Win95Start;
+            stopSound = Properties.Resources.Win95Stop;
+
+            asteriskSound = Properties.Resources.CHORD;
+            critStopSound = Properties.Resources.CHORD;
+            progErrorSound = Properties.Resources.CHORD;
+            questionSound = Properties.Resources.CHORD;
+
+            defaultWallpaper = null;
+            themeName = "default95";
+        }
+    }
+
+    public class DangerousCreaturesTheme: Theme
+    {
+        public DangerousCreaturesTheme()
+        {
+            startSound = Properties.Resources.Win95PlusDangerousCreaturesStart;
+
+            defaultWallpaper = Properties.Resources.Win95PlusDangerousCreaturesWallpaper;
+            themeName = "dangeranimals";
+        }
+    }
+}
diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj
index 3043220..0a9a4fa 100644
--- a/TimeHACK.Engine/TimeHACK.Engine.csproj
+++ b/TimeHACK.Engine/TimeHACK.Engine.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Template\WinClassic.Designer.cs">
       <DependentUpon>WinClassic.cs</DependentUpon>
     </Compile>
+    <Compile Include="Theme.cs" />
     <Compile Include="WindowManager.cs" />
     <Compile Include="MessageParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -108,6 +109,12 @@
     <Content Include="Resources\chord.wav" />
     <Content Include="Resources\Icon128x.ico" />
     <None Include="Resources\WinAboutSeparator95.png" />
+    <None Include="Resources\Win95PlusDangerousCreaturesStart.WAV" />
+    <None Include="Resources\Win95Start.wav" />
+    <None Include="Resources\Win95Stop.wav" />
+    <None Include="Resources\Win98Start.wav" />
+    <None Include="Resources\Win98Stop.WAV" />
+    <None Include="Resources\Win95PlusDangerousCreaturesWallpaper.JPG" />
     <Content Include="Resources\WinClassic\Window\BottomLeft.png" />
     <Content Include="Resources\WinClassic\Window\BottomRight.png" />
     <Content Include="Resources\WinClassic\Window\BottomSide.png" />