From 862b3a7a30c14f6bc6eeb9c874a42c3b4a2d2b4f Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Tue, 1 Mar 2022 14:30:07 -0500 Subject: [PATCH] Clappy Trio Event Merge --- Assets/Scripts/Minigames.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 0279b34fd..555c57d29 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -176,12 +176,16 @@ namespace RhythmHeavenMania { new GameAction("clap", delegate { ClappyTrio.instance.Clap(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 3, true), new GameAction("bop", delegate { ClappyTrio.instance.Bop(eventCaller.currentEntity.beat); } ), - new GameAction("prepare", delegate { ClappyTrio.instance.Prepare(0); } ), - new GameAction("prepare_alt", delegate { ClappyTrio.instance.Prepare(3); } ), + new GameAction("prepare", delegate { ClappyTrio.instance.Prepare(eventCaller.currentEntity.toggle ? 3 : 0); }, parameters: new List() + { + new Param("toggle", false, "Alt") + }), new GameAction("change lion count", delegate { ClappyTrio.instance.ChangeLionCount((int)eventCaller.currentEntity.valA); }, 0.5f, false, new List() { new Param("valA", new EntityTypes.Integer(1, 8, 3), "Lion Count") }), + // This is still here for backwards-compatibility but is hidden in the editor + new GameAction("prepare_alt", delegate { ClappyTrio.instance.Prepare(3); }, hidden: true), }), new Minigame("spaceball", "Spaceball", "00A518", false, false, new List() {