From b12d86c959bacb2af6392c134dcae215c01ca20d Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 30 Apr 2024 01:33:29 -0400 Subject: [PATCH 1/3] completion number and box fadeout --- source/funkin/ui/freeplay/FreeplayState.hx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index bd558f747..660c794ec 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -430,6 +430,7 @@ class FreeplayState extends MusicBeatSubState add(fp); var clearBoxSprite:FlxSprite = new FlxSprite(1165, 65).loadGraphic(Paths.image('freeplay/clearBox')); + clearBoxSprite.visible = false; add(clearBoxSprite); txtCompletion = new AtlasText(1185, 87, '69', AtlasFont.FREEPLAY_CLEAR); @@ -466,7 +467,7 @@ class FreeplayState extends MusicBeatSubState } }; - exitMovers.set([fp, txtCompletion, fnfHighscoreSpr], + exitMovers.set([fp, txtCompletion, fnfHighscoreSpr, txtCompletion, clearBoxSprite], { x: FlxG.width, speed: 0.3 @@ -509,6 +510,7 @@ class FreeplayState extends MusicBeatSubState fp.visible = true; fp.updateScore(0); + clearBoxSprite.visible = true; txtCompletion.visible = true; intendedCompletion = 0; @@ -752,13 +754,13 @@ class FreeplayState extends MusicBeatSubState switch (txtCompletion.text.length) { case 3: - txtCompletion.x = 1185 - 10; + txtCompletion.offset.x = 10; case 2: - txtCompletion.x = 1185; + txtCompletion.offset.x = 0; case 1: - txtCompletion.x = 1185 + 24; + txtCompletion.offset.x = -24; default: - txtCompletion.x = 1185; + txtCompletion.offset.x = 0; } handleInputs(elapsed); From 84668432ba4f675fbe0cc0aa8a21e49571715aec Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 30 Apr 2024 01:38:00 -0400 Subject: [PATCH 2/3] better tween in for bg dad art --- source/funkin/ui/freeplay/FreeplayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index 660c794ec..95e2c0342 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -342,7 +342,7 @@ class FreeplayState extends MusicBeatSubState }); add(bgDad); - FlxTween.tween(blackOverlayBullshitLOLXD, {x: pinkBack.width * 0.75}, 1, {ease: FlxEase.quintOut}); + FlxTween.tween(blackOverlayBullshitLOLXD, {x: pinkBack.width * 0.75}, 0.7, {ease: FlxEase.quintOut}); blackOverlayBullshitLOLXD.shader = bgDad.shader; From 61012fab68330fc2edade83dbeede06c62549e3e Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 30 Apr 2024 03:22:30 -0400 Subject: [PATCH 3/3] dad art tween and shader on ost text --- source/funkin/ui/freeplay/FreeplayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index 95e2c0342..860b8f235 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -336,7 +336,6 @@ class FreeplayState extends MusicBeatSubState exitMovers.set([blackOverlayBullshitLOLXD, bgDad], { x: FlxG.width * 1.5, - y: bgDad.height, speed: 0.4, wait: 0 }); @@ -409,6 +408,7 @@ class FreeplayState extends MusicBeatSubState var sillyStroke:StrokeShader = new StrokeShader(0xFFFFFFFF, 2, 2); fnfFreeplay.shader = sillyStroke; + ostName.shader = sillyStroke; add(fnfFreeplay); add(ostName);