From 5dda95c69baffddfae35f7e5fdf1fdb84661a80f Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 5 Jun 2024 00:40:14 -0400
Subject: [PATCH 1/2] Fix some display issues with the clear percent in the
results screen.
---
source/funkin/InitState.hx | 2 +-
.../play/components/ClearPercentCounter.hx | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx
index c7a08d714..49b15ddf6 100644
--- a/source/funkin/InitState.hx
+++ b/source/funkin/InitState.hx
@@ -229,7 +229,7 @@ class InitState extends FlxState
tallies:
{
sick: 130,
- good: 70,
+ good: 60,
bad: 69,
shit: 69,
missed: 69,
diff --git a/source/funkin/play/components/ClearPercentCounter.hx b/source/funkin/play/components/ClearPercentCounter.hx
index d296b0b0b..6af40019b 100644
--- a/source/funkin/play/components/ClearPercentCounter.hx
+++ b/source/funkin/play/components/ClearPercentCounter.hx
@@ -35,7 +35,7 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
super(x, y);
flashShader = new PureColor(FlxColor.WHITE);
- flashShader.colorSet = true;
+ flashShader.colorSet = false;
curNumber = startingNumber;
@@ -54,10 +54,7 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
*/
public function flash(enabled:Bool):Void
{
- for (member in members)
- {
- member.shader = enabled ? flashShader : null;
- }
+ flashShader.colorSet = enabled;
}
var tmr:Float = 0;
@@ -98,6 +95,7 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
var yPos = (digitIndex - 1 + digitOffset) * (digitHeightOffset * this.scale.y);
yPos += small ? 0 : 72;
+ trace('[COUNTER] Drawing digit ${num}');
if (digitIndex >= members.length)
{
// Three digits = LLR because the 1 and 0 won't be the same anyway.
@@ -105,6 +103,8 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
// var variant:Bool = (seperatedScore.length % 2 != 0) ? (digitIndex % 2 == 0) : (digitIndex % 2 == 1);
var numb:ClearPercentNumber = new ClearPercentNumber(xPos, yPos, num, variant, this.small);
numb.scale.set(this.scale.x, this.scale.y);
+ numb.shader = flashShader;
+ numb.visible = true;
add(numb);
}
else
@@ -113,8 +113,15 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
// Reset the position of the number
members[digitIndex].x = xPos + this.x;
members[digitIndex].y = yPos + this.y;
+ members[digitIndex].visible = true;
}
}
+ trace('[COUNTER] Members: ${members.length}, expected members: ${seperatedScore.length + 1}');
+ for (ind in (seperatedScore.length + 1)...(members.length))
+ {
+ trace('Hiding digit ${ind}');
+ members[ind].visible = false;
+ }
}
}
From 640c1cf236f2578795c1385ac2ffad72a4095228 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 5 Jun 2024 00:49:59 -0400
Subject: [PATCH 2/2] Dave say 1 minute to make Dad sneak up and 2 minutes to
play the cartoons
---
source/funkin/ui/freeplay/DJBoyfriend.hx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/funkin/ui/freeplay/DJBoyfriend.hx b/source/funkin/ui/freeplay/DJBoyfriend.hx
index 248526aaf..bd2f73e42 100644
--- a/source/funkin/ui/freeplay/DJBoyfriend.hx
+++ b/source/funkin/ui/freeplay/DJBoyfriend.hx
@@ -27,8 +27,8 @@ class DJBoyfriend extends FlxAtlasSprite
var gotSpooked:Bool = false;
- static final SPOOK_PERIOD:Float = 120.0;
- static final TV_PERIOD:Float = 180.0;
+ static final SPOOK_PERIOD:Float = 60.0;
+ static final TV_PERIOD:Float = 120.0;
// Time since dad last SPOOKED you.
var timeSinceSpook:Float = 0;