Changeset 5443 for 2014

Timestamp:

2014-07-04 12:16:29 (8 years ago)

Author:

mijoilmo

Message:

 

Location:

2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor

Files:

• Player.cs (modified) (1 diff)
• Protokolla236TrueSurvivor.cs (modified) (4 diffs)
• bin/x86/Debug/Protokolla236TrueSurvivor.exe (modified) (previous)
• bin/x86/Debug/Protokolla236TrueSurvivor.pdb (modified) (previous)
• obj/x86/Debug/Protokolla236TrueSurvivor.exe (modified) (previous)
• obj/x86/Debug/Protokolla236TrueSurvivor.pdb (modified) (previous)

2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Player.cs

@@ -135 +135 @@
                     double deltaX = kvpair.Value.X - this.X;
                     double deltaY = this.Y - kvpair.Value.Y;
-                    Angle approachAngle;
-                    if (deltaX != 0)
-                    {
-                        approachAngle = Angle.ArcTan(deltaY / deltaX);
-                    }
-                    else
-                    {
-                        approachAngle = Angle.RightAngle;
-                    }
-
-                    if (this.X < kvpair.Value.X)
-                    {
-                        approachAngle += Angle.StraightAngle;
-                    }
-                    else if (this.Y > kvpair.Value.Y)
-                    {
-                        approachAngle += Angle.FullAngle;
-                    }
+                    Angle approachAngle = (kvpair.Value.Position - this.Position).Angle;
                     parent.LoadLevel(kvpair.Key, approachAngle);
                     this.parent.MessageDisplay.Add(approachAngle.GetPositiveDegrees().ToString());

2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs

@@ -55 +55 @@
         images["grass1"] = LoadImage("graphics/tiles/tilenurmi");
         images["soil1"] = LoadImage("graphics/tiles/tilemulta");
+        images["wood1"] = LoadImage("graphics/tiles/tilepuu");
 
         imageLists["player_thruster"] = LoadImages("graphics/effects/thrusters/thruster0.1", "graphics/effects/thrusters/thruster0.2");
@@ -89 +90 @@
             galaxy.CurrentPlanet = galaxy.Planets[level.Id];//aseta galaksiin tiedot nykyisestä planeetasta
             player.Y = Level.Top - Screen.Height;
-            Camera.Zoom(0.5);
+            Camera.Zoom(0.8);
             MediaPlayer.Stop();
             MediaPlayer.Play(galaxy.Planets[level.Id].Music);
-            //player.x on jotain
+            player.X = (planetAngle.Degrees / Angle.FullAngle.Degrees) * Level.Width - Level.Width / 2;
         }
         else
@@ -100 +101 @@
             Gravity = new Vector(0, 0);
             player.LinearDamping = 1;//avaruudessa ei ilmanvastusta
-            Camera.Zoom(0.8);
+            Camera.Zoom(0.6);
             if (galaxy.CurrentPlanet != null)//current planet voi olla null jos pelaaja ei vielä ole käynyt millään planeetalla.
             {
@@ -150 +151 @@
         Dictionary<String, String> convert = new Dictionary<String, String>();
         convert.Add("000000", "grass1");
+        convert.Add("00ffff", "wood1");
         ColorTileMap tileMap = ColorTileMap.FromLevelAsset(level.TileMapSrc);
         tileMap.SetTileMethod(Color.FromHexCode("000000"), createTile, convert["000000"], false);
-        //tileMap.SetTileMethod(Color.FromHexCode("0000ff"), createTile, convert["0000ff"], true);
+        tileMap.SetTileMethod(Color.FromHexCode("00ffff"), createTile, convert["00ffff"], true);
         tileMap.SetTileMethod(Color.FromHexCode("ff0000"), spawnPlayer);
         tileMap.SetTileMethod(Color.FromHexCode("00ff00"), spawnEnemy);