Merge branch 'main' of https://gitlab.informatika.org/kristabdi/unity-unt

Assets/Scripts/Pet/PetAttack.cs

@@ -9,14 +9,14 @@ public class PetAttack : MonoBehaviour
     public int timeBetweenAttack = 1;
     public float range = 3f;
     public float detectRadius = 3f;
-    
+
     float timer;
     PetHealth petHealth;
     Animator anim;
     RaycastHit raycastHit;
     int shootableMask;
 
-    void Awake()
+    void Start()
     {
         anim = GetComponent<Animator>();
         petHealth = GetComponent<PetHealth>();

Assets/Scripts/Pet/PetAttackerMovement.cs

@@ -11,12 +11,7 @@ public class PetAttackerMovement : PetMovement
     public float maxDistanceToEnemy = 2f;
 
     RaycastHit raycastHit;
-    int shootableMask;
-
-    private void Start()
-    {
-        shootableMask = LayerMask.GetMask("Shootable");
-    }
+    int shootableMask = LayerMask.GetMask("Shootable");
 
     void Update()
     {

Assets/Scripts/Pet/PetHealth.cs

@@ -38,7 +38,7 @@ public class PetHealth : MonoBehaviour
         petAttack = GetComponent<PetAttack>();
         petBuff = GetComponent<PetBuff>();
         AudioClip hurtClip = petAudio.clip;
-        
+
         currentHealth = startingHealth;
 
         // Show GameObject UI
@@ -65,6 +65,7 @@ public class PetHealth : MonoBehaviour
       if (CheatMenu.killpet)
       {
         Death();
+        CheatMenu.killpet = false;
       }
     }
 

Assets/Scripts/Pet/PetMovement.cs

@@ -10,8 +10,8 @@ public class PetMovement: MonoBehaviour
     Animator anim;
 
     public float rotationSpeed = 10f;
-    
-    void Awake()
+
+    void Start()
     {
         GameObject player = GameObject.FindGameObjectWithTag("Player");
         target = player.transform;