From 8139cd89a52559cdd906cd5866dcc55dbd7003a7 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Fri, 15 Dec 2023 20:14:49 +0000
Subject: [PATCH] Merge branch 'release/v_0.0.1'
---
Assets/Scripts/Damageable.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/Damageable.cs b/Assets/Scripts/Damageable.cs
index 7901a04..52da994 100644
--- a/Assets/Scripts/Damageable.cs
+++ b/Assets/Scripts/Damageable.cs
@@ -4,12 +4,15 @@
public class Damageable : MonoBehaviour
{
+ // ONLY FOR DEBUG USE
+ [SerializeField]
+ private bool selfDamage = false;
Animator animator;
[SerializeField]
private int _maxHealth = 100;
[SerializeField]
- private int _health;
+ private int _health = 100;
[SerializeField]
private bool _isAlive = true;
[SerializeField]
@@ -27,7 +30,16 @@
get { return _health; }
set
{
- _health = value;
+ if (value > MaxHealth)
+ {
+
+ Debug.Log("Warum?");
+ _health = MaxHealth;
+ }
+ else
+ {
+ _health = value;
+ }
if (value <= 0)
{
IsAlive = false;
@@ -46,7 +58,7 @@
private void Awake()
{
- Health = MaxHealth;
+ //Health = MaxHealth;
animator = GetComponent<Animator>();
}
private void Update()
@@ -63,6 +75,10 @@
timeSinceHit += Time.deltaTime;
}
}
+ if (selfDamage)
+ {
+ Hit(10);
+ }
}
public void Hit(int damage)
--
Gitblit v1.9.3