Changeset 8467 for 2017/23/JaakkoS/Makkarajono

Timestamp:

2017-06-09 11:08:53 (2 years ago)

Author:

nupeohje

Message:

 

Location:

2017/23/JaakkoS/Makkarajono/Makkarajono/Makkarajono

Files:

• Makkarajono.cs (modified) (8 diffs)
• bin/x86/Debug/Makkarajono.exe (modified) (previous)
• bin/x86/Debug/Makkarajono.pdb (modified) (previous)
• obj/x86/Debug/Makkarajono.exe (modified) (previous)
• obj/x86/Debug/Makkarajono.pdb (modified) (previous)

2017/23/JaakkoS/Makkarajono/Makkarajono/Makkarajono/Makkarajono.cs

@@ -17 +17 @@
     }
 
+    MessageWindow winScreen;
     Label timeScreenP;
     Timer timeTimer;
+    Timer colorTimer;
     IntMeter p1Points;
     IntMeter p2Points;
@@ -69 +71 @@
     {
         ClearAll();
-
+        IsFullScreen = false;
         StartMenu = new MultiSelectWindow("Welcome!", "Start", "Exit");
         StartMenu.AddItemHandler(0, AskNames, false);
@@ -461 +463 @@
     void AddPlayerNames(string _name, double x, double y, bool isIcon2)
     {
-        Label nameField = new Label(_name.Length * 13, 30, _name);
+        Label nameField = new Label(_name.Length * 14, 30, _name);
         nameField.X = x;
         nameField.Y = y;
@@ -547 +549 @@
             _player.PlayAnimation(p1Punch, () =>
                 {
-                    _player.Stop();
-                    Timer.SingleShot(0.5, delegate { isAttacking = false; });
+                    _player.StopHorizontal();
+                    Timer.SingleShot(0.3, delegate { isAttacking = false; });
                 });
         }
@@ -564 +566 @@
     void AddTimeCounter()
     {
-        timeCounterSeconds = new IntMeter(60);
+        timeCounterSeconds = new IntMeter(30);
         timeCounterMinutes = new IntMeter(1);
 
@@ -578 +580 @@
         timeScreenP.X = Screen.Center.X;
         timeScreenP.Y = Screen.Top - 20;
+        timeScreenP.Font = Font.DefaultLargeBold;
         Add(timeScreenP, 3);
     }
@@ -584 +587 @@
     {
         timeCounterSeconds.Value -= 1;
-        if(timeCounterSeconds >= 10)
-        timeScreenP.Text = timeCounterMinutes + ":" + timeCounterSeconds;
-
-        else
+        if (timeCounterSeconds.Value >= 10)
+            timeScreenP.Text = timeCounterMinutes + ":" + timeCounterSeconds;
+
+        else
+        {
             timeScreenP.Text = timeCounterMinutes + ":0" + timeCounterSeconds;
-
-        if (timeCounterSeconds.Value <= 0 && timeCounterMinutes > 0)
+        }
+
+        if (timeCounterSeconds.Value <= 0 && timeCounterMinutes.Value > 0)
         {
             timeCounterMinutes.Value -= 1;
             timeCounterSeconds.Value += 60;
         }
-        if (timeCounterSeconds.Value <= 0 && timeCounterMinutes == 0)
-        {
+            colorTimer = new Timer();
+            colorTimer.Interval = 0.05;
+            colorTimer.Timeout += delegate
+            {
+                if (timeCounterSeconds <= 10 && timeCounterMinutes == 0) { 
+                Color _randomColor = RandomColor();
+                timeScreenP.TextColor = _randomColor;
+                }
+                else
+                {
+                    timeScreenP.TextColor = Color.White;
+                }
+            };
+            colorTimer.Start();
+
+        if (timeCounterSeconds.Value <= 0 && timeCounterMinutes.Value == 0)
+        {
+            colorTimer.Stop();
+            timeScreenP.TextColor = Color.White;
             WinScreen();
         }
@@ -606 +628 @@
         if(p1Points > p2Points)
         {
-            MessageWindow winScreen = new MessageWindow(p1name + " won!");
-            winScreen.Closed += delegate { Begin(); };
+            Pause();
+            if(p1name == "")
+                winScreen = new MessageWindow("Blue player won!");
+            else
+                winScreen = new MessageWindow(p1name + " won!");
+            winScreen.Closed += delegate { Begin(); Pause(); };
             Add(winScreen);
         }
-        else
-        {
-            MessageWindow winScreen = new MessageWindow(p2name + " won!");
-            winScreen.Closed += delegate { Begin(); };
+        else if (p2Points > p1Points)
+        {
+            Pause();
+            if(p2name == "")
+                winScreen = new MessageWindow("Green player won!");
+            else
+                winScreen = new MessageWindow(p2name + " won!");
+            winScreen.Closed += delegate { Begin(); Pause(); };
             Add(winScreen);
         }
+        else
+        {
+            Pause();
+             winScreen = new MessageWindow( "Draw!");
+            winScreen.Closed += delegate { Begin(); Pause(); };
+            Add(winScreen);
+            
+        }
+    }
+
+    Color RandomColor()
+    {
+        byte[] buffer = new byte[3];
+        new Random(DateTime.Now.Millisecond * 100000 + DateTime.Now.Second * 10000 + DateTime.Now.Minute * 100000).NextBytes(buffer);
+        return new Color(buffer[0], buffer[1], buffer[2]);
     }