aboutsummaryrefslogtreecommitdiffstats
path: root/Assets/Scripts/Actors
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/Actors')
-rw-r--r--Assets/Scripts/Actors/Actor.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/Assets/Scripts/Actors/Actor.cs b/Assets/Scripts/Actors/Actor.cs
index 52a67d3..1c52214 100644
--- a/Assets/Scripts/Actors/Actor.cs
+++ b/Assets/Scripts/Actors/Actor.cs
@@ -29,6 +29,7 @@ namespace MontanaJohns.Actors
Collection<Item> items;
bool isFalling;
+ public int health;
protected int jumpCount;
protected Vector2 acceleration;
@@ -49,6 +50,7 @@ namespace MontanaJohns.Actors
items = new();
stats = baseStats;
+ health = stats.maxHealth;
jumpCount = stats.maxJumps;
}
@@ -77,7 +79,6 @@ namespace MontanaJohns.Actors
{
if (jumpCount++ <= stats.maxJumps)
{
- Debug.Log($"Jumping! Force: {stats.jumpForce}");
_rigidBody.AddForce(Vector2.up * stats.jumpForce);
_animator.SetTrigger("jump");
_animator.SetBool("airborn", true);
@@ -87,22 +88,23 @@ namespace MontanaJohns.Actors
public virtual void Use()
{
- Debug.Log("Using!");
if (activeItem != null)
activeItem.Use();
}
public virtual void AddItem(Item item)
{
- Debug.Log($"Adding item: {item}!");
items.Add(item);
stats = baseStats + items.Select(i => i.stats).Sum();
}
- IEnumerator Falling()
+ public virtual void TakeDamage(int damage)
{
- Debug.Log("Falling!");
+ health -= damage;
+ }
+ IEnumerator Falling()
+ {
_animator.SetBool("airborn", true);
while (_rigidBody.velocity.y > 0 || !Physics2D.OverlapCircle(groundCheckPoint.position, 0.2f, groundLayer))
@@ -113,8 +115,6 @@ namespace MontanaJohns.Actors
jumpCount = 0;
_animator.SetBool("airborn", false);
- Debug.Log("Fell!");
-
yield break;
}
}