Merge branch 'main' of https://gitlab.informatika.org/jasonk19/if3210-2023-unity-kda

Assets/Scripts/Managers/CheatManager.cs

@@ -8,6 +8,8 @@ public class CheatManager : MonoBehaviour
     string[] cheatCodes;
     bool isMotherlodeCheat = false;
 
+    PetHealth petHealthScript;
+
     // Start is called before the first frame update
     void Start()
     {
@@ -31,41 +33,44 @@ public class CheatManager : MonoBehaviour
 
         if (Input.GetKeyDown(KeyCode.C)) {
 
-            Debug.Log("Show Cheat Codes");
             NotificationManager.ShowNotification(cheatCodes[Random.Range(0, cheatCodes.Length)], 2.0f);
 
         } else if (Input.GetKeyDown(KeyCode.RightAlt)) {
 
-            Debug.Log("No Damage Cheat");
             PlayerHealth.noDamageCheat = true;
             NotificationManager.ShowNotification("No Damage Cheat is ON", 2.0f);
 
         } else if (Input.GetKeyDown(KeyCode.LeftAlt)) {
 
-            Debug.Log("1 Hit Kill Cheat");
             PlayerShooting.hitKillCheat = true;
             NotificationManager.ShowNotification("1 Hit Kill Cheat is ON", 2.0f);
 
         } else if (Input.GetKeyDown(KeyCode.Z)) {
 
-            Debug.Log("Motherlode Cheat");
             isMotherlodeCheat = true;
             GoldManager.gold = 99999;
             NotificationManager.ShowNotification("Motherlode Cheat", 2.0f);
 
         } else if (Input.GetKeyDown(KeyCode.Equals)) {
             
-            Debug.Log("x2 Speed Cheat");
             PlayerMovement.speed = 12f;
             NotificationManager.ShowNotification("x2 Speed Cheat is ON", 2.0f);
 
         } else if (Input.GetKeyDown(KeyCode.Backslash)) {
 
-            Debug.Log("Full HP Pet Cheat");
+            PetHealth.isFullHPCheat = true;
+            NotificationManager.ShowNotification("Full HP Pet Cheat is ON", 2.0f);
 
         } else if (Input.GetKeyDown(KeyCode.P)) {
-
-            Debug.Log("Kill Pet Cheat");
+            GameObject pet = GameObject.FindGameObjectWithTag("Pet");
+
+            if (pet is not null) {
+                petHealthScript = pet.GetComponent<PetHealth>();
+                petHealthScript.Death();
+                NotificationManager.ShowNotification("Kill Pet Cheat is ON, Pet is Dead", 2.0f);
+            } else {
+                NotificationManager.ShowNotification("Kill Pet Cheat is ON, but you don't have a pet", 2.0f);
+            }
 
         }
     }

Assets/Scripts/Pets/PetHealth.cs

@@ -8,6 +8,8 @@ public class PetHealth : MonoBehaviour
     public int currentHealth;
     public AudioClip deathClip;
 
+    public static bool isFullHPCheat = false;
+
 
     Animator anim;
     AudioSource petAudio;
@@ -38,6 +40,7 @@ public class PetHealth : MonoBehaviour
         if (isDead)
             return;
 
+        if (!isFullHPCheat) {
             petAudio.Play ();
 
             currentHealth -= amount;
@@ -50,9 +53,10 @@ public class PetHealth : MonoBehaviour
                 Death ();
             }
         }
+    }
 
 
-    void Death ()
+    public void Death ()
     {
         isDead = true;