From 50990b15e100a18f2f3d2cd8074e09a8c70e3749 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 4 Jun 2024 23:36:32 -0400
Subject: [PATCH] heart glow
---
source/funkin/ui/freeplay/FreeplayState.hx | 6 ++++++
source/funkin/ui/freeplay/SongMenuItem.hx | 13 +++++++++++++
2 files changed, 19 insertions(+)
diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index fe64a1e6f..4fc94c2d7 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -757,6 +757,7 @@ class FreeplayState extends MusicBeatSubState
randomCapsule.alpha = 0;
randomCapsule.songText.visible = false;
randomCapsule.favIcon.visible = false;
+ randomCapsule.favIconBlurred.visible = false;
randomCapsule.ranking.visible = false;
randomCapsule.blurredRanking.visible = false;
randomCapsule.initJumpIn(0, force);
@@ -779,6 +780,7 @@ class FreeplayState extends MusicBeatSubState
funnyMenu.capsule.alpha = 0.5;
funnyMenu.songText.visible = false;
funnyMenu.favIcon.visible = tempSongs[i].isFav;
+ funnyMenu.favIconBlurred.visible = tempSongs[i].isFav;
funnyMenu.hsvShader = hsvShader;
funnyMenu.newText.animation.curAnim.curFrame = 45 - ((i * 4) % 45);
@@ -1232,7 +1234,9 @@ class FreeplayState extends MusicBeatSubState
if (isFav)
{
grpCapsules.members[realShit].favIcon.visible = true;
+ grpCapsules.members[realShit].favIconBlurred.visible = true;
grpCapsules.members[realShit].favIcon.animation.play('fav');
+ grpCapsules.members[realShit].favIconBlurred.animation.play('fav');
FunkinSound.playOnce(Paths.sound('fav'), 1);
grpCapsules.members[realShit].checkClip();
grpCapsules.members[realShit].selected = grpCapsules.members[realShit].selected; // set selected again, so it can run it's getter function to initialize movement
@@ -1254,9 +1258,11 @@ class FreeplayState extends MusicBeatSubState
else
{
grpCapsules.members[realShit].favIcon.animation.play('fav', true, true, 9);
+ grpCapsules.members[realShit].favIconBlurred.animation.play('fav', true, true, 9);
FunkinSound.playOnce(Paths.sound('unfav'), 1);
new FlxTimer().start(0.2, _ -> {
grpCapsules.members[realShit].favIcon.visible = false;
+ grpCapsules.members[realShit].favIconBlurred.visible = false;
grpCapsules.members[realShit].checkClip();
});
diff --git a/source/funkin/ui/freeplay/SongMenuItem.hx b/source/funkin/ui/freeplay/SongMenuItem.hx
index b861bca15..fb91fbd1c 100644
--- a/source/funkin/ui/freeplay/SongMenuItem.hx
+++ b/source/funkin/ui/freeplay/SongMenuItem.hx
@@ -38,6 +38,7 @@ class SongMenuItem extends FlxSpriteGroup
public var selected(default, set):Bool;
public var songText:CapsuleText;
+ public var favIconBlurred:FlxSprite;
public var favIcon:FlxSprite;
public var ranking:FreeplayRank;
@@ -190,6 +191,16 @@ class SongMenuItem extends FlxSpriteGroup
add(pixelIcon);
grpHide.add(pixelIcon);
+ favIconBlurred = new FlxSprite(380, 40);
+ favIconBlurred.frames = Paths.getSparrowAtlas('freeplay/favHeart');
+ favIconBlurred.animation.addByPrefix('fav', 'favorite heart', 24, false);
+ favIconBlurred.animation.play('fav');
+ favIconBlurred.setGraphicSize(50, 50);
+ favIconBlurred.blend = BlendMode.ADD;
+ favIconBlurred.shader = new GaussianBlurShader(1.2);
+ favIconBlurred.visible = false;
+ add(favIconBlurred);
+
favIcon = new FlxSprite(380, 40);
favIcon.frames = Paths.getSparrowAtlas('freeplay/favHeart');
favIcon.animation.addByPrefix('fav', 'favorite heart', 24, false);
@@ -669,6 +680,8 @@ class SongMenuItem extends FlxSpriteGroup
capsule.offset.x = this.selected ? 0 : -5;
capsule.animation.play(this.selected ? "selected" : "unselected");
ranking.alpha = this.selected ? 1 : 0.7;
+ favIcon.alpha = this.selected ? 1 : 0.6;
+ favIconBlurred.alpha = this.selected ? 1 : 0;
ranking.color = this.selected ? 0xFFFFFFFF : 0xFFAAAAAA;
if (songText.tooLong) songText.resetText();