diff --git a/source/Options.hx b/source/Options.hx index cb39f74..b4764ca 100644 --- a/source/Options.hx +++ b/source/Options.hx @@ -63,6 +63,7 @@ class Option return description; } + public function getValue():String { return throw "stub!"; }; // Returns whether the label is to be updated. public function press():Bool { return throw "stub!"; } @@ -274,14 +275,16 @@ class Judgement extends Option FlxG.save.data.frames = Conductor.safeFrames; Conductor.recalculateTimings(); + return true; + } - OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + + override function getValue():String { + return Conductor.safeFrames + " - " + " - SIK: " + HelperFunctions.truncateFloat(45 * Conductor.timeScale, 0) + "ms GD: " + HelperFunctions.truncateFloat(90 * Conductor.timeScale, 0) + "ms BD: " + HelperFunctions.truncateFloat(135 * Conductor.timeScale, 0) + "ms SHT: " + HelperFunctions.truncateFloat(155 * Conductor.timeScale, 0) + "ms TOTAL: " + HelperFunctions.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; - return true; } override function right():Bool { @@ -293,13 +296,6 @@ class Judgement extends Option FlxG.save.data.frames = Conductor.safeFrames; Conductor.recalculateTimings(); - - OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + - " - SIK: " + HelperFunctions.truncateFloat(44 * Conductor.timeScale, 0) + - "ms GD: " + HelperFunctions.truncateFloat(45 * Conductor.timeScale, 0) + - "ms BD: " + HelperFunctions.truncateFloat(90 * Conductor.timeScale, 0) + - "ms SHT: " + HelperFunctions.truncateFloat(135 * Conductor.timeScale, 0) + - "ms TOTAL: " + HelperFunctions.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; return true; } } @@ -357,8 +353,6 @@ class FPSCapOption extends Option FlxG.save.data.fpsCap = FlxG.save.data.fpsCap + 10; (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); - OptionsMenu.versionShit.text = "Current FPS Cap: " + FlxG.save.data.fpsCap + " - Description - " + description; - return true; } @@ -370,13 +364,14 @@ class FPSCapOption extends Option else FlxG.save.data.fpsCap = FlxG.save.data.fpsCap - 10; (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); - - OptionsMenu.versionShit.text = "Current FPS Cap: " + FlxG.save.data.fpsCap + - (FlxG.save.data.fpsCap == Application.current.window.displayMode.refreshRate ? "Hz (Refresh Rate)" : "") - + " - Description - " + description; - return true; } + + override function getValue():String + { + return "Current FPS Cap: " + FlxG.save.data.fpsCap + + (FlxG.save.data.fpsCap == Application.current.window.displayMode.refreshRate ? "Hz (Refresh Rate)" : ""); + } } @@ -407,11 +402,13 @@ class ScrollSpeedOption extends Option if (FlxG.save.data.scrollSpeed > 10) FlxG.save.data.scrollSpeed = 10; - - OptionsMenu.versionShit.text = "Current Scroll Speed: " + HelperFunctions.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description; return true; } + override function getValue():String { + return "Current Scroll Speed: " + HelperFunctions.truncateFloat(FlxG.save.data.scrollSpeed,1); + } + override function left():Bool { FlxG.save.data.scrollSpeed -= 0.1; @@ -421,8 +418,6 @@ class ScrollSpeedOption extends Option if (FlxG.save.data.scrollSpeed > 10) FlxG.save.data.scrollSpeed = 10; - - OptionsMenu.versionShit.text = "Current Scroll Speed: " + HelperFunctions.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description; return true; } } @@ -602,4 +597,4 @@ class BotPlay extends Option private override function updateDisplay():String return "BotPlay " + (FlxG.save.data.botplay ? "on" : "off"); -} \ No newline at end of file +}