minesweeper lcd font

7 files changed, 79 insertions, 32 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
index 7337c83..56d0133 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
@@ -58,29 +58,31 @@
             // 
             // labelBombs
             // 
-            this.labelBombs.BackColor = System.Drawing.Color.Black;
-            this.labelBombs.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.labelBombs.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelBombs.BackColor = System.Drawing.Color.Silver;
+            this.labelBombs.Font = new System.Drawing.Font("Lemon\'s LCD", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.labelBombs.ForeColor = System.Drawing.Color.Red;
-            this.labelBombs.Location = new System.Drawing.Point(18, 34);
+            this.labelBombs.Image = global::TimeHACK.Properties.Resources.MinesweepNumBox;
+            this.labelBombs.Location = new System.Drawing.Point(20, 32);
             this.labelBombs.Name = "labelBombs";
-            this.labelBombs.Size = new System.Drawing.Size(56, 23);
+            this.labelBombs.Size = new System.Drawing.Size(56, 25);
             this.labelBombs.TabIndex = 7;
-            this.labelBombs.Text = "0";
-            this.labelBombs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelBombs.Text = "000";
+            this.labelBombs.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // labelTime
             // 
-            this.labelTime.BackColor = System.Drawing.Color.Black;
-            this.labelTime.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.labelTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelTime.BackColor = System.Drawing.Color.Silver;
+            this.labelTime.Font = new System.Drawing.Font("Lemon\'s LCD", 15F);
             this.labelTime.ForeColor = System.Drawing.Color.Red;
-            this.labelTime.Location = new System.Drawing.Point(162, 34);
+            this.labelTime.Image = global::TimeHACK.Properties.Resources.MinesweepNumBox;
+            this.labelTime.Location = new System.Drawing.Point(162, 32);
+            this.labelTime.Margin = new System.Windows.Forms.Padding(0);
             this.labelTime.Name = "labelTime";
-            this.labelTime.Size = new System.Drawing.Size(56, 23);
+            this.labelTime.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.labelTime.Size = new System.Drawing.Size(56, 25);
             this.labelTime.TabIndex = 6;
-            this.labelTime.Text = "0";
-            this.labelTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelTime.Text = "000";
+            this.labelTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // panel1
             // 
@@ -91,6 +93,7 @@
             // 
             // menuStrip1
             // 
+            this.menuStrip1.BackColor = System.Drawing.Color.Silver;
             this.menuStrip1.ImageScalingSize = new System.Drawing.Size(0, 0);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.gameToolStripMenuItem,
@@ -126,7 +129,7 @@
             // 
             this.newToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.newToolStripMenuItem.Name = "newToolStripMenuItem";
-            this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.newToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.newToolStripMenuItem.Text = "New";
             this.newToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.newToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -134,13 +137,13 @@
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(138, 6);
             // 
             // begginnerToolStripMenuItem
             // 
             this.begginnerToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.begginnerToolStripMenuItem.Name = "begginnerToolStripMenuItem";
-            this.begginnerToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.begginnerToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.begginnerToolStripMenuItem.Text = "Begginner";
             this.begginnerToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.begginnerToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -150,7 +153,7 @@
             // 
             this.intermediateToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.intermediateToolStripMenuItem.Name = "intermediateToolStripMenuItem";
-            this.intermediateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.intermediateToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.intermediateToolStripMenuItem.Text = "Intermediate";
             this.intermediateToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.intermediateToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -160,7 +163,7 @@
             // 
             this.expertToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.expertToolStripMenuItem.Name = "expertToolStripMenuItem";
-            this.expertToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.expertToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.expertToolStripMenuItem.Text = "Expert";
             this.expertToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.expertToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -170,7 +173,7 @@
             // 
             this.customToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.customToolStripMenuItem.Name = "customToolStripMenuItem";
-            this.customToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.customToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.customToolStripMenuItem.Text = "Custom";
             this.customToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.customToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -178,13 +181,13 @@
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(138, 6);
             // 
             // marksToolStripMenuItem
             // 
             this.marksToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.marksToolStripMenuItem.Name = "marksToolStripMenuItem";
-            this.marksToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.marksToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.marksToolStripMenuItem.Text = "Marks {?}";
             this.marksToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.marksToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -193,7 +196,7 @@
             // 
             this.colorToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.colorToolStripMenuItem.Name = "colorToolStripMenuItem";
-            this.colorToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.colorToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.colorToolStripMenuItem.Text = "Color";
             this.colorToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.colorToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -201,13 +204,13 @@
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(138, 6);
             // 
             // bestTimesToolStripMenuItem
             // 
             this.bestTimesToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.bestTimesToolStripMenuItem.Name = "bestTimesToolStripMenuItem";
-            this.bestTimesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.bestTimesToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.bestTimesToolStripMenuItem.Text = "Best Times";
             this.bestTimesToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.bestTimesToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -216,13 +219,13 @@
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(138, 6);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.exitToolStripMenuItem.Text = "Exit";
             this.exitToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.exitToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@@ -260,12 +263,13 @@
             // 
             // button1
             // 
+            this.button1.BackColor = System.Drawing.Color.Silver;
             this.button1.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicMinesweeperSmile;
             this.button1.Location = new System.Drawing.Point(108, 32);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(25, 25);
             this.button1.TabIndex = 9;
-            this.button1.UseVisualStyleBackColor = true;
+            this.button1.UseVisualStyleBackColor = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
             // timer1
@@ -277,6 +281,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.Silver;
             this.Controls.Add(this.button1);
             this.Controls.Add(this.labelBombs);
             this.Controls.Add(this.labelTime);
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
index 53dd1b2..8714b65 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
@@ -20,6 +20,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public WinClassicMinesweeper()
         {
             InitializeComponent();
+            labelBombs.Font = new Font(TitleScreen.pfc.Families[2], 15, GraphicsUnit.Point);
+            labelTime.Font = new Font(TitleScreen.pfc.Families[2], 15, GraphicsUnit.Point);
+            panel1.Paint += (sender, args) => Paintbrush.PaintClassicBordersIndented(sender, args, 3);
         }
         private void GameTick(object sender, EventArgs e)
         {
@@ -94,18 +97,27 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void timer1_Tick(object sender, EventArgs e)
         {
-            if(_game.win == true)
+            if (_game.win == true)
             {
                 switch (level)
                 {
                     case ("easy"):
-                        SaveSystem.CurrentSave.mineSweepE = _game.Time;
+                        if (SaveSystem.CurrentSave.mineSweepE > _game.Time)
+                        {
+                            SaveSystem.CurrentSave.mineSweepE = _game.Time;
+                        }
                         break;
                     case ("medium"):
-                        SaveSystem.CurrentSave.mineSweepI = _game.Time;
+                        if (SaveSystem.CurrentSave.mineSweepI > _game.Time)
+                        {
+                            SaveSystem.CurrentSave.mineSweepI = _game.Time;
+                        }
                         break;
                     case ("hard"):
-                        SaveSystem.CurrentSave.mineSweepH = _game.Time;
+                        if (SaveSystem.CurrentSave.mineSweepH > _game.Time)
+                        {
+                            SaveSystem.CurrentSave.mineSweepH = _game.Time;
+                        }
                         break;
 
                 }
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs
index d69258f..fb32fc2 100644
--- a/TimeHACK.Main/Properties/Resources.Designer.cs
+++ b/TimeHACK.Main/Properties/Resources.Designer.cs
@@ -348,6 +348,16 @@ namespace TimeHACK.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
+        internal static byte[] Lemon_s_LCD {
+            get {
+                object obj = ResourceManager.GetObject("Lemon_s_LCD", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] LeviWindows {
             get {
                 object obj = ResourceManager.GetObject("LeviWindows", resourceCulture);
@@ -366,6 +376,16 @@ namespace TimeHACK.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MinesweepNumBox {
+            get {
+                object obj = ResourceManager.GetObject("MinesweepNumBox", 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 modem_dial {
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index d40c04e..7163ace 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -705,4 +705,10 @@
   <data name="WinClassicRegedit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WinClassic\WinClassicRegedit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="MinesweepNumBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MinesweepNumBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Lemon_s_LCD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\lemon's lcd.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TimeHACK.Main/Resources/MinesweepNumBox.png b/TimeHACK.Main/Resources/MinesweepNumBox.png
new file mode 100644
index 0000000..fb1f330
--- /dev/null
+++ b/TimeHACK.Main/Resources/MinesweepNumBox.png
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 585d87f..75777d5 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -471,6 +471,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="Resources\Lemon%27s LCD.ttf" />
     <None Include="Resources\windows_command_prompt.ttf" />
   </ItemGroup>
   <ItemGroup>
@@ -526,6 +527,7 @@
     <None Include="Resources\minsweeper sad.PNG" />
     <None Include="Resources\minsweeper smile.PNG" />
     <None Include="Resources\minesweepeprlogo.PNG" />
+    <None Include="Resources\MinesweepNumBox.png" />
     <Content Include="Resources\modem_dial.wav" />
     <None Include="Resources\MS-DOS-logo-1.png" />
     <None Include="Resources\msdosprompt.png" />
diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs
index 90cd0af..4523478 100644
--- a/TimeHACK.Main/TitleScreen.cs
+++ b/TimeHACK.Main/TitleScreen.cs
@@ -134,8 +134,10 @@ namespace TimeHACK
             // Initialize Font
             File.WriteAllBytes(DataDirectory + "\\LeviWindows.ttf", Resources.LeviWindows);
             File.WriteAllBytes(DataDirectory + "\\windows_command_prompt.ttf", Resources.windows_command_prompt);
+            File.WriteAllBytes(DataDirectory + "\\lemon-lcd.ttf", Resources.Lemon_s_LCD);
             pfc.AddFontFile(DataDirectory + "\\LeviWindows.ttf");
             pfc.AddFontFile(DataDirectory + "\\windows_command_prompt.ttf");
+            pfc.AddFontFile(DataDirectory + "\\lemon-lcd.ttf");
             gameversion.Font = new Font(pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, (0));
             ProgramsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             DocumentsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));