From 37e8c8d6892d1aeefbf561514edb78f5a086b419 Mon Sep 17 00:00:00 2001
From: trotFunky <teo.couprie_diaz@telecom-sudparis.eu>
Date: Tue, 17 Sep 2019 20:45:08 +0200
Subject: [PATCH] Implemented Bullet component Added Death() method to
 AbstractCharacter Implemented basic bullet collision detection and effect

---
 Assets/Scripts/AbstractCharacter.cs | 24 +++++++++++++++---
 Assets/Scripts/Bullet.cs            | 39 ++++++++++++++++++++++++++---
 Assets/Scripts/PlayerCharacter.cs   |  5 ++++
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/Assets/Scripts/AbstractCharacter.cs b/Assets/Scripts/AbstractCharacter.cs
index d001464..5e9fb91 100644
--- a/Assets/Scripts/AbstractCharacter.cs
+++ b/Assets/Scripts/AbstractCharacter.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -93,9 +94,24 @@ public abstract class AbstractCharacter : MonoBehaviour
     public abstract void Move(Vector2 movementDirection);
     public abstract void Shoot();
 
-    // TODO : Manage hurt + OnCollision + Death'n stuff
-    public void Hurt()
+    private void OnCollisionEnter2D(Collision2D other)
     {
-        throw new System.NotImplementedException();
+        Bullet bullet = other.gameObject.GetComponent<Bullet>();
+        if (bullet == null)
+        {
+            return;
+        }
+        Hurt(bullet.Damage);
     }
+    
+    public void Hurt(int damage)
+    {
+        CurrentHealth -= damage;
+        if (CurrentHealth <= 0)
+        {
+            Death();
+        }
+    }
+    // Handles the death of the character, should be overriden
+    protected abstract void Death();
 }
diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs
index ad87b01..0ef04c7 100644
--- a/Assets/Scripts/Bullet.cs
+++ b/Assets/Scripts/Bullet.cs
@@ -1,13 +1,38 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 public class Bullet : MonoBehaviour
 {
-    // Start is called before the first frame update
-    void Start()
+    [SerializeField] private int _damage;
+    public int Damage => _damage;
+
+    // Speed in m/s
+    [SerializeField] private float _speed;
+    public float Speed
     {
-        
+        get { return _speed; }
+        set { _speed = value; }
+    }
+
+    [SerializeField] private Vector2 _direction;
+    public Vector2 Direction
+    {
+        get { return _direction; }
+        set { _direction = value; }
+    }
+
+    private void Start()
+    {
+        Mover mover = GetComponentInParent<Mover>();
+        if (mover == null)
+        {
+            throw new MissingComponentException("Missing Mover!");
+        }
+
+        mover.Direction = Direction;
+        mover.MaxSpeed = Speed;
     }
 
     // Update is called once per frame
@@ -15,4 +40,10 @@ public class Bullet : MonoBehaviour
     {
         
     }
+    
+    // Destroy on Stay, collision effects should be handled on Enter
+    private void OnCollisionStay2D(Collision2D other)
+    {
+        Destroy(gameObject);
+    }
 }
diff --git a/Assets/Scripts/PlayerCharacter.cs b/Assets/Scripts/PlayerCharacter.cs
index 1908ae3..a73a9ed 100644
--- a/Assets/Scripts/PlayerCharacter.cs
+++ b/Assets/Scripts/PlayerCharacter.cs
@@ -17,4 +17,9 @@ public class PlayerCharacter : AbstractCharacter
         // TODO : Implement
         throw new System.NotImplementedException();
     }
+
+    protected override void Death()
+    {
+        throw new System.NotImplementedException();
+    }
 }