From f6e14e0ec4d7a36c26148d191257c7dd6f5f9773 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Thu, 23 Apr 2020 14:30:36 +0300 Subject: [PATCH] Fix campfire bug --- Assets/Scripts/ItemGrabber.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/ItemGrabber.cs b/Assets/Scripts/ItemGrabber.cs index 1268b79..db4d8a7 100644 --- a/Assets/Scripts/ItemGrabber.cs +++ b/Assets/Scripts/ItemGrabber.cs @@ -133,9 +133,7 @@ public class ItemGrabber : MonoBehaviour { } } - PrimaryIndicator.alpha = Mathf.Lerp(PrimaryIndicator.alpha, - Casette != null || LookedAtItem != null || Campfire != null || ThrowableItem != null ? 1 : 0, - 10f * Time.deltaTime); + float PrimaryIndicatorTargetAlpha = 1; if (Casette != null) { PrimaryText.text = Casette.DisplayPrompt; } else if (Campfire != null && ThrowableItem != null) { @@ -144,12 +142,15 @@ public class ItemGrabber : MonoBehaviour { PrimaryText.text = $"Take {LookedAtItem.Quality.DisplayName}"; } else if (ThrowableItem != null) { PrimaryText.text = $"Throw {ThrowableItem.Quality.DisplayName}"; + } else { + PrimaryIndicatorTargetAlpha = 0; } + PrimaryIndicator.alpha = Mathf.Lerp(PrimaryIndicator.alpha, PrimaryIndicatorTargetAlpha, 10f * Time.deltaTime); - SecondaryIndicator.alpha = Mathf.Lerp(SecondaryIndicator.alpha, CanIgniteTorch ? 1 : 0, 10f * Time.deltaTime); if (CanIgniteTorch) { SecondaryText.text = $"Ignite {TorchableItem.Quality.DisplayName}"; } + SecondaryIndicator.alpha = Mathf.Lerp(SecondaryIndicator.alpha, CanIgniteTorch ? 1 : 0, 10f * Time.deltaTime); } private Item GetTorchableItem() {