diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx index 1dea8a7..68ee6e7 100644 --- a/source/OptionsMenu.hx +++ b/source/OptionsMenu.hx @@ -17,8 +17,6 @@ class OptionsMenu extends MusicBeatState { var selector:FlxText; var curSelected:Int = 0; - var chartSpeed:FlxText; - var speedState:String; var controlsStrings:Array = []; @@ -33,7 +31,6 @@ class OptionsMenu extends MusicBeatState "\n" + (FlxG.save.data.downscroll ? 'Downscroll' : 'Upscroll') + "\nAccuracy " + (!FlxG.save.data.accuracyDisplay ? "off" : "on") + "\nSong Position " + (!FlxG.save.data.songPosition ? "off" : "on") + - "\nNote Speed" + "\nEtterna Mode " + (!FlxG.save.data.etternaMode ? "off" : "on") + "\nLoad replays"); @@ -64,20 +61,6 @@ class OptionsMenu extends MusicBeatState versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(versionShit); - var tmp_Speed:Float = FlxG.save.data.noteSpeed; - - chartSpeed = new FlxText(FlxG.width - 387, FlxG.height - 18, 0, "Note Speed (Hover, then Left and Right): " + tmp_Speed, 12); - chartSpeed.scrollFactor.set(); - chartSpeed.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); - - if(tmp_Speed == -1) chartSpeed.x = FlxG.width - 470; - else if(tmp_Speed == 1.5 || tmp_Speed == 2.5 || tmp_Speed == 3.5) chartSpeed.x = FlxG.width - 405; - else chartSpeed.x = FlxG.width - 387; - - if(FlxG.save.data.noteSpeed > 0) chartSpeed.text = "Note Speed (Hover, then Left and Right): " + FlxG.save.data.noteSpeed.toString(); - else chartSpeed.text = "Note Speed (Hover, then Left and Right): Song Based"; - add(chartSpeed); - super.create(); } @@ -94,72 +77,21 @@ class OptionsMenu extends MusicBeatState if (controls.RIGHT_R) { - if(curSelected != 5) - { - FlxG.save.data.offset++; - versionShit.text = "Offset (Left, Right): " + FlxG.save.data.offset; - }else { - if(FlxG.save.data.noteSpeed < 4.0) - if(FlxG.save.data.noteSpeed == -1) FlxG.save.data.noteSpeed = 1.0; - else FlxG.save.data.noteSpeed += 0.5; - - grpControls.remove(grpControls.members[curSelected]); - var ctrl:Alphabet = new Alphabet(0, (70 * curSelected) + 30, "Note Speed", true, false); - ctrl.isMenuItem = true; - ctrl.targetY = curSelected - 5; - grpControls.add(ctrl); - - if(FlxG.save.data.noteSpeed > 0) speedState = FlxG.save.data.noteSpeed.toString(); - else speedState = "Song Based"; - - chartSpeed.text = "Note Speed (Hover, then Left and Right): " + speedState; - - trace(FlxG.save.data.noteSpeed); - } + FlxG.save.data.offset++; + versionShit.text = "Offset (Left, Right): " + FlxG.save.data.offset; } if (controls.LEFT_R) - { - if(curSelected != 5) { FlxG.save.data.offset--; versionShit.text = "Offset (Left, Right): " + FlxG.save.data.offset; - }else { - if(FlxG.save.data.noteSpeed > 1.0) FlxG.save.data.noteSpeed -= 0.5; - else FlxG.save.data.noteSpeed = -1; - - trace(FlxG.save.data.noteSpeed); - var speedState = ""; - - if(FlxG.save.data.noteSpeed > 0) speedState = FlxG.save.data.noteSpeed.toString(); - else speedState = "Song Based"; - - chartSpeed.text = "Note Speed (Hover, then Left and Right): " + speedState; - - grpControls.remove(grpControls.members[curSelected]); - var ctrl:Alphabet = new Alphabet(0, (70 * curSelected) + 30, "Note Speed", true, false); - ctrl.isMenuItem = true; - ctrl.targetY = curSelected - 5; - grpControls.add(ctrl); - - trace(FlxG.save.data.noteSpeed); } - } - if(controls.LEFT_R && curSelected == 5 || controls.RIGHT_R && curSelected == 5 ) - { - var tmp_Speed:Float = FlxG.save.data.noteSpeed; - - if(tmp_Speed == -1) chartSpeed.x = FlxG.width - 470; - else if(tmp_Speed == 1.5 || tmp_Speed == 2.5 || tmp_Speed == 3.5) chartSpeed.x = FlxG.width - 405; - else chartSpeed.x = FlxG.width - 387; - } if (controls.ACCEPT) { - if (curSelected != 7 && curSelected != 5) + if (curSelected != 6) grpControls.remove(grpControls.members[curSelected]); - switch(curSelected) { case 0: @@ -197,13 +129,13 @@ class OptionsMenu extends MusicBeatState ctrl.isMenuItem = true; ctrl.targetY = curSelected - 4; grpControls.add(ctrl); - case 6: + case 5: FlxG.save.data.etternaMode = !FlxG.save.data.etternaMode; var ctrl:Alphabet = new Alphabet(0, (70 * curSelected) + 30, "Etterna Mode " + (!FlxG.save.data.etternaMode ? "off" : "on"), true, false); ctrl.isMenuItem = true; - ctrl.targetY = curSelected - 6; + ctrl.targetY = curSelected - 5; grpControls.add(ctrl); - case 7: + case 6: trace('switch'); FlxG.switchState(new LoadReplayState()); }