cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-26 22:56:48 +00:00
Code Issues Releases Wiki Activity

heart glow

Browse source
This commit is contained in:
Cameron Taylor 2024-06-04 23:36:32 -04:00
parent 66d86a6969
commit 50990b15e1
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -757,6 +757,7 @@ class FreeplayState extends MusicBeatSubState
randomCapsule.alpha = 0; randomCapsule.alpha = 0;
randomCapsule.songText.visible = false; randomCapsule.songText.visible = false;
randomCapsule.favIcon.visible = false; randomCapsule.favIcon.visible = false;
randomCapsule.favIconBlurred.visible = false;
randomCapsule.ranking.visible = false; randomCapsule.ranking.visible = false;
randomCapsule.blurredRanking.visible = false; randomCapsule.blurredRanking.visible = false;
randomCapsule.initJumpIn(0, force); randomCapsule.initJumpIn(0, force);
@ -779,6 +780,7 @@ class FreeplayState extends MusicBeatSubState
funnyMenu.capsule.alpha = 0.5; funnyMenu.capsule.alpha = 0.5;
funnyMenu.songText.visible = false; funnyMenu.songText.visible = false;
funnyMenu.favIcon.visible = tempSongs[i].isFav; funnyMenu.favIcon.visible = tempSongs[i].isFav;
funnyMenu.favIconBlurred.visible = tempSongs[i].isFav;
funnyMenu.hsvShader = hsvShader; funnyMenu.hsvShader = hsvShader;
funnyMenu.newText.animation.curAnim.curFrame = 45 - ((i * 4) % 45); funnyMenu.newText.animation.curAnim.curFrame = 45 - ((i * 4) % 45);
@ -1232,7 +1234,9 @@ class FreeplayState extends MusicBeatSubState
if (isFav) if (isFav)
{ {
grpCapsules.members[realShit].favIcon.visible = true; grpCapsules.members[realShit].favIcon.visible = true;
grpCapsules.members[realShit].favIconBlurred.visible = true;
grpCapsules.members[realShit].favIcon.animation.play('fav'); grpCapsules.members[realShit].favIcon.animation.play('fav');
grpCapsules.members[realShit].favIconBlurred.animation.play('fav');
FunkinSound.playOnce(Paths.sound('fav'), 1); FunkinSound.playOnce(Paths.sound('fav'), 1);
grpCapsules.members[realShit].checkClip(); 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 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 else
{ {
grpCapsules.members[realShit].favIcon.animation.play('fav', true, true, 9); 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); FunkinSound.playOnce(Paths.sound('unfav'), 1);
new FlxTimer().start(0.2, _ -> { new FlxTimer().start(0.2, _ -> {
grpCapsules.members[realShit].favIcon.visible = false; grpCapsules.members[realShit].favIcon.visible = false;
grpCapsules.members[realShit].favIconBlurred.visible = false;
grpCapsules.members[realShit].checkClip(); grpCapsules.members[realShit].checkClip();
}); });

13
source/funkin/ui/freeplay/SongMenuItem.hx
View file

@ -38,6 +38,7 @@ class SongMenuItem extends FlxSpriteGroup
public var selected(default, set):Bool; public var selected(default, set):Bool;
public var songText:CapsuleText; public var songText:CapsuleText;
public var favIconBlurred:FlxSprite;
public var favIcon:FlxSprite; public var favIcon:FlxSprite;
public var ranking:FreeplayRank; public var ranking:FreeplayRank;
@ -190,6 +191,16 @@ class SongMenuItem extends FlxSpriteGroup
add(pixelIcon); add(pixelIcon);
grpHide.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 = new FlxSprite(380, 40);
favIcon.frames = Paths.getSparrowAtlas('freeplay/favHeart'); favIcon.frames = Paths.getSparrowAtlas('freeplay/favHeart');
favIcon.animation.addByPrefix('fav', 'favorite heart', 24, false); favIcon.animation.addByPrefix('fav', 'favorite heart', 24, false);
@ -669,6 +680,8 @@ class SongMenuItem extends FlxSpriteGroup
capsule.offset.x = this.selected ? 0 : -5; capsule.offset.x = this.selected ? 0 : -5;
capsule.animation.play(this.selected ? "selected" : "unselected"); capsule.animation.play(this.selected ? "selected" : "unselected");
ranking.alpha = this.selected ? 1 : 0.7; 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; ranking.color = this.selected ? 0xFFFFFFFF : 0xFFAAAAAA;
if (songText.tooLong) songText.resetText(); if (songText.tooLong) songText.resetText();