From b2ea5e80bc770fc65d0ed297fb400d694765c497 Mon Sep 17 00:00:00 2001 From: Neil Kollack Date: Fri, 15 Apr 2022 13:48:43 -0500 Subject: fix: various issues with player and Enemy --- Assets/Scripts/Items/Whip.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Assets/Scripts/Items/Whip.cs') diff --git a/Assets/Scripts/Items/Whip.cs b/Assets/Scripts/Items/Whip.cs index 134ea53..cfc7aa9 100644 --- a/Assets/Scripts/Items/Whip.cs +++ b/Assets/Scripts/Items/Whip.cs @@ -46,7 +46,8 @@ namespace MontanaJohns.Items } else { - StartCoroutine(WhipSmack(collisionGameObject, clickLocation)); + // TODO uncomment this later when Projectiles are reworked into an Active Item (commented out for demonstration purposes) + // StartCoroutine(WhipSmack(collisionGameObject, clickLocation)); } } return null; @@ -62,7 +63,7 @@ namespace MontanaJohns.Items private IEnumerator WhipSmack(GameObject collisionGameObject, Vector2 clickLocation) { currentHook = Instantiate(hookNoSwing, clickLocation, Quaternion.identity); - collisionGameObject.GetComponent().TakeDamage(player.GetComponent().damage); + collisionGameObject.GetComponent().TakeDamage(player.GetComponent().stats.damage); yield return new WaitForSeconds(0.1f); Destroy(currentHook); ropeExists = false; -- cgit v1.2.3-70-g09d2