Changeset 7210 for 2016

Timestamp:

2016-06-08 15:05:22 (7 years ago)

Author:

sieerinn

Message:

Kentän alareunaa aloitettu

Location:

2016/23/ohjaajat/Punasininen/Punasininen

Files:

• Punasininen/Player.cs (modified) (1 diff)
• Punasininen/Punasininen.cs (modified) (7 diffs)
• PunasininenContent/dungeon1.png (modified) (previous)

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

@@ -11 +11 @@
     public Weapon Secondary;
 
+    public Vector Spawn;
+
     public Player(double leveys, double korkeus, Image pic, Color color)
         : base(leveys, korkeus)

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

@@ -26 +26 @@
     private Image redpic;
 
+    Color blueColor = Color.FromHexCode("FF1D65CF");
+    Color redColor = Color.FromHexCode("FABE1A");
+
     private Image bluePistolpic = LoadImage("bluegun");
     private Image orangePistolpic = LoadImage("orangegun");
@@ -60 +63 @@
         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, Color.Blue);});
+        map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate(Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, bluepic, blueColor);});
         map.SetTileMethod(Color.FromHexCode("FFD800"), CreateWeaponCrate);
-        map.SetTileMethod(Color.Red, delegate(Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redpic, Color.Red); });
+        map.SetTileMethod(Color.Red, delegate(Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redpic, redColor); });
         map.Execute(TILE_SIZE, TILE_SIZE);
 
-        Camera.ZoomToAllObjects();
+        Surface bottom = Surface.CreateBottom(Level);
+        bottom.Width *= 2;
+        bottom.Y -= Level.Height / 2;
+        bottom.Tag = "death";
+        Add(bottom);
+
+        Camera.ZoomToLevel();
 
         Level.Background.Color = Color.Black;
@@ -100 +109 @@
         player.AnimIdle = new Animation(new[] { blueWalkImages[0] });
         player.Position = paikka;
+        player.Spawn = paikka;
         Add(player);
 
@@ -122 +132 @@
             b.Destroy();
         });
+        AddCollisionHandler(player, "death", delegate(PhysicsObject a, PhysicsObject b)
+        {
+            Restore((Player)a);
+        });
 
         return player;
     }
 
+    void Restore(Player temp)
+    {
+        temp.Position = temp.Spawn;
+    }
+
     void BulletHitsSomething(PhysicsObject bullet, PhysicsObject target)
     {
@@ -131 +150 @@
         {
             // TODO bullet must know its owner
-            if (bullet.Color == Color.Blue)
+            if (bullet.Color == blueColor)
             {
                 ColorTile(blue, target);
             }
-            else if (bullet.Color == Color.Red)
+            else if (bullet.Color == redColor)
             {
                 ColorTile(red, target);
@@ -166 +185 @@
     void ColorTile(PhysicsObject player, PhysicsObject platform)
     {
-        var imgs = player.Color == Color.Blue? blueTileImages : orangeTileImages;
-        var glowImg = player.Color == Color.Blue ? blueGlow : orangeGlow;
+        var imgs = player.Color == blueColor? blueTileImages : orangeTileImages;
+        var glowImg = player.Color == blueColor ? blueGlow : orangeGlow;
         ((Tile)platform).SetColor(imgs, glowImg, player.Color);
 
@@ -209 +228 @@
             if (bullet != null)
             {
+                bullet.Image = null;
                 bullet.Color = player.Color;  
             }