diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 804fdf5b4..d79320bce 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -238,7 +238,7 @@ class FreeplayState extends MusicBeatState funnyMenu.alpha = 0.5; 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; }); @@ -596,7 +596,8 @@ class FreeplayState extends MusicBeatState capsule.selected = false; 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; diff --git a/source/freeplayStuff/SongMenuItem.hx b/source/freeplayStuff/SongMenuItem.hx index 0ee7bb085..f6c81d15d 100644 --- a/source/freeplayStuff/SongMenuItem.hx +++ b/source/freeplayStuff/SongMenuItem.hx @@ -45,27 +45,27 @@ class SongMenuItem extends FlxSpriteGroup var frameTicker:Float = 0; var frameTypeBeat:Int = 0; - var xFrames:Array = [1.6, 1.8, 0.85, 0.85, 0.97, 0.97, 1]; - var xPosLerpLol:Array = [0.8, 0.4, 0.16, 0.16, 0.22, 0.22, 0.245]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER + var xFrames:Array = [1.7, 1.8, 0.85, 0.85, 0.97, 0.97, 1]; + var xPosLerpLol:Array = [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) { + frameTicker += elapsed; + + if (frameTicker >= 1 / 24 && frameTypeBeat < xFrames.length) + { + frameTicker = 0; + + scale.x = xFrames[frameTypeBeat]; + scale.y = 1 / xFrames[frameTypeBeat]; + x = FlxG.width * xPosLerpLol[Std.int(Math.min(frameTypeBeat, xPosLerpLol.length - 1))]; + + frameTypeBeat += 1; + } + if (doLerp) { - frameTicker += elapsed; - - if (frameTicker >= 1 / 24 && frameTypeBeat < xFrames.length) - { - frameTicker = 0; - - scale.x = xFrames[frameTypeBeat]; - scale.y = 1 / xFrames[frameTypeBeat]; - x = FlxG.width * xPosLerpLol[Std.int(Math.min(frameTypeBeat, xPosLerpLol.length - 1))]; - - frameTypeBeat += 1; - } - - // x = CoolUtil.coolLerp(x, targetPos.x, 0.3); + x = CoolUtil.coolLerp(x, targetPos.x, 0.3); y = CoolUtil.coolLerp(y, targetPos.y, 0.4); }