diff --git a/source/Init.hx b/source/Init.hx index 64e4626da..bc05e8923 100644 --- a/source/Init.hx +++ b/source/Init.hx @@ -126,6 +126,12 @@ class Init extends FlxState // apply saved filters FlxG.game.setFilters(filters); + // Some additional changes to default HaxeFlixel settings, both for ease of debugging + // and usability. + FlxG.fixedTimestep = false; // This ensures that the game is not tied to the FPS + FlxG.mouse.useSystemCursor = true; // Use system cursor because it's prettier + FlxG.mouse.visible = false; // Hide mouse on start + Main.switchState(this, new TitleState()); } diff --git a/source/gameFolder/meta/data/font/Alphabet.hx b/source/gameFolder/meta/data/font/Alphabet.hx index 9e4cd61b6..febf7a7e8 100644 --- a/source/gameFolder/meta/data/font/Alphabet.hx +++ b/source/gameFolder/meta/data/font/Alphabet.hx @@ -256,13 +256,12 @@ class Alphabet extends FlxSpriteGroup { var scaledY = FlxMath.remapToRange(targetY, 0, 1, 0, 1.3); - var lerpVal = Main.framerateAdjust(0.175); - y = FlxMath.lerp(y, (scaledY * 120) + (FlxG.height * 0.48), lerpVal); + y = FlxMath.lerp(y, (scaledY * 120) + (FlxG.height * 0.48), elapsed * 6); // lmao if (!disableX) - x = FlxMath.lerp(x, (targetY * 20) + 90, lerpVal); + x = FlxMath.lerp(x, (targetY * 20) + 90, elapsed * 6); else - x = FlxMath.lerp(x, xTo, lerpVal); + x = FlxMath.lerp(x, xTo, elapsed * 6); } if ((text != textInit)) diff --git a/source/gameFolder/meta/state/PlayState.hx b/source/gameFolder/meta/state/PlayState.hx index d8ea053a0..734acd013 100644 --- a/source/gameFolder/meta/state/PlayState.hx +++ b/source/gameFolder/meta/state/PlayState.hx @@ -335,6 +335,8 @@ class PlayState extends MusicBeatState super.update(elapsed); + FlxG.camera.followLerp = elapsed * 2; + if (health > 2) health = 2; @@ -376,7 +378,7 @@ class PlayState extends MusicBeatState { if (startedCountdown) { - Conductor.songPosition += FlxG.elapsed * 1000; + Conductor.songPosition += elapsed * 1000; if (Conductor.songPosition >= 0) startSong(); } @@ -384,7 +386,7 @@ class PlayState extends MusicBeatState else { // Conductor.songPosition = FlxG.sound.music.time; - Conductor.songPosition += FlxG.elapsed * 1000; + Conductor.songPosition += elapsed * 1000; if (!paused) {