Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-26 17:46:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

lil more polish to fav icon + clipping

Browse source
This commit is contained in:
Cameron Taylor 2024-06-02 02:53:07 -04:00
parent e8119bc7d7
commit 75621435ea
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -655,7 +655,7 @@ class FreeplayState extends MusicBeatSubState
cardGlow.visible = true; cardGlow.visible = true;
FlxTween.tween(cardGlow, {alpha: 0, "scale.x": 1.2, "scale.y": 1.2}, 0.45, {ease: FlxEase.sineOut}); FlxTween.tween(cardGlow, {alpha: 0, "scale.x": 1.2, "scale.y": 1.2}, 0.45, {ease: FlxEase.sineOut});
if (prepForNewRank == true) if (prepForNewRank)
{ {
rankAnimStart(fromResultsParams); rankAnimStart(fromResultsParams);
} }
@ -686,7 +686,7 @@ class FreeplayState extends MusicBeatSubState
rankBg.cameras = [rankCamera]; rankBg.cameras = [rankCamera];
rankBg.alpha = 0; rankBg.alpha = 0;
if (prepForNewRank == true) if (prepForNewRank)
{ {
rankCamera.fade(0xFF000000, 0, false, null, true); rankCamera.fade(0xFF000000, 0, false, null, true);
} }
@ -782,10 +782,8 @@ class FreeplayState extends MusicBeatSubState
funnyMenu.hsvShader = hsvShader; funnyMenu.hsvShader = hsvShader;
funnyMenu.newText.animation.curAnim.curFrame = 45 - ((i * 4) % 45); funnyMenu.newText.animation.curAnim.curFrame = 45 - ((i * 4) % 45);
funnyMenu.forcePosition();
funnyMenu.checkClip(); funnyMenu.checkClip();
funnyMenu.forcePosition();
grpCapsules.add(funnyMenu); grpCapsules.add(funnyMenu);
} }
@ -1223,6 +1221,8 @@ class FreeplayState extends MusicBeatSubState
grpCapsules.members[realShit].favIcon.visible = true; grpCapsules.members[realShit].favIcon.visible = true;
grpCapsules.members[realShit].favIcon.animation.play('fav'); grpCapsules.members[realShit].favIcon.animation.play('fav');
FunkinSound.playOnce(Paths.sound('fav'), 1); 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
busy = true; busy = true;
grpCapsules.members[realShit].doLerp = false; grpCapsules.members[realShit].doLerp = false;
@ -1244,6 +1244,7 @@ class FreeplayState extends MusicBeatSubState
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].checkClip();
}); });
busy = true; busy = true;

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

@ -266,7 +266,7 @@ class SongMenuItem extends FlxSpriteGroup
var clipType:Int = 0; var clipType:Int = 0;
if (ranking.visible == true) clipType += 1; if (ranking.visible == true) clipType += 1;
if (favIcon.visible == true) clipType += 1; if (favIcon.visible == true) clipType = 2;
switch (clipType) switch (clipType)
{ {
case 2: case 2: