diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs index 3226a37a..ea12cef2 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs @@ -10,6 +10,15 @@ namespace RhythmHeavenMania.Games.ForkLifter { public class ForkLifter : Minigame { + + public enum FlickType + { + Pea, + TopBun, + Burger, + BottomBun + } + public static ForkLifter instance; [Header("References")] diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 13ae2a4c..0279b34f 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -158,13 +158,19 @@ namespace RhythmHeavenMania }), new Minigame("forkLifter", "Fork Lifter", "FFFFFF", false, false, new List() { - new GameAction("pea", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 0); }, 3), - new GameAction("topbun", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 1); }, 3), - new GameAction("burger", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 2); }, 3), - new GameAction("bottombun", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 3); }, 3), + new GameAction("flick", delegate { var e = eventCaller.currentEntity; ForkLifter.instance.Flick(e.beat, e.type); }, 3, false, new List() + { + new Param("type", ForkLifter.FlickType.Pea, "Object") + }), new GameAction("prepare", delegate { ForkLifter.instance.ForkLifterHand.Prepare(); }, 0.5f), new GameAction("gulp", delegate { ForkLifterPlayer.instance.Eat(); }), - new GameAction("sigh", delegate { Jukebox.PlayOneShot("games/forkLifter/sigh"); }) + new GameAction("sigh", delegate { Jukebox.PlayOneShot("games/forkLifter/sigh"); }), + // These are still here for backwards-compatibility but are hidden in the editor + new GameAction("pea", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 0); }, 3, hidden: true), + new GameAction("topbun", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 1); }, 3, hidden: true), + new GameAction("burger", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 2); }, 3, hidden: true), + new GameAction("bottombun", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 3); }, 3, hidden: true), + }), new Minigame("clappyTrio", "The Clappy Trio", "29E7FF", false, false, new List() {