diff --git a/buildnumber.txt b/buildnumber.txt index 8fcfd5fc..63d53b76 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1767 \ No newline at end of file +1769 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 40e96878..6ac42f9c 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -65,6 +65,9 @@ using StringTools; @:access(flixel.text.FlxText.FlxTextFormatRange) class PlayState extends MusicBeatState { + /** + * Current PlayState instance. + */ public static var instance:PlayState = null; /** diff --git a/source/funkin/updating/UpdateScreen.hx b/source/funkin/updating/UpdateScreen.hx index f3a1b451..b1c07cf2 100644 --- a/source/funkin/updating/UpdateScreen.hx +++ b/source/funkin/updating/UpdateScreen.hx @@ -72,17 +72,14 @@ class UpdateScreen extends MusicBeatState { elapsedTime += elapsed; rainbowShader.hset("elapsed", elapsedTime / 3); - if (elapsedTime >= 3) - rainbowShader.hset("strength", 1); - else - rainbowShader.hset("strength", Math.sqrt(elapsedTime / 3)); + rainbowShader.hset("strength", (elapsedTime >= 3) ? 1 : Math.sqrt(elapsedTime / 3)); - progressBar.y = FlxG.height - (60 + (Math.sin(elapsedTime * Math.PI / 2) * 15)); + progressBar.y = FlxG.height - (65 + (Math.sin(elapsedTime * Math.PI / 2) * 10)); if (done) return; var prog = updater.progress; - lerpSpeed = lerp(lerpSpeed, prog.downloadSpeed, 1/16); + lerpSpeed = lerp(lerpSpeed, prog.downloadSpeed, 0.0625); switch(prog.step) { case PREPARING: progressBar.value = 0; @@ -122,8 +119,8 @@ class UpdateScreen extends MusicBeatState { FlxG.camera.fade(0xFF000000, overSound.length / 1000, false, function() { if (updater.executableReplaced) { - // the executable has been replaced, restart the game entirely #if windows + // the executable has been replaced, restart the game entirely Sys.command('start /B ${AsyncUpdater.executableName}'); #else // We have to make the new executable allowed to execute