Changeset 4424

Timestamp:

2013-07-04 10:34:21 (10 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game/Game/Game

Files:

• Game.cs (modified) (4 diffs)
• Game.csproj (modified) (1 diff)
• Player.cs (modified) (3 diffs)
• UI.cs (added)

2013/27/TeemuM/Game/Game/Game/Game.cs

@@ -13 +13 @@
     public Player player { get; private set; }
     private List<Zombie> enemies = new List<Zombie>();
-    //DoubleMeter LifeMeter; <-- Huono yritykseni tehdä elämä laskuria, aika loppui niin en kerennyt viimeistellä ja en ois osannukkaan, loput tohon liittyvä löytyy tiedoston pohjalta. -Aqua
 
     public override void Begin()
@@ -115 +114 @@
                 }
             }
+            else if (commands[0] == "health")
+            {
+                if (commands[1] == "add")
+                {
+                    player.health.Value += int.Parse(commands[2]);
+                    MessageDisplay.Add("+" + commands[2] + " health");
+                }
+                else if (commands[1] == "reduce")
+                {
+                    player.health.Value -= int.Parse(commands[2]);
+                    MessageDisplay.Add("-" + commands[2] + " health");
+                }
+            }
             else if (commands[0] == "exit")
             {
@@ -133 +145 @@
         AddScoreMeter();
 
-        player = new Player(50, 50, 1, true);
+        player = new Player(50, 50, 10, true);
         Camera.Follow(player);
         Add(player);
         SpawnZombie();
+        CreateLifeMeter();
     }
 
@@ -222 +235 @@
     }
 
-    /*void CreateLifeMeter()
-    {
-        LifeMeter = new DoubleMeter(10);
-        LifeMeter.MaxValue = 10;
-        LifeMeter.LowerLimit += HealthDepleated;
-
+    void CreateLifeMeter()
+    {
         ProgressBar LifeBar = new ProgressBar(150, 20);
-        LifeBar.X = Screen.Left + 150;
-        LifeBar.Y = Screen.Top - 20;
-        LifeBar.BindTo(LifeMeter);
+        LifeBar.X = Screen.Right - LifeBar.Width / 2 - 10;
+        LifeBar.Y = Screen.Bottom + LifeBar.Height / 2 + 10;
+        LifeBar.BorderColor = Color.Black;
+        LifeBar.BindTo(player.health);
         Add(LifeBar);
     }
-
-    void HealthDepleated()
-    {
-        MessageDisplay.Add("Elämät loppuivat, voi voi.");
-    } */
 }

2013/27/TeemuM/Game/Game/Game/Game.csproj

@@ -116 +116 @@
     <Compile Include="Player.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UI.cs" />
   </ItemGroup>
   <ItemGroup>

2013/27/TeemuM/Game/Game/Game/Player.cs

@@ -15 +15 @@
     private Weapon weapon;
     private double speed = defaultSpeed;
-    private int health;
+    public IntMeter health;
     private double power = defaultPower;
 
     public Player(double width, double height, int health, bool addDefaultControls) : base(width, height)
     {
-        this.health = health;
+        this.health = new IntMeter(health, 0, health);
+        //this.health.LowerLimit = 
         this.Tag = "player";
         this.Shape = Shape.Rectangle;
@@ -29 +30 @@
             SetControls(Key.W, Key.S, Key.D, Key.A, MouseButton.Left);
 
+        G.game.AddCollisionHandler(this, PlayerCollisionHanlder);
         this.IsUpdated = true;
     }
 
-    public void Health(int healthChange) //ToDo: Game over, if no more health.
+    #region Collision handlers
+
+    private void PlayerCollisionHanlder(PhysicsObject player, PhysicsObject target)
     {
-        health += healthChange;
+        if (target is Zombie)
+        {
+            health.Value -= 1;
+        }
     }
+
+    private void ProjectileHanlder(PhysicsObject projectile, PhysicsObject target) //ToDo: Set collisions
+    {
+        if (target is Zombie)
+        {
+            if (weapon is Cannon)
+            {
+                ((Zombie)target).Health(-100);
+            }
+            else if (weapon is PlasmaCannon)
+            {
+                ((Zombie)target).Health(-50);
+            }
+        }
+        else if (target is Player)
+        {
+            Game.MessageDisplay.Add("Achievement get!");
+        }
+        projectile.Destroy();
+    }
+
+#endregion
 
     public bool PowerUp(String type, double value)
@@ -66 +95 @@
             weapon.ProjectileCollision = ProjectileHanlder;
             weapon.Angle = Angle.FromDegrees(90);
+            weapon.CanHitOwner = true;
             this.Add(weapon);
             return true;
         }
         return false;
-    }
-
-    private void ProjectileHanlder(PhysicsObject projectile, PhysicsObject target) //ToDo: Set collisions
-    {
-        if (target is Zombie)
-        {
-            if (weapon is Cannon)
-            {
-                ((Zombie)target).Health(-100);
-            }
-            else if (weapon is PlasmaCannon)
-            {
-                ((Zombie)target).Health(-50);
-            }
-        }
-        projectile.Destroy();
     }