Changeset 6711 for 2015

Timestamp:

2015-07-01 22:47:21 (8 years ago)

Author:

sieerinn

Message:

Hienot kenttäsiirtymät otettu pois :(

File:

• 2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel.cs (modified) (5 diffs)

2015/27/ohjaajat/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel/TheLegendOfGabriel.cs

@@ -76 +76 @@
     List<StoryItem> storyItems = new List<StoryItem>();
 
+    private bool canUseExit = true;
+
     public IntMeter BossHealth;
-    private List<Vector> bossSpawnPositions = new List<Vector>(); 
+    private List<Vector> bossSpawnPositions = new List<Vector>();
 
     private CycleSlot currentItem; // Laatikossa näkyvä nykyinen kama.
@@ -325 +327 @@
         //CreatePlayer(new Vector(-Level.Width/3, Level.Bottom + TILE_SIZE * 2));
         SetControls();
-        //Camera.ZoomToLevel();
+        
         Camera.Follow(player);
         Camera.ZoomFactor = 2.0;
@@ -472 +474 @@
     {
         var oldExit = pExit as Exit;
+        if (oldExit == null || oldExit.TargetLevel == null || pExit.IsDestroying || pExit.IsDestroyed)
+            return;
+
+        enemies.Clear();
+        ClearAll();
+
+        CreateLevel(oldExit.TargetLevel);
+        var targetExit = exits.FirstOrDefault(e => e.Name == oldExit.TargetExitName);
+        
+        BuildUI();
+        SetControls();
+        player.Position = targetExit.Position + Direction.Inverse(targetExit.Position.Angle.MainDirection).GetVector() * TILE_SIZE * 2;
+        Add(player);
+    }
+
+    /*
+    void CollidesWithExitFail(PhysicsObject pPlayer, PhysicsObject pExit)
+    {
+        if (!canUseExit)
+            return;
+
+        canUseExit = false;
+        Timer.SingleShot(6, () => canUseExit = true);
+
+        var oldExit = pExit as Exit;
         if (oldExit == null || transition || oldExit.TargetLevel == null || pExit.IsDestroying || pExit.IsDestroyed)
             return;
@@ -514 +541 @@
 
             // Yritetään päätellä pelaajalle joku järkevä paikka.
-            player.Position = targetExit.Position + Direction.Inverse(targetExit.Position.Angle.MainDirection).GetVector() * TILE_SIZE * 2;
+            player.Position = targetExit.Position + Direction.Inverse(targetExit.Position.Angle.MainDirection).GetVector() * TILE_SIZE * 4;
             
-            Camera.Follow(player);
-            Camera.ZoomFactor = 2.0;
+            //Camera.Follow(player);
+            //Camera.ZoomFactor = 2.0;
             return;
         }
@@ -545 +572 @@
             obj.Position += transitionVector;
         }
-        player.Position += transitionVector + Direction.Inverse(dir).GetVector() * TILE_SIZE * 4;
+        //player.Position += transitionVector + Direction.Inverse(dir).GetVector() * TILE_SIZE * 4;
+        player.Position = targetExit.Position + Direction.Inverse(targetExit.Position.Angle.MainDirection).GetVector() * TILE_SIZE * 2;
 
         // Zoomataan kameraa sopivasti ja liikutetaan se vanhan kentän päälle, josta se sitten siirtyy uuden kentän päälle.
         Camera.Position += transitionVector;
         Vector pos = Camera.Position;
-        Camera.Follow(player);
-        Camera.ZoomFactor = 2.0;
+        //Camera.Follow(player);
+        //Camera.ZoomFactor = 2.0;
         Camera.Position = pos;
     }
+     */
 
     /// <summary>