Changeset 6278 for 2015

Timestamp:

2015-06-24 16:13:00 (4 years ago)

Author:

empaheik

Message:

Ei pitäisi enää kaatua kuolemassa (laitan sormet ristiin).

File:

• 2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun.cs (modified) (7 diffs)

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun.cs

@@ -103 +103 @@
     public override void Begin()
     {
-        IntroSequence();
+        //IntroSequence();
         //MainMenu();
-        //StartGame();
+        StartGame();
     }
 
@@ -231 +231 @@
         CreateLevel();
         ScreenSettings();
-
-        // Taustatestailua.
-        GameObject forestBackground = new GameObject(Level.Width, Level.Height);
-        forestBackground.Image = forestBackgroundImage;
-        forestBackground.TextureWrapSize = new Vector(5, 1);
-        Add(forestBackground, -3);
-        Layers[-3].RelativeTransition = new Vector(0.5, 1.0);
-        Level.Background.CreateGradient(Color.Black, Color.SkyBlue);
-
-        // Testailen tässä kärryn luomista.
-        //double size = 0.7;
-        //PhysicsObject cart = new PhysicsObject(400 * size, 80 * size);
-        //cart.X = -1600;
-        //cart.Y = 200;
-        //cart.Image = cartImage;
-        //cart.CollisionIgnoreGroup = 2;
-        //Add(cart);
-        //PhysicsObject cartWheel = new PhysicsObject(160 * size, 160 * size, Shape.Circle);
-        //cartWheel.Image = cartWheelImage;
-        //cartWheel.Position = cart.Position + new Vector(-110, -30) * size;
-        //cartWheel.CollisionIgnoreGroup = 2;
-        //Add(cartWheel);
-        //AxleJoint joint = new AxleJoint(cart, cartWheel);
-        //Add(joint);
     }
 
@@ -291 +267 @@
     void CreateLevel()
     {
+        //Background
+        GameObject forestBackground = new GameObject(Level.Width, Level.Height);
+        forestBackground.Image = forestBackgroundImage;
+        forestBackground.TextureWrapSize = new Vector(5, 1);
+        Add(forestBackground, -3);
+        Layers[-3].RelativeTransition = new Vector(0.5, 1.0);
+        Level.Background.CreateGradient(Color.Black, Color.SkyBlue);
+
         Gravity = new Vector(0, -1000);
 
+        //Tilemap
         ColorTileMap level = ColorTileMap.FromLevelAsset("level" + levelNumber);
         level.SetTileMethod(Color.Black, CreateGroundTop);
@@ -312 +297 @@
         level.Execute(TILE_SIZE, TILE_SIZE);
 
-
-        //TileMap level = TileMap.FromLevelAsset("level" + levelNumber);
-        //level.SetTileMethod('P', CreatePlayer);
-        //level.SetTileMethod('#', CreateGroundTop);
-        //level.SetTileMethod('%', CreateGround);
-        //level.Optimize('#', '%');
-        //level.Execute(TILE_SIZE, TILE_SIZE);
-        //Level.CreateBorders(true);
-
         SetControls();
     }
@@ -352 +328 @@
     {
         // Säädin vähän tätä jotta laatikko näkyy hyvin. Pitää ehkä tehdä laatikolle ihan oma metodi.
-
         PhysicsObject block = PhysicsObject.CreateStaticObject(width, height);
         block.IsVisible = false;
@@ -502 +477 @@
                 Loss();
             }
-            players.Remove(player); player.Destroy();
+            else { players.Remove(player); player.Destroy(); }
         };
 
@@ -551 +526 @@
         Keyboard.Listen(Key.A, ButtonState.Down, delegate { startingPlayers[0].Walk(-PLAYER_SPEED); }, "Player 1 moves left");
         Keyboard.Listen(Key.D, ButtonState.Down, delegate { startingPlayers[0].Walk(PLAYER_SPEED); }, "Player 1 moves right");
-        Keyboard.Listen(Key.W, ButtonState.Down, delegate { startingPlayers[0].Jump(1000); }, "Player 1 jumps");
+        Keyboard.Listen(Key.W, ButtonState.Down, delegate { startingPlayers[0].Jump(PLAYER_SPEED); }, "Player 1 jumps");
 
         Keyboard.Listen(Key.Left, ButtonState.Down, delegate { startingPlayers[1].Walk(-PLAYER_SPEED); }, "Player 2 moves left");
         Keyboard.Listen(Key.Right, ButtonState.Down, delegate { startingPlayers[1].Walk(PLAYER_SPEED); }, "Player 2 moves right");
-        Keyboard.Listen(Key.Up, ButtonState.Down, delegate { startingPlayers[1].Jump(1000); }, "Player 2 jumps");
+        Keyboard.Listen(Key.Up, ButtonState.Down, delegate { startingPlayers[1].Jump(PLAYER_SPEED); }, "Player 2 jumps");
 
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Show help");