From 471ffd79893f67d21f2cce816a0a96784a29e538 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 15 Jul 2021 18:45:25 -0400
Subject: [PATCH] min timing shit in progres

---
 source/ComboCounter.hx | 15 ++++++++++++++-
 source/PlayState.hx    |  1 -
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/source/ComboCounter.hx b/source/ComboCounter.hx
index 58a454aa4..a7f9c921f 100644
--- a/source/ComboCounter.hx
+++ b/source/ComboCounter.hx
@@ -3,6 +3,7 @@ package;
 import flixel.FlxSprite;
 import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
+import flixel.util.FlxTimer;
 
 class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
 {
@@ -13,6 +14,8 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
 
 	var grpNumbers:FlxTypedGroup<ComboNumber>;
 
+	var onScreenTime:Float = 0;
+
 	public function new(x:Float, y:Float, daCombo:Int = 0)
 	{
 		super(x, y);
@@ -36,11 +39,21 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
 
 	public function forceFinish():Void
 	{
-		effectStuff.animation.play('funny', true, false, 18);
+		if (onScreenTime < 0.9)
+		{
+			new FlxTimer().start((Conductor.crochet / 1000) * 0.25, function(tmr)
+			{
+				forceFinish();
+			});
+		}
+		else
+			effectStuff.animation.play('funny', true, false, 18);
 	}
 
 	override function update(elapsed:Float)
 	{
+		onScreenTime += elapsed;
+
 		if (effectStuff.animation.curAnim.curFrame == 17)
 			effectStuff.animation.pause();
 
diff --git a/source/PlayState.hx b/source/PlayState.hx
index ae2eaa8dd..27aaee74d 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -3020,7 +3020,6 @@ class PlayState extends MusicBeatState
 			var frameShit:Float = (1 / 24) * 2; // equals 2 frames in the animation
 
 			new FlxTimer().start(((Conductor.crochet / 1000) * 1.25) - frameShit, function(tmr)
-
 			{
 				animShit.forceFinish();
 			});