From 538bc3cfa5510df52a3b112ddabb7266d3eddc5b Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Sun, 27 Feb 2022 19:17:12 -0500 Subject: [PATCH] Added Placeholder animations for Tap Trial Added Double Tap and Triple Tap placeholder animations so they can be used in a remix until they're made actually playable. --- Assets/Scripts/Games/TapTrial/TapTrial.cs | 34 +++++++++++++++++++++++ Assets/Scripts/Minigames.cs | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Games/TapTrial/TapTrial.cs b/Assets/Scripts/Games/TapTrial/TapTrial.cs index 3e9a9eda..26dca1e3 100644 --- a/Assets/Scripts/Games/TapTrial/TapTrial.cs +++ b/Assets/Scripts/Games/TapTrial/TapTrial.cs @@ -18,6 +18,8 @@ namespace RhythmHeavenMania.Games.TapTrial instance = this; } + // The following is all solely animations for placeholder. This isn't playable + public void Tap(float beat) { MultiSound.Play(new MultiSound.Sound[] @@ -37,12 +39,44 @@ namespace RhythmHeavenMania.Games.TapTrial public void DoubleTap(float beat) { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("tapTrial/ookook", beat), + new MultiSound.Sound("tapTrial/ookook", beat + 0.5f), + new MultiSound.Sound("tapTrial/tap", beat + 1.0f), + new MultiSound.Sound("tapTrial/tap", beat + 1.5f), + }); + GameObject beatAction = new GameObject(); + beatAction.transform.SetParent(this.transform); + BeatAction.New(beatAction, new List() + { + new BeatAction.Action(beat + 0.0f, delegate { player.anim.Play("DoubleTapPrepare", 0, 0); }), + new BeatAction.Action(beat + 1.0f, delegate { player.anim.Play("DoubleTap", 0, 0); }), + new BeatAction.Action(beat + 1.5f, delegate { player.anim.Play("DoubleTap", 0, 0); }), + }); } public void TripleTap(float beat) { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("tapTrial/ooki1", beat), + new MultiSound.Sound("tapTrial/ooki2", beat + 0.5f), + new MultiSound.Sound("tapTrial/tap", beat + 2.0f), + new MultiSound.Sound("tapTrial/tap", beat + 2.5f), + new MultiSound.Sound("tapTrial/tap", beat + 3.0f), + }); + GameObject beatAction = new GameObject(); + beatAction.transform.SetParent(this.transform); + BeatAction.New(beatAction, new List() + { + new BeatAction.Action(beat + 0.0f, delegate { player.anim.Play("PosePrepare", 0, 0); }), + new BeatAction.Action(beat + 2.0f, delegate { player.anim.Play("Tap", 0, 0); }), + new BeatAction.Action(beat + 2.5f, delegate { player.anim.Play("DoubleTap", 0, 0); }), + new BeatAction.Action(beat + 3.0f, delegate { player.anim.Play("Tap", 0, 0); }), + }); } public void JumpTap(float beat) diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 5e07a7ff..24b3f826 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -332,7 +332,7 @@ namespace RhythmHeavenMania }), new Minigame("tapTrial", "Tap Trial \n[WIP don't use]", "93ffb3", false, false, new List() { - new GameAction("tap", delegate { TapTrial.instance.Tap(eventCaller.currentEntity.beat); }, 1.5f, false), + new GameAction("tap", delegate { TapTrial.instance.Tap(eventCaller.currentEntity.beat); }, 2.0f, false), new GameAction("double tap", delegate { TapTrial.instance.DoubleTap(eventCaller.currentEntity.beat); }, 2.0f, false), new GameAction("triple tap", delegate { TapTrial.instance.TripleTap(eventCaller.currentEntity.beat); }, 4.0f, false), new GameAction("jump tap", delegate { TapTrial.instance.JumpTap(eventCaller.currentEntity.beat); }, 2.0f, false),