Changeset 7212 for 2016

Timestamp:

2016-06-09 09:18:14 (7 years ago)

Author:

sieerinn

Message:

Pelaaja muutettu PlatformCharacteriksi? ja aikalaskuri lisätty

Location:

2016/23/ohjaajat/Punasininen/Punasininen/Punasininen

Files:

• Player.cs (modified) (2 diffs)
• Punasininen.cs (modified) (11 diffs)
• Tile.cs (modified) (2 diffs)

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

@@ -7 +7 @@
 using Jypeli.Widgets;
 
-public class Player : PlatformCharacter2
+public class Player : PlatformCharacter
 {
     public Weapon Secondary;
@@ -20 +20 @@
 
         Tag = "player";
-        Acceleration = 1500;
+        //Acceleration = 1500;
     }
 }

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

@@ -12 +12 @@
     private const double SPEED = 450;
     private const double JUMPSPEED = 1250;
-    private const int TILE_SIZE = 40;
+    private const int TILE_SIZE = 60;
 
     private Player blue;
@@ -29 +29 @@
     private Image orangePistolpic = LoadImage("orangegun");
 
+    DoubleMeter matchTimer; // Remaining time in seconds.
     DoubleMeter percentageTracker;
 
@@ -46 +47 @@
         for (int i = 1; i <= numberOfImages; i++)
         {
-            images[i-1] = LoadImage(string.Format("{0}{1:0000}", prefix, i));
+            images[i - 1] = LoadImage(string.Format("{0}{1:0000}", prefix, i));
         }
         return images;
@@ -57 +58 @@
         ColorTileMap map = ColorTileMap.FromLevelAsset("dungeon1");
         map.SetTileMethod(Color.Black, AddPlatform);
+        //map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate (Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, bluepic, blueColor); });
+        //map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate(Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, bluepic, blueColor);});
         map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate(Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, blueColor, blueWalkImages, bluePistolpic);});
+
         map.SetTileMethod(Color.FromHexCode("FFD800"), CreateWeaponCrate);
+
+        //map.SetTileMethod(Color.Red, delegate (Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redpic, redColor); });
+        //map.SetTileMethod(Color.Red, delegate(Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redpic, redColor); });
         map.SetTileMethod(Color.Red, delegate(Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redColor, orangeWalkImages, orangePistolpic); });
         map.Execute(TILE_SIZE, TILE_SIZE);
@@ -79 +86 @@
         percentageBar.BindTo(percentageTracker);
         Add(percentageBar);
+
+        matchTimer = new DoubleMeter(30);
+
+        var timeLabel = new Label();
+        timeLabel.Y = Window.Height / 2 - 100;
+        timeLabel.BindTo(matchTimer);
+        timeLabel.TextColor = blueColor;
+        timeLabel.DoubleFormatString = "{0}";
+        timeLabel.TextScale *= 3;
+        Add(timeLabel);
+
+        var timer = new Timer();
+        timer.Interval = 1;
+        timer.Timeout += () =>
+        {
+            matchTimer.Value -= 1;
+            timeLabel.TextColor = matchTimer.Value % 2 == 0 ? blueColor : redColor;
+        };
+        timer.Start();
+
     }
 
@@ -117 +144 @@
         };
 
-        AddCollisionHandler(player, "platform", delegate(PhysicsObject a, PhysicsObject b)
+        AddCollisionHandler(player, "platform", delegate (PhysicsObject a, PhysicsObject b)
         {
             ColorTile(a, b);
         });
-        AddCollisionHandler(player, "crate", delegate(PhysicsObject a, PhysicsObject b)
+        AddCollisionHandler(player, "crate", delegate (PhysicsObject a, PhysicsObject b)
         {
             GunLottery(player);
             b.Destroy();
         });
-        AddCollisionHandler(player, "death", delegate(PhysicsObject a, PhysicsObject b)
+        AddCollisionHandler(player, "death", delegate (PhysicsObject a, PhysicsObject b)
         {
             Restore((Player)a);
@@ -163 +190 @@
     void Win(Player player)
     {
-       Pause();
+        Pause();
         //Haluaisin tehdä tähän jonkinlaisen hauskan ponnahdusefektin jossain vaiheessa. Sellaisen napakan zoomin ja sitten boing. Hurdur.
-       Camera.ZoomTo(player.Left, player.Bottom, player.Right, player.Top + 100);
+        Camera.ZoomTo(player.Left, player.Bottom, player.Right, player.Top + 100);
 
         Label announcement = new Label("Kiva homma hei")
@@ -174 +201 @@
         };
         Add(announcement);
-       
+
     }
 
     public void ColorTile(PhysicsObject player, PhysicsObject platform)
     {
-        var imgs = player.Color == blueColor? blueTileImages : orangeTileImages;
+        var imgs = player.Color == blueColor ? blueTileImages : orangeTileImages;
         var glowImg = player.Color == blueColor ? blueGlow : orangeGlow;
-        ((Tile)platform).SetColor(imgs, glowImg, player.Color);
-
+
+        ((Tile)platform).SetColor(imgs, glowImg, player.Color, UpdatePercentage);
+    }
+
+    void UpdatePercentage()
+    {
         List<GameObject> colored = GetObjects(o => (o.Color == red.Color || o.Color == blue.Color) && (String)o.Tag == "platform");
-        percentageTracker.Value = (double)colored.FindAll(o => o.Color == red.Color).Count/colored.Count * 100;
+        percentageTracker.Value = (double)colored.FindAll(o => o.Color == red.Color).Count / colored.Count * 100;
     }
 
@@ -199 +230 @@
         ControllerTwo.ListenAnalog(AnalogControl.LeftStick, 0.1, Move, "Liikuta pelaajaa", blue);
         ControllerTwo.Listen(Button.A, ButtonState.Pressed, Jump, "Pelaaja hyppää", blue, JUMPSPEED);
-        ControllerOne.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, null, blue);
+        ControllerTwo.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, null, blue);
         ControllerTwo.ListenAnalog(AnalogControl.RightTrigger, 0.1, Shoot, "", blue);
         ControllerTwo.ListenAnalog(AnalogControl.LeftTrigger, 0.1, Shoot, "", blue);
@@ -212 +243 @@
     {
         if (stick.StateVector.Magnitude > 0.15)
-            player.Walk(stick.StateVector.X > 0 ? Direction.Right : Direction.Left);
+        {
+            //player.Walk(stick.StateVector.X > 0 ? Direction.Right : Direction.Left);
+            player.Walk(stick.StateVector.X * 300);
+        }
+
     }
 
@@ -223 +258 @@
             {
                 bullet.Image = null;
-                bullet.Color = player.Color;  
+                bullet.Color = player.Color;
             }
         }

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

@@ -19 +19 @@
     }
 
-    public void SetColor(Image[] animation, Image glowImage, Color newColor)
+    public void SetColor(Image[] animation, Image glowImage, Color newColor, Action colorChanged)
     {
         var overlay = new GameObject(Width, Height);
@@ -29 +29 @@
             this.Color = newColor;
             overlay.Destroy();
+
+            if (colorChanged != null)
+            {
+                colorChanged();
+            }
         };
         overlay.Animation.Start();