Changeset 7214 for 2016

Timestamp:

2016-06-09 13:06:11 (7 years ago)

Author:

sieerinn

Message:

Kaikenlaista pientä säätöä ja siistimistä

File:

• 2016/23/ohjaajat/Punasininen/Punasininen/Punasininen/Punasininen.cs (modified) (7 diffs)

2016/23/ohjaajat/Punasininen/Punasininen/Punasininen/Punasininen.cs

@@ -13 +13 @@
     private const double JUMPSPEED = 1250;
     private const int TILE_SIZE = 60;
-    private const int MATCH_LENGTH = 30;
+    private const int MATCH_LENGTH = 3;
 
     private Player blue;
@@ -95 +95 @@
         };
 
-        Func<double, double, Color, Label> createLabel;
-        createLabel = (double x, double y, Color color) =>
+        Func<double, double, Color, Label> createLabel = (double x, double y, Color color) =>
         {
             var label = new Label();
@@ -176 +175 @@
     }
 
-    void Restore(Player temp)
-    {
-        temp.Position = temp.Spawn;
+    void Restore(Player player)
+    {
+        player.Position = player.Spawn;
     }
 
@@ -203 +202 @@
     }
 
-    void Win(Player player)
+    void Win(Player winner)
     {
         Pause();
@@ -209 +208 @@
         // Haluaisin tehdä tähän jonkinlaisen hauskan ponnahdusefektin jossain vaiheessa. Sellaisen napakan zoomin ja sitten boing. Hurdur.
         
+        string victoryText = "Kiva homma hei";
+
         // Tekstille musta tausta, jotta sen näkee lukea.
-        Label announcementDark = new Label("Kiva homma hei")
-        {
-            Font = largeFont,  // Vaihtoehtona smallFont myös
-            TextColor = Color.Black
-        };
+        var announcementDark = new Label(victoryText) { Font = largeFont, TextColor = Color.Black };
         Add(announcementDark);
 
         // Voittoteksti.
-        Label announcement = new Label("Kiva homma hei")
-        {
-            Font = largeFont,  // Vaihtoehtona smallFont myös
-            TextColor = player.Color
-        };
+        var announcement = new Label(victoryText) { Font = largeFont, TextColor = winner.Color };
         Add(announcement);
 
-
+        // Zoomaa voittajaan.
         double targetZoomFactor = 1.5;
         var zoomTimer = new Timer();
@@ -231 +224 @@
         zoomTimer.Timeout += () =>
         {
-            var targetPos = player.Position;
-            Camera.Position += (targetPos - Camera.Position) * 0.02;
+            Camera.Position += (winner.Position - Camera.Position) * 0.02;
             Camera.ZoomFactor += (targetZoomFactor - Camera.ZoomFactor) * 0.01;
-            announcement.Position = Camera.WorldToScreen(player.Position + new Vector(0, 80));
+            announcement.Position = Camera.WorldToScreen(winner.Position + new Vector(0, 80));
             announcementDark.Position = announcement.Position + new Vector(5, -5);
         };
         zoomTimer.IgnorePause = true;
         zoomTimer.Start();
-
-
     }
 
@@ -269 +259 @@
         ControllerTwo.ListenAnalog(AnalogControl.LeftStick, 0.1, Move, "Liikuta pelaajaa", blue);
         ControllerTwo.Listen(Button.A, ButtonState.Pressed, Jump, "Pelaaja hyppää", blue, JUMPSPEED);
-        ControllerTwo.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, null, blue);
+        ControllerTwo.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, "Tähtää", blue);
         ControllerTwo.ListenAnalog(AnalogControl.RightTrigger, 0.1, Shoot, "", blue);
         ControllerTwo.ListenAnalog(AnalogControl.LeftTrigger, 0.1, Shoot, "", blue);