NeonTea
/
campfire
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix campfire bug

This commit is contained in:
Jens Pitkänen 2020-04-23 14:30:36 +03:00
parent 6835ba513c
commit f6e14e0ec4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Scripts/ItemGrabber.cs
View File

@ -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() {