diff --git a/Game/Assets/Scripts/DamageHandler.cs b/Game/Assets/Scripts/DamageHandler.cs index bbaa0ce..23cb7c1 100644 --- a/Game/Assets/Scripts/DamageHandler.cs +++ b/Game/Assets/Scripts/DamageHandler.cs @@ -47,7 +47,7 @@ public class DamageHandler : MonoBehaviour { if (fallTime >= maxFallingTime) { - Die(); + Die("fallOut"); } fallTime += Time.deltaTime; } else if(currentVelocity >= 0) @@ -93,13 +93,24 @@ public class DamageHandler : MonoBehaviour if(this.health <= 0f) { - Die(); + Die("fallDamage"); } } - public void Die() + public void Die(String reason) { - SceneManager.LoadScene(3, LoadSceneMode.Single); + if(reason == "hole") + { + SceneManager.LoadScene(3, LoadSceneMode.Single); + Debug.Log("Died from hole"); + } else if (reason == "fallDamage") + { + Debug.Log("Died from fall damage"); + } else if (reason == "fallOut") + { + Debug.Log("Fell too much"); + } + Destroy(gameObject); } } diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 6aeb609..b481053 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -6,6 +6,7 @@ public class DropletMovement : MonoBehaviour { private Rigidbody2D rb; private Collider2D characterCollider; + private DamageHandler damageHandler; // helper variables private bool isGrounded = false; @@ -34,7 +35,8 @@ public class DropletMovement : MonoBehaviour { rb = GetComponent(); characterCollider = GetComponent(); - + damageHandler = GetComponent(); + TreeSpawner.treeCount = 0; } diff --git a/music/BGmusic_demo.mp3 b/music/BGmusic_demo.mp3 new file mode 100644 index 0000000..e13c2a5 Binary files /dev/null and b/music/BGmusic_demo.mp3 differ