Changeset 4399 for 2013

Timestamp:

2013-07-03 14:12:03 (7 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game/Game/Game

Files:

• . (modified) (1 prop)
• Player.cs (modified) (6 diffs)
• bin (deleted)
• obj (deleted)

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

@@ -9 +9 @@
 public class Player : PhysicsObject
 {
-    const double defaultMoveSpeed = 1000;
-    const double defaultWeaponPower = 10;
+    const double defaultSpeed = 1000;
+    const int defaultPower = 10000;
     private static Image playerImage = Game.LoadImage("Player");
 
     Weapon weapon;
-    double speed = defaultMoveSpeed;
-    double power = defaultWeaponPower;
-    IntMeter healt;
+    double speed = defaultSpeed;
+    int power = defaultPower;
+    private int _health = 0;
+    public int health
+    {
+        get
+        {
+            return _health;
+        }
+        set
+        {
+            if (value == 0)
+                Game.MessageDisplay.Add("GAME OVER!");
+            _health = value;
+        }
+    }
 
-    public Player(double width, double height, int healt, bool addDefaultControls) : base(width, height)
+    public Player(double width, double height, int health, bool addDefaultControls) : base(width, height)
     {
         this.Tag = "player";
@@ -25 +38 @@
         this.LinearDamping = 0.9;
 
-        healt = new IntMeter(healt, 0, healt);
+        this.health = health;
 
         if (addDefaultControls)
@@ -37 +50 @@
         if (type == "speed")
         {
-            speed = defaultMoveSpeed + value;
+            speed = defaultSpeed + value;
             return true;
         }
@@ -54 +67 @@
         if (weapon != null)
         {
+            weapon.ProjectileCollision = ProjectileHanlder;
             weapon.Angle = Angle.FromDegrees(90);
             this.Add(weapon);
@@ -59 +73 @@
         }
         return false;
+    }
+
+    private void ProjectileHanlder(PhysicsObject projectile, PhysicsObject target)
+    {
+        if (target is Zombie1)
+        {
+            
+        }
     }
 
@@ -89 +111 @@
         if (weapon != null)
         {
+            weapon.Power.Value = power;
             weapon.Shoot();
         }