From 05148ee4f089d6df5c53d70f3ebb146a612d4761 Mon Sep 17 00:00:00 2001 From: Eric Myllyoja Date: Sun, 12 Jun 2022 00:53:39 -0400 Subject: [PATCH] GF now ducks (a little glitchy tho) --- source/funkin/play/stage/Bopper.hx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/funkin/play/stage/Bopper.hx b/source/funkin/play/stage/Bopper.hx index c98437071..331469275 100644 --- a/source/funkin/play/stage/Bopper.hx +++ b/source/funkin/play/stage/Bopper.hx @@ -224,7 +224,7 @@ class Bopper extends FlxSprite implements IPlayStateScriptedClass */ public function playAnimation(name:String, restart:Bool = false, ?ignoreOther:Bool = false):Void { - if (!canPlayOtherAnims) + if (!canPlayOtherAnims && !ignoreOther) return; var correctName = correctAnimationName(name); @@ -252,10 +252,12 @@ class Bopper extends FlxSprite implements IPlayStateScriptedClass /** * @param name The animation to play. - * @param duration The duration in which other (non-forced) animations will be skipped, in seconds. + * @param duration The duration in which other (non-forced) animations will be skipped, in seconds (NOT MILLISECONDS). */ public function forceAnimationForDuration(name:String, duration:Float):Void { + // TODO: Might be nice to rework this function, maybe have a numbered priority system? + if (this.animation == null) return;