From 899bc6bf5f7e516fccd5bdafeb413d0a91ba0674 Mon Sep 17 00:00:00 2001
From: Agilham <13521118@std.stei.itb.ac.id>
Date: Sat, 11 May 2024 15:12:24 +0700
Subject: [PATCH] fix: projectile error
---
Assets/Scripts/Pet/PetDamageMovement.cs | 2 +-
Assets/Scripts/Shop/ShopList.cs | 1 -
Assets/Scripts/Weapon/ProjectileController.cs | 12 ++++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/Pet/PetDamageMovement.cs b/Assets/Scripts/Pet/PetDamageMovement.cs
index 71612c4..bc4ec60 100644
--- a/Assets/Scripts/Pet/PetDamageMovement.cs
+++ b/Assets/Scripts/Pet/PetDamageMovement.cs
@@ -46,7 +46,7 @@ public class PetDamageMovement : MonoBehaviour
}
void Run() {
- if(owner.tag != "Player") {
+ if(owner.tag != "Player" && player != null) {
float distanceToPlayer = Vector3.Distance(transform.position, player.transform.position);
if(distanceToPlayer <= runRadius) {
// Debug.Log("Pet Damage Running");
diff --git a/Assets/Scripts/Shop/ShopList.cs b/Assets/Scripts/Shop/ShopList.cs
index b2c9fa2..81c32b2 100644
--- a/Assets/Scripts/Shop/ShopList.cs
+++ b/Assets/Scripts/Shop/ShopList.cs
@@ -64,6 +64,5 @@ public class ShopList: MonoBehaviour
default:
return null;
}
- return null;
}
}
diff --git a/Assets/Scripts/Weapon/ProjectileController.cs b/Assets/Scripts/Weapon/ProjectileController.cs
index bd9c446..673f55c 100644
--- a/Assets/Scripts/Weapon/ProjectileController.cs
+++ b/Assets/Scripts/Weapon/ProjectileController.cs
@@ -39,10 +39,14 @@ public class ProjectileController : MonoBehaviour
if(isShotgunBullet) damage = damage * (2 - 0.005f*(traveledDistance * traveledDistance)); // 2-0.005x^2
if (damage < 0) damage = 0;
Debug.Log("Damage dealt: " + damage);
- other.GetComponent<EnemyHealth>().TakeDamage((int)damage);
- // audioSource.Stop();
- // audioSource.PlayOneShot(bulletHit);
- // audioSource.loop = false;
+
+ if (other.TryGetComponent<EnemyHealth>(out var enemyHealth))
+ {
+ enemyHealth.TakeDamage((int)damage);
+ }
+ else if (other.TryGetComponent<PetHealth>(out var petHealth)){
+ petHealth.TakeDamage((int)damage);
+ }
rb.velocity = Vector3.zero;
rb.angularVelocity = Vector3.zero;
--
GitLab