From 1038b9167a88734a72f7ac3b86aafb13f6c737be Mon Sep 17 00:00:00 2001 From: blank3times <105398129+blank3times@users.noreply.github.com> Date: Sat, 27 Jan 2024 19:11:12 -0800 Subject: [PATCH] Add autobop and sounds for the ball making it into the hole --- Assets/Scripts/Games/HoleInOne/HoleInOne.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index 02acbba90..680bab873 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -60,12 +60,13 @@ namespace HeavenStudio.Games void Awake() { HoleInOne.instance = this; - SetupBopRegion("holeInOne", "bop", "autoBop"); + SetupBopRegion("holeInOne", "bop", "toggle"); } public override void OnBeatPulse(double beat) { - if (BeatIsInBopRegion(beat)) MonkeyAnim.Play("MonkeyBop"); + if (BeatIsInBopRegion(beat)) MonkeyAnim.DoScaledAnimationAsync("MonkeyBop", 0.4f); + } public void ToggleBop(double beat, float length, bool shouldBop, bool autoBop) @@ -78,7 +79,7 @@ namespace HeavenStudio.Games { new BeatAction.Action(beat + i, delegate { - MonkeyAnim.Play("MonkeyBop"); + MonkeyAnim.DoScaledAnimationAsync("MonkeyBop", 0.4f); // TODO add bops for other characters }) }); @@ -127,6 +128,7 @@ namespace HeavenStudio.Games { SoundByte.PlayOneShotGame("holeInOne/mandrill4"); MonkeyAnim.Play("MonkeySpin"); + } public void MandrillMiss(PlayerActionEvent caller) @@ -137,7 +139,13 @@ namespace HeavenStudio.Games public void MonkeySuccess(PlayerActionEvent caller, float state) { - SoundByte.PlayOneShotGame("holeInOne/monkey3"); + double beat = caller.timer; + int randomSuccess = UnityEngine.Random.Range(1,5); + + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound("holeInOne/monkey3", beat), + new MultiSound.Sound("holeInOne/hole" + randomSuccess, beat + 2f) + }); MonkeyAnim.Play("MonkeySpin"); }