cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-22 05:03:42 +00:00
Code Issues Releases Wiki Activity

potential polish?

Browse source
This commit is contained in:
Cameron Taylor 2021-12-04 09:54:21 -05:00
parent 4d11007f66
commit e4aed63740
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/FreeplayState.hx
View file

@ -238,7 +238,7 @@ class FreeplayState extends MusicBeatState
funnyMenu.alpha = 0.5; funnyMenu.alpha = 0.5;
funnyMenu.songText.visible = false; funnyMenu.songText.visible = false;
new FlxTimer().start((0.06 * i) + 0, function(lerpTmr) new FlxTimer().start((0.06 * i) + 1.05, function(lerpTmr)
{ {
funnyMenu.doLerp = true; funnyMenu.doLerp = true;
}); });
@ -596,7 +596,8 @@ class FreeplayState extends MusicBeatState
capsule.selected = false; capsule.selected = false;
capsule.targetPos.y = ((index - curSelected) * 150) + 160; capsule.targetPos.y = ((index - curSelected) * 150) + 160;
capsule.targetPos.x = 270 + (60 * (Math.sin(index - curSelected))); // capsule.targetPos.x = 270 + (60 * (Math.sin(index - curSelected)));
capsule.targetPos.x = 320 + (40 * (index - curSelected));
} }
grpCapsules.members[curSelected].selected = true; grpCapsules.members[curSelected].selected = true;

10
source/freeplayStuff/SongMenuItem.hx
View file

@ -45,12 +45,10 @@ class SongMenuItem extends FlxSpriteGroup
var frameTicker:Float = 0; var frameTicker:Float = 0;
var frameTypeBeat:Int = 0; var frameTypeBeat:Int = 0;
var xFrames:Array<Float> = [1.6, 1.8, 0.85, 0.85, 0.97, 0.97, 1]; var xFrames:Array<Float> = [1.7, 1.8, 0.85, 0.85, 0.97, 0.97, 1];
var xPosLerpLol:Array<Float> = [0.8, 0.4, 0.16, 0.16, 0.22, 0.22, 0.245]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER var xPosLerpLol:Array<Float> = [0.9, 0.4, 0.16, 0.16, 0.22, 0.22, 0.245]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER
override function update(elapsed:Float) override function update(elapsed:Float)
{
if (doLerp)
{ {
frameTicker += elapsed; frameTicker += elapsed;
@ -65,7 +63,9 @@ class SongMenuItem extends FlxSpriteGroup
frameTypeBeat += 1; frameTypeBeat += 1;
} }
// x = CoolUtil.coolLerp(x, targetPos.x, 0.3); if (doLerp)
{
x = CoolUtil.coolLerp(x, targetPos.x, 0.3);
y = CoolUtil.coolLerp(y, targetPos.y, 0.4); y = CoolUtil.coolLerp(y, targetPos.y, 0.4);
} }