diff --git a/Preloader.hx b/Preloader.hx index ac2f37f8a..6882d8d06 100644 --- a/Preloader.hx +++ b/Preloader.hx @@ -44,7 +44,7 @@ class Preloader extends FlxBasePreloader logo.scaleX += Percent / 1280; logo.scaleY += Percent / 1280; logo.x -= Percent * 0.86; - logo.y -= Percent / 1.5; + logo.y -= Percent / 1.4; }else{ logo.scaleX = this._width / 1280; logo.scaleY = this._width / 1280; diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 2db5f397d..b938f1aac 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -8,7 +8,6 @@ import flixel.group.FlxGroup.FlxTypedGroup; import flixel.math.FlxMath; import flixel.text.FlxText; import flixel.util.FlxColor; -//import htmlparser.HtmlDocument; import lime.utils.Assets; class FreeplayState extends MusicBeatState @@ -120,6 +119,10 @@ class FreeplayState extends MusicBeatState super.update(elapsed); lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4)); + + if (Math.abs(lerpScore - intendedScore) <= 10) + lerpScore = intendedScore; + scoreText.text = "PERSONAL BEST:" + lerpScore; var upP = controls.UP_P; @@ -169,9 +172,7 @@ class FreeplayState extends MusicBeatState if (curDifficulty > 2) curDifficulty = 0; - #if !switch intendedScore = Highscore.getScore(songs[curSelected], curDifficulty); - #end switch (curDifficulty) { @@ -199,9 +200,7 @@ class FreeplayState extends MusicBeatState // selector.y = (70 * curSelected) + 30; - #if !switch intendedScore = Highscore.getScore(songs[curSelected], curDifficulty); - #end // lerpScore = 0; var bullShit:Int = 0; diff --git a/source/PlayState.hx b/source/PlayState.hx index b5a3ce503..35a8b9f7c 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -880,7 +880,7 @@ class PlayState extends MusicBeatState difficulty = '-easy'; if (storyDifficulty == 2) - difficulty == '-hard'; + difficulty = '-hard'; trace('LOADING NEXT SONG'); trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty);