diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index ce25465b6..8d3ffba8d 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -66,12 +66,12 @@ namespace HeavenStudio.Games public void DoMandrill(double beat) { //Mandrill Multisound - // ScheduleInput(beat, 3f, InputAction_BasicPress, CatchSuccess, CatchSuccess1, CatchSuccess2); + ScheduleInput(beat, 3f, InputAction_BasicPress, MandrillSuccess, MandrillMiss, Whiff); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("holeInOne/mandrill1", beat), new MultiSound.Sound("holeInOne/mandrill2", beat + 1f), new MultiSound.Sound("holeInOne/mandrill3", beat + 2f), - new MultiSound.Sound("holeInOne/mandrill4", beat + 3f), + new MultiSound.Sound("holeInOne/hole1", beat + 3f), }); // BeatAction.New(instance, new List() @@ -86,7 +86,7 @@ namespace HeavenStudio.Games public void DoMonkey(double beat) { //Monkey Multisound - ScheduleInput(beat, 2f, InputAction_BasicPress, MonkeySuccess, MonkeyMiss, MonkeyWhiff); + ScheduleInput(beat, 2f, InputAction_BasicPress, MonkeySuccess, MonkeyMiss, Whiff); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("holeInOne/monkey1", beat), new MultiSound.Sound("holeInOne/monkey2", beat + 1f) @@ -100,6 +100,18 @@ namespace HeavenStudio.Games } + public void MandrillSuccess(PlayerActionEvent caller, float state) + { + SoundByte.PlayOneShotGame("holeInOne/mandrill4"); + MonkeyAnim.Play("MonkeySpin"); + } + + public void MandrillMiss(PlayerActionEvent caller) + { + SoundByte.PlayOneShotGame("holeInOne/whale"); + MonkeyAnim.Play("MonkeySpin"); + } + public void MonkeySuccess(PlayerActionEvent caller, float state) { SoundByte.PlayOneShotGame("holeInOne/monkey3"); @@ -112,9 +124,8 @@ namespace HeavenStudio.Games MonkeyAnim.Play("MonkeySpin"); } - public void MonkeyWhiff(PlayerActionEvent caller) + public void Whiff(PlayerActionEvent caller) { - SoundByte.PlayOneShotGame("holeInOne/mandrill4"); MonkeyAnim.Play("MonkeyBop"); } }