Fork Lifter Event Merge

This commit is contained in:
Carson Kompon 2022-03-01 14:27:08 -05:00
parent 8fa4838d9a
commit fe546873ac
2 changed files with 20 additions and 5 deletions

View File

@ -10,6 +10,15 @@ namespace RhythmHeavenMania.Games.ForkLifter
{ {
public class ForkLifter : Minigame public class ForkLifter : Minigame
{ {
public enum FlickType
{
Pea,
TopBun,
Burger,
BottomBun
}
public static ForkLifter instance; public static ForkLifter instance;
[Header("References")] [Header("References")]

View File

@ -158,13 +158,19 @@ namespace RhythmHeavenMania
}), }),
new Minigame("forkLifter", "Fork Lifter", "FFFFFF", false, false, new List<GameAction>() new Minigame("forkLifter", "Fork Lifter", "FFFFFF", false, false, new List<GameAction>()
{ {
new GameAction("pea", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 0); }, 3), new GameAction("flick", delegate { var e = eventCaller.currentEntity; ForkLifter.instance.Flick(e.beat, e.type); }, 3, false, new List<Param>()
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 Param("type", ForkLifter.FlickType.Pea, "Object")
new GameAction("bottombun", delegate { ForkLifter.instance.Flick(eventCaller.currentEntity.beat, 3); }, 3), }),
new GameAction("prepare", delegate { ForkLifter.instance.ForkLifterHand.Prepare(); }, 0.5f), new GameAction("prepare", delegate { ForkLifter.instance.ForkLifterHand.Prepare(); }, 0.5f),
new GameAction("gulp", delegate { ForkLifterPlayer.instance.Eat(); }), 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<GameAction>() new Minigame("clappyTrio", "The Clappy Trio", "29E7FF", false, false, new List<GameAction>()
{ {