diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 0f3e74380..483430651 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -71,6 +71,7 @@ namespace HeavenStudio public event Action onBeatChanged; public event Action onSectionChange; + public event Action onBeatPulse; public int BeatmapEntities() { @@ -497,6 +498,7 @@ namespace HeavenStudio if (cond.songPositionInBeatsAsDouble >= Math.Ceiling(_playStartBeat) + _pulseTally) { if (_currentMinigame != null) _currentMinigame.OnBeatPulse(Math.Ceiling(_playStartBeat) + _pulseTally); + onBeatPulse?.Invoke(Math.Ceiling(_playStartBeat) + _pulseTally); _pulseTally++; } diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs index 67812f8a7..b615576ab 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs @@ -69,16 +69,6 @@ namespace HeavenStudio.Games.Loaders }, resizable = true }, - new GameAction("bop", "Bop") - { - function = delegate { var e = eventCaller.currentEntity; ForkLifter.instance.Bop(e.beat, e.length, e["bop"], e["autoBop"]); }, - parameters = new List() - { - new Param("bop", true, "Keep Bopping", "Should Fork bop for the duration of the block?"), - new Param("autoBop", false, "Keep Bopping (Auto)", "Should Fork bop indefinitely?"), - }, - resizable = true, - }, }, new List() {"rvl", "normal"}, "rvlfork", "en", @@ -129,11 +119,6 @@ namespace HeavenStudio.Games instance = this; } - public override void OnBeatPulse(double beat) - { - playerInstance.SingleBop(); - } - private void Update() { BackgroundColorUpdate(); diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs index f4678f2e5..ec2a95818 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs @@ -27,7 +27,6 @@ namespace HeavenStudio.Games.Scripts_ForkLifter public int currentEarlyPeasOnFork; public int currentPerfectPeasOnFork; public int currentLatePeasOnFork; - private double lastReportedBeat; private bool isEating = false; @@ -51,11 +50,6 @@ namespace HeavenStudio.Games.Scripts_ForkLifter } } - public void SingleBop() - { - if (anim.IsAnimationNotPlaying() && shouldBop) anim.DoScaledAnimationAsync("Player_Bop", 0.5f); - } - public void Eat() { if (currentEarlyPeasOnFork != 0 || currentPerfectPeasOnFork != 0 || currentLatePeasOnFork != 0)