diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index f97e4856..09e109d6 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -37,7 +37,7 @@ namespace HeavenStudio.Games.Loaders return null; } RiqBeatmap.OnUpdateEntity += WarningUpdater; - + RiqEntity BackgroundUpdater(string datamodel, RiqEntity e) { if (e.datamodel == "karateman/set background effects") @@ -706,7 +706,7 @@ namespace HeavenStudio.Games break; } - if (songPos >= wordClearTime && songPos < wordStartTime) { + if (songPos >= wordClearTime || songPos < wordStartTime) { Word.Play("NoPose"); } @@ -780,10 +780,10 @@ namespace HeavenStudio.Games public void DoWord(double beat, double length, int type, bool pitchVoice, float forcePitch, bool customLength, bool doSound = true) { - Word.Play(DoWordSound(beat, length, type, customLength, pitchVoice, forcePitch, doSound)); + Word.Play(DoWordSound(beat, length, type, pitchVoice, forcePitch, customLength, doSound)); } - public static string DoWordSound(double beat, double length, int type, bool customLength, bool pitchVoice = false, float forcePitch = 1, bool doSound = true) + public static string DoWordSound(double beat, double length, int type, bool pitchVoice = false, float forcePitch = 1, bool customLength = false, bool doSound = true) { double clear = type switch { <= (int)HitThree.HitFour => beat + 4f, diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index a092c2fd..bfcddf8f 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -99,7 +99,7 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("countOffbeat", "Count") { - function = delegate { MrUpbeat.Count(eventCaller.currentEntity["number"]); }, + inactiveFunction = delegate { MrUpbeat.Count(eventCaller.currentEntity["number"]); }, parameters = new List() { new Param("number", MrUpbeat.Counts.One, "Number", "The sound to play"),