From a6850bad43e47ddda1ef1aba1766af77aca67bd4 Mon Sep 17 00:00:00 2001
From: ReinaldoAntolis <reinaldoantolis@gmail.com>
Date: Fri, 14 Apr 2023 15:27:32 +0700
Subject: [PATCH] feat: pet bird functionality
---
Assets/Scripts/Enemy/EnemyHealth.cs | 13 +++++++++++++
Assets/Scripts/Pet/PetHealth.cs | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Assets/Scripts/Enemy/EnemyHealth.cs b/Assets/Scripts/Enemy/EnemyHealth.cs
index 98b0e77..e927b61 100644
--- a/Assets/Scripts/Enemy/EnemyHealth.cs
+++ b/Assets/Scripts/Enemy/EnemyHealth.cs
@@ -10,6 +10,9 @@ public class EnemyHealth : MonoBehaviour
public EnemyType enemyType;
+ GameObject pet;
+ PetHealth petHealth;
+ PetType petType;
Animator anim;
AudioSource enemyAudio;
ParticleSystem hitParticles;
@@ -28,6 +31,10 @@ public class EnemyHealth : MonoBehaviour
currentHealth = startingHealth;
questTemple = FindObjectOfType<Temple>();
+ pet = GameObject.FindGameObjectWithTag ("Pet");
+ petHealth = pet.GetComponent <PetHealth> ();
+ petType = petHealth.GetPetType();
+ print(petType);
}
@@ -54,6 +61,12 @@ public class EnemyHealth : MonoBehaviour
enemyAudio.Play();
currentHealth -= amount;
+ //print(currentHealth);
+ if (petType == PetType.Bird)
+ {
+ currentHealth -= 10;
+ }
+ //print(currentHealth);
hitParticles.transform.position = hitPoint;
hitParticles.Play();
diff --git a/Assets/Scripts/Pet/PetHealth.cs b/Assets/Scripts/Pet/PetHealth.cs
index c34bc20..e617254 100644
--- a/Assets/Scripts/Pet/PetHealth.cs
+++ b/Assets/Scripts/Pet/PetHealth.cs
@@ -48,7 +48,6 @@ public class PetHealth : MonoBehaviour
// }
currentHealth -= amount;
- print(currentHealth);
if (currentHealth <= 0)
{
@@ -77,4 +76,9 @@ public class PetHealth : MonoBehaviour
isSinking = true;
Destroy (gameObject, 2f);
}
+
+ public PetType GetPetType ()
+ {
+ return petType;
+ }
}
--
GitLab