Small, crappy changes.

Palid · Nov 3, 2015 · 4b67f64 · 4b67f64
1 parent 8afc6c8
commit 4b67f64
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/WindowsFormsApplication2/Game.cs b/WindowsFormsApplication2/Game.cs
@@ -41,7 +41,7 @@ public class Game
         readonly bool DEBUG = true;
 
 
-        int currentLevel = 1;
+        public int currentLevel = 1;
 
         int redPos = 0;
         int bluePos = 1;
@@ -65,7 +65,7 @@ public Game(System.Drawing.Color keysColor)
 
         private void init()
         {
-            keyboardAnimationTimer.Interval = 20;
+            keyboardAnimationTimer.Interval = 40;
             keyboardAnimationTimer.Elapsed += animationFrame;
             failAnimationTimer.Interval = 125;
             failAnimationTimer.Elapsed += failAnimationFrame;
@@ -294,7 +294,7 @@ public void startNextLevel()
             {
                 if (keyboardAnimationTimer.Interval >= 6)
                 {
-                    keyboardAnimationTimer.Interval -= 5;
+                    keyboardAnimationTimer.Interval -= 2.5;
                 }
                 hasFinishedLevel = false;
                 simonSaysKeys.Add(getRandomKey());

diff --git a/WindowsFormsApplication2/Properties/AssemblyInfo.cs b/WindowsFormsApplication2/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SimonSays")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("Chroma SimonSays")]
+[assembly: AssemblyDescription("Razer Blackwidow Chroma SimonSays game")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SimonSays")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/WindowsFormsApplication2/SimonSays.csproj b/WindowsFormsApplication2/SimonSays.csproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{009B267A-616B-4AB9-91AC-4921139D60EC}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SimonSays</RootNamespace>
     <AssemblyName>SimonSays</AssemblyName>

diff --git a/WindowsFormsApplication2/StartForm.Designer.cs b/WindowsFormsApplication2/StartForm.Designer.cs
diff --git a/WindowsFormsApplication2/StartForm.cs b/WindowsFormsApplication2/StartForm.cs
@@ -72,13 +72,16 @@ private void startGame_Click(object sender, EventArgs e)
                 {
                     _interceptor.StopCapturing();
                     _interceptor.StartCapturing();
+                    highestLevelLabel.Text = "Your highest level is: " + game.currentLevel.ToString();
                     game.destroy();
                     game = new Game(selectedColor);
                     game.start();
                 }
                 else
                 {
+                    highestLevelLabel.Text = "Your highest level is: " + game.currentLevel.ToString();
                     game.destroy();
+                    _interceptor.StopCapturing();
                     _interceptor.StartCapturing();
                     game.start();
                 }
@@ -93,6 +96,7 @@ private void startGame_Click(object sender, EventArgs e)
 
         private void restartGame_Click(object sender, EventArgs e)
         {
+            highestLevelLabel.Text = "Your highest level is: " + game.currentLevel.ToString();
             game.destroy();
             _interceptor.StopCapturing();
             _interceptor.StartCapturing();
@@ -111,5 +115,6 @@ private void showFailButton_Click(object sender, EventArgs e)
             game = new Game(Corale.Colore.Core.Color.Pink);
             game.showFailure();
         }
+
     }
 }