aboutsummaryrefslogtreecommitdiffstats
path: root/Assets/Scripts/Items
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/Items')
-rw-r--r--Assets/Scripts/Items/Whip.cs5
1 files changed, 3 insertions, 2 deletions
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<Actor>().TakeDamage(player.GetComponent<Stats>().damage);
+ collisionGameObject.GetComponent<Actor>().TakeDamage(player.GetComponent<Player>().stats.damage);
yield return new WaitForSeconds(0.1f);
Destroy(currentHook);
ropeExists = false;