diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 22be5c9..145f2fc 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -42,7 +42,7 @@ class FreeplayState extends MusicBeatState for (i in 0...initSonglist.length) { var data:Array = initSonglist[i].split(':'); - songs.push(new SongMetadata(data[0], data[2], data[1])); + songs.push(new SongMetadata(data[0], Std.parseInt(data[2]), data[1])); } /* diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index cfb1236..fb24034 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -36,9 +36,9 @@ class MainMenuState extends MusicBeatState var newGaming2:FlxText; var newInput:Bool = true; - public static var nightly:String = "-Nightly.3"; + public static var nightly:String = ""; - public static var kadeEngineVer:String = "1.3.1" + nightly; + public static var kadeEngineVer:String = "1.4" + nightly; public static var gameVer:String = "0.2.7.1"; var magenta:FlxSprite; diff --git a/source/Options.hx b/source/Options.hx index c8f5a2e..f4e6e20 100644 --- a/source/Options.hx +++ b/source/Options.hx @@ -335,6 +335,7 @@ class OffsetMenu extends Option PlayState.isStoryMode = false; PlayState.storyDifficulty = 0; PlayState.storyWeek = 0; + PlayState.offsetTesting = true; trace('CUR WEEK' + PlayState.storyWeek); LoadingState.loadAndSwitchState(new PlayState()); return false; diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx index 400c271..35af037 100644 --- a/source/OptionsMenu.hx +++ b/source/OptionsMenu.hx @@ -140,20 +140,21 @@ class OptionsMenu extends MusicBeatState case 'Scroll Speed': if (FlxG.keys.justPressed.RIGHT) - FlxG.save.data.scrollSpeed+=0.1; + FlxG.save.data.scrollSpeed += 0.1; if (FlxG.keys.justPressed.LEFT) - FlxG.save.data.scrollSpeed-=0.1; + FlxG.save.data.scrollSpeed -= 0.1; // caps - if (FlxG.save.data.scrollSpeed < 0) - FlxG.save.data.scrollSpeed = 0.1; + if (FlxG.save.data.scrollSpeed < 1) + FlxG.save.data.scrollSpeed = 1; if (FlxG.save.data.scrollSpeed > 10) FlxG.save.data.scrollSpeed = 10; - versionShit.text = "Current Scroll Speed: " + FlxG.save.data.scrollSpeed + " - Description - " + currentDescription; + + versionShit.text = "Current Scroll Speed: " + truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + currentDescription; default: if (FlxG.keys.pressed.RIGHT) FlxG.save.data.offset += 0.01; diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx index 11df85a..fa7dbf3 100644 --- a/source/PauseSubState.hx +++ b/source/PauseSubState.hx @@ -109,7 +109,13 @@ class PauseSubState extends MusicBeatSubstate FlxG.resetState(); case "Exit to menu": PlayState.loadRep = false; - FlxG.switchState(new MainMenuState()); + if (PlayState.offsetTesting) + { + PlayState.offsetTesting = false; + FlxG.switchState(new OptionsMenu()); + } + else + FlxG.switchState(new MainMenuState()); } } diff --git a/source/PlayState.hx b/source/PlayState.hx index 702cf49..762695d 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1972,6 +1972,7 @@ class PlayState extends MusicBeatState if (offsetTesting) { FlxG.sound.playMusic(Paths.music('freakyMenu')); + offsetTesting = false; LoadingState.loadAndSwitchState(new OptionsMenu()); FlxG.save.data.offset = offsetTest; } diff --git a/version.downloadMe b/version.downloadMe index 6261a05..840ca8c 100644 --- a/version.downloadMe +++ b/version.downloadMe @@ -1 +1 @@ -1.3.1 \ No newline at end of file +1.4 \ No newline at end of file