Changeset 6218 for 2015

Timestamp:

2015-06-23 23:27:22 (4 years ago)

Author:

sieerinn

Message:

Putoamis- ja hyppyanimaatio.

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (21 diffs)
• HillbillyRunContent/HillbillyRunContent.contentproj (modified) (1 diff)
• HillbillyRunContent/fall (added)
• HillbillyRunContent/fall.anim (added)
• HillbillyRunContent/fall/fall0001.png (added)
• HillbillyRunContent/fall/fall0002.png (added)
• HillbillyRunContent/fall/fall0003.png (added)
• HillbillyRunContent/fall/fall0004.png (added)
• HillbillyRunContent/fall/fall0005.png (added)
• HillbillyRunContent/fall/fall0006.png (added)
• HillbillyRunContent/fall/fall0007.png (added)
• HillbillyRunContent/jump (added)
• HillbillyRunContent/jump.anim (added)
• HillbillyRunContent/jump/jump0001.png (added)
• HillbillyRunContent/jump/jump0002.png (added)
• HillbillyRunContent/jump/jump0003.png (added)
• HillbillyRunContent/jump/jump0004.png (added)
• HillbillyRunContent/jump/jump0005.png (added)
• HillbillyRunContent/jump/jump0006.png (added)

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

@@ -29 +29 @@
 {
     private IntMeter lifeCounter = new IntMeter(2, 0, 2);
-    public IntMeter Life 
+    public IntMeter Life
     {
         set { lifeCounter = value; }
-        get { return lifeCounter; } 
+        get { return lifeCounter; }
     }
 
@@ -40 +40 @@
         : base(leveys, korkeus)
     {
-        
+
     }
 }
@@ -55 +55 @@
     //private List<double> playerPositionsY = new List<double>();
 
+    private const double PLAYER_SPEED = 180;
     private const double TILE_SIZE = 70;
 
@@ -67 +68 @@
     private Image[] groundTopImages = LoadImages("ground_top");
     private Image[] foregroundDecorations = LoadImages("viljaa");
-    private Image[] blockImages = LoadImages("box");
+    private Image[] blockImages = LoadImages("box2");
 
     private Image[] houseImages = LoadImages("house", "houseburned");
@@ -73 +74 @@
     private Image cartImage = LoadImage("cart");
     private Image milkImage = LoadImage("tonkkaitem");
-    
+
     private Image cartWheelImage = LoadImage("cartwheel");
 
@@ -90 +91 @@
     private Animation normalWalk;
     private Animation playerIdle;
-    #endregion 
+    private Animation playerJump;
+    private Animation playerFall;
+    #endregion
 
     private double leftCamLimit;
@@ -97 +100 @@
 
     private int levelNumber = 0;
-   
+
     public override void Begin()
     {
@@ -111 +114 @@
 
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, SkipIntro, "Skip");
-        
+
         ShowMadeWithJypeli();
 
@@ -118 +121 @@
             ShowBackgroundStory();
         });
-        
+
 
 
@@ -126 +129 @@
     {
         Image madewithImage = LoadImage("madewithjypeli");
-        
+
         double w = Window.Width / 4;
         double h = w * (madewithImage.Height / (double)madewithImage.Width); // take aspect ratio from the picture
-        
+
         GameObject madewithjypeliObject = new GameObject(w, h);
         madewithjypeliObject.Image = madewithImage;
@@ -143 +146 @@
         //};
         //fadeTimer.Start(5);
-        
+
         Timer.SingleShot(1.2, delegate
         {
@@ -266 +269 @@
         normalWalk = LoadAnimation("pwalk");
         playerIdle = LoadAnimation("idle");
+        playerJump = LoadAnimation("jump");
+        playerFall = LoadAnimation("fall");
     }
 
@@ -301 +306 @@
         level.SetTileMethod(Color.Gold, CreatePlayer);
         level.SetTileMethod(Color.Harlequin, CreateCart);
-        level.SetTileMethod(Color.White, CreateBlockObject); 
-        level.SetTileMethod(Color.DarkGray, CreateMilk);   
+        level.SetTileMethod(Color.White, CreateBlockObject);
+        level.SetTileMethod(Color.DarkGray, CreateMilk);
         level.SetTileMethod(Color.Gray, CreateCrawly);
         level.SetTileMethod(Color.Red, CreateDummy, Color.Red);    //TODO: CreateWitch
-        level.SetTileMethod(Color.Rose, CreateFlame);   
+        level.SetTileMethod(Color.Rose, CreateFlame);
         //level.SetTileMethod(Color.Azure, CreateDummy, Color.Azure);   //TODO: CreateSmoke
         //level.SetTileMethod(Color.Orange, CreateDummy, Color.Orange); //TODO: CreateTombstone
         level.Optimize(Color.Black, Color.Brown);
         level.Execute(TILE_SIZE, TILE_SIZE);
-        
+
 
         //TileMap level = TileMap.FromLevelAsset("level" + levelNumber);
@@ -350 +355 @@
     void CreateBlockObject(Vector position, double width, double height)
     {
+        // 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.Image = blockImages[levelNumber];
+        block.IsVisible = false;
+        //block.Image = blockImages[levelNumber];
         block.Position = position;
-        Add(block);
+        block.Y -= height / 2.0;
+        Add(block, 1);
+
+        GameObject visibleBlock = new GameObject(width, height * 1.5);
+        visibleBlock.Position = position;
+        visibleBlock.Image = blockImages[levelNumber];
+        visibleBlock.Y -= height / 2.0;
+        Add(visibleBlock, -1);
     }
 
     void CreateMilk(Vector position, double width, double height)
     {
-        GameObject milk = new GameObject(milkImage.Width, milkImage.Height);
+        double size = 30;
+        double ratio = milkImage.Height / milkImage.Width;
+        PhysicsObject milk = new PhysicsObject(size, size * ratio);
         milk.Image = milkImage;
         milk.Position = position;
@@ -405 +422 @@
         Add(house, -2);
 
-        PhysicsObject platform = PhysicsObject.CreateStaticObject(house.Width* 0.25, 1);
+        PhysicsObject platform = PhysicsObject.CreateStaticObject(house.Width * 0.25, 1);
         platform.IsVisible = false;
         platform.Position = new Vector(house.X + platform.Width * 0.5, house.Top);
@@ -445 +462 @@
         player.AnimWalk = new Animation(normalWalk);
         player.AnimIdle = new Animation(playerIdle);
+        player.AnimJump = new Animation(playerJump);
+        player.AnimFall = new Animation(playerFall);
+        player.AnimFall.StopOnLastFrame = true;
         players.Add(player);
         startingPlayers.Add(player);
         Add(player);
-        AddCollisionHandler(player, "burn", delegate(PhysicsObject p, PhysicsObject t) 
+        AddCollisionHandler(player, "burn", delegate(PhysicsObject p, PhysicsObject t)
         {
             HillBilly billy = p as HillBilly;
@@ -455 +475 @@
         });
 
-        player.Life.LowerLimit += delegate 
-        { 
+        player.Life.LowerLimit += delegate
+        {
             if (players.Count < 2)
             {
@@ -463 +483 @@
             players.Remove(player); player.Destroy();
         };
+
+        AddCollisionHandler(player, "milk", CollectMilk);
     }
 
@@ -494 +516 @@
     }
 
-    void CreateGround(Vector position, double width, double height) 
+    void CreateGround(Vector position, double width, double height)
     {
         PhysicsObject ground = PhysicsObject.CreateStaticObject(width, height);
@@ -506 +528 @@
     void SetControls()
     {
-        double speed = 180; // TODO: Siirrä tämä johonkin.
-        Keyboard.Listen(Key.A, ButtonState.Down, delegate { startingPlayers[0].Walk(-speed); }, "Player 1 moves left");
-        Keyboard.Listen(Key.D, ButtonState.Down, delegate { startingPlayers[0].Walk(speed); }, "Player 1 moves right");
+        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.Left, ButtonState.Down, delegate { startingPlayers[1].Walk(-speed); }, "Player 2 moves left");
-        Keyboard.Listen(Key.Right, ButtonState.Down, delegate { startingPlayers[1].Walk(speed); }, "Player 2 moves right");
+        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");
 
@@ -523 +544 @@
         //TODO: Sumthin' flashy for our fallen friends.
         Exit();
+    }
+
+    void CollectMilk(PhysicsObject player, PhysicsObject milk)
+    {
+        HillBilly billy = player as HillBilly;
+        if (billy == null)
+            return;
+
+        milk.Destroy();
+        billy.AnimWalk = new Animation(milkWalk);
+        billy.AnimIdle = new Animation(milkWalk.CurrentFrame);
     }
 

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRunContent/HillbillyRunContent.contentproj

@@ -202 +202 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="fall.anim">
+      <Name>fall</Name>
+      <Importer>AnimationImporter</Importer>
+      <Processor>AnimationContentProcessor</Processor>
+    </Compile>
+    <Compile Include="jump.anim">
+      <Name>jump</Name>
+      <Importer>AnimationImporter</Importer>
+      <Processor>AnimationContentProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.