Changeset 6279 for 2015/26

Timestamp:

2015-06-24 17:40:36 (8 years ago)

Author:

empaheik

Message:

Milk!

File:

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

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

@@ -25 +25 @@
 
 
+public abstract class Improvement :PlatformCharacter
+{
+    private List<Animation> animations;
+    public List<Animation> Animations
+    {
+        get { return animations; }
+        set { animations = value; }
+    }
+
+    protected Improvement(double width, double height)
+        : base(width, height)
+    {
+
+    }
+
+    public HillBilly Owner
+    {
+        get { return owner; }
+        set {  owner = value; }
+    }
+    private HillBilly owner;
+
+    public virtual void DoTheThing() { }
+}
+
 //Luokka maajussien erikoisuuksille.
-class HillBilly : PlatformCharacter
+public class MilkImprovement: Improvement
 {
-    private IntMeter lifeCounter = new IntMeter(2, 0, 2);
+
+
+    public override void DoTheThing()
+    {
+        HillbillyRun game = this.Game as HillbillyRun;
+        game.CreateMilkParticles(this.Owner);
+    }
+
+    public MilkImprovement(double width, double height)
+        :base(width, height)
+    {
+
+    }
+}
+
+
+public class HillBilly : PlatformCharacter
+{
+    private IntMeter lifeCounter = new IntMeter(4, 0, 4);
     public IntMeter Life
     {
@@ -35 +78 @@
     }
 
-
+    private Improvement improvement;
+    public Improvement Improvement
+    {
+        set { improvement = value;}
+        get { return improvement; }
+    }
+
+    public void GainImprovement(Improvement improvement)
+    {
+        this.AnimWalk = improvement.Animations[0];
+        this.AnimIdle = new Animation(improvement.Animations[0].CurrentFrame);
+        this.Improvement = improvement;
+        improvement.Owner = this;
+
+        improvement.Destroy();
+    }
+
+    public void UseImprovement(Improvement improvement)
+    {
+        this.PlayAnimation(improvement.Animations[1]);
+        improvement.DoTheThing();
+    }
 
     public HillBilly(double leveys, double korkeus)
@@ -56 +120 @@
 
     private const double PLAYER_SPEED = 180;
-    private const double TILE_SIZE = 70;
+    public const double TILE_SIZE = 70;
 
     private double cameraTargetX; // Sijainti jossa kameran pitäisi olla.
@@ -106 +170 @@
         //MainMenu();
         StartGame();
+    }
+
+    public void CreateMilkParticles(HillBilly billy)        //TODO: Tiny particles.
+    {
+        PhysicsObject milkParticle = new PhysicsObject(20, 20);
+        milkParticle.Position = billy.Position;
+        milkParticle.Tag = "milkparticle";
+        Add(milkParticle);
+
     }
 
@@ -262 +335 @@
         cameraTimer.Timeout += UpdateCamera;
         cameraTimer.Start();
-    }
-
-    #region LevelCreation
-    void CreateLevel()
-    {
+
+
         //Background
         GameObject forestBackground = new GameObject(Level.Width, Level.Height);
@@ -274 +344 @@
         Layers[-3].RelativeTransition = new Vector(0.5, 1.0);
         Level.Background.CreateGradient(Color.Black, Color.SkyBlue);
+    }
+
+    #region LevelCreation
+    void CreateLevel()
+    {
 
         Gravity = new Vector(0, -1000);
@@ -323 +398 @@
         Wind = new Vector(-10, 0);
         Add(savu);
+
+        AddCollisionHandler(flame, "milkparticle", delegate(PhysicsObject c, PhysicsObject particle)
+        {
+            particle.Destroy();
+            flame.Destroy();
+            savu.Destroy();
+        });
     }
 
@@ -346 +428 @@
         double size = 30;
         double ratio = milkImage.Height / milkImage.Width;
-        PhysicsObject milk = new PhysicsObject(size, size * ratio);
+
+        Improvement milk = new MilkImprovement(size, size * ratio);
         milk.Image = milkImage;
+        milk.Animations = new List<Animation> { milkWalk, milkThrow };
         milk.Position = position;
         milk.Tag = "milk";
         Add(milk);
+
+        //PhysicsObject milk = new PhysicsObject(size, size * ratio);
+        //milk.Image = milkImage;
+        //milk.Position = position;
+        //milk.Tag = "milk";
+        //Add(milk);
     }
 
@@ -392 +482 @@
             particle.Destroy();
             crawly.Brain = null;
+            crawly.Animation = new Animation(crawly.Animation.CurrentFrame);
             crawly.Tag = "";
             flame.Destroy();
@@ -526 +617 @@
         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(PLAYER_SPEED); }, "Player 1 jumps");
+        Keyboard.Listen(Key.W, ButtonState.Down, delegate { startingPlayers[0].Jump(PLAYER_SPEED * 2); }, "Player 1 jumps");    //Just PLAYER_SPEED felt alright as well
+        Keyboard.Listen(Key.E, ButtonState.Pressed, UseImprovement, "Player 1 uses their tools", startingPlayers[0]);
 
         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(PLAYER_SPEED); }, "Player 2 jumps");
+        Keyboard.Listen(Key.Up, ButtonState.Down, delegate { startingPlayers[1].Jump(PLAYER_SPEED * 2); }, "Player 2 jumps");
+        Keyboard.Listen(Key.RightShift, ButtonState.Pressed, UseImprovement, "Player 2 uses their tools", startingPlayers[1]);
 
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Show help");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Exit game");
+    }
+
+    private void UseImprovement(HillBilly player)
+    {
+        if(player.Improvement == null)
+        {
+            player.Jump(200);   //TODO: CRY ALL THE TEARS
+            return;
+        }
+
+        player.UseImprovement(player.Improvement);
     }
 
@@ -548 +652 @@
             return;
 
+        Improvement milkI = milk as Improvement;
+        billy.GainImprovement(milkI);
+
         milk.Destroy();
-        billy.AnimWalk = new Animation(milkWalk);
-        billy.AnimIdle = new Animation(milkWalk.CurrentFrame);
+        //billy.AnimWalk = new Animation(milkWalk);
+        //billy.AnimIdle = new Animation(milkWalk.CurrentFrame);
     }