Merge branch '51-make-player-damaging-if-a-bullet-hits-him' into 'master'

Resolve "Make player damaging if a bullet hits him"

Closes #51

See merge request seprojekt/game!37

Author: mariusschaab

godot/src/scripts/Bullet.cs

@@ -27,7 +27,7 @@ public override void _Ready()
     /// </summary>
     /// <param name="body"> The node, wich collides </param>
     /// <returns> If the bullet collides with a player, the name of that player else an empty string</returns>
-    private string onCollision(Node body)
+    private Player onCollision(Node body)
     {
         //creates the collision animation;
         collisionAnimation();
@@ -36,12 +36,14 @@ private string onCollision(Node body)
         GetParent().RemoveChild(this);
 
         //Return the players name, if the bullet collide with a player.
-        if (false)
+        if (body is Player)
         {
-
+            Player player = (Player)body;
+            player.Health -= Damage;
+            return player;
         }
 
-        return "";
+        return null;
     }
 
 

godot/src/scripts/Player.cs

@@ -42,12 +42,21 @@ public double Health
         get => health;
         set
         {
-            if ((value >= 0 && value <= 100) || value == double.PositiveInfinity)
+            if(value < 0)
+            {
+                health = 0;
+            }
+            else if(value > 100)
+            {
+                health = 100;
+            }
+            else
             {
                 health = value;
-                //sends an signal about
-                EmitSignal(nameof(HealthChangeSignal), Health);
             }
+
+            //sends an signal about
+            EmitSignal(nameof(HealthChangeSignal), Health);
         }
     }