Merge pull request #5 from Kiffolisk/patch-3

accuracy display shits
This commit is contained in:
Kade M 2021-03-10 11:43:56 -08:00 committed by GitHub
commit b62cd08fb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions

View File

@ -33,8 +33,11 @@ class OptionsMenu extends MusicBeatState
if (FlxG.save.data.dfjk == null) if (FlxG.save.data.dfjk == null)
FlxG.save.data.dfjk = false; FlxG.save.data.dfjk = false;
if (FlxG.save.data.accuracyDisplay == null)
FlxG.save.data.accuracyDisplay = true;
var menuBG:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat')); var menuBG:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
controlsStrings = CoolUtil.coolStringFile((FlxG.save.data.dfjk ? 'DFJK' : 'WASD') + "\n" + (FlxG.save.data.newInput ? "New input" : "Old Input") + "\n" + (FlxG.save.data.downscroll ? 'Downscroll' : 'Upscroll') + "\nLoad replays"); controlsStrings = CoolUtil.coolStringFile((FlxG.save.data.dfjk ? 'DFJK' : 'WASD') + "\n" + (FlxG.save.data.newInput ? "New input" : "Old Input") + "\n" + (FlxG.save.data.downscroll ? 'Downscroll' : 'Upscroll') + "\nToggle accuracy display " + (FlxG.save.data.accuracyDisplay ? "off" : "on") + "\nLoad replays");
trace(controlsStrings); trace(controlsStrings);
@ -92,7 +95,7 @@ class OptionsMenu extends MusicBeatState
if (controls.ACCEPT) if (controls.ACCEPT)
{ {
if (curSelected != 3) if (curSelected != 4)
grpControls.remove(grpControls.members[curSelected]); grpControls.remove(grpControls.members[curSelected]);
switch(curSelected) switch(curSelected)
{ {
@ -120,6 +123,12 @@ class OptionsMenu extends MusicBeatState
ctrl.targetY = curSelected - 2; ctrl.targetY = curSelected - 2;
grpControls.add(ctrl); grpControls.add(ctrl);
case 3: case 3:
FlxG.save.data.accuracyDisplay = !FlxG.save.data.accuracyDisplay;
var ctrl:Alphabet = new Alphabet(0, (70 * curSelected) + 30, "Toggle accuracy display " + (FlxG.save.data.accuracyDisplay ? "off" : "on"), true, false)
ctrl.isMenuItem = true;
ctrl.targetY = curSelected - 3;
grpControls.add(ctrl);
case 4:
trace('switch'); trace('switch');
FlxG.switchState(new LoadReplayState()); FlxG.switchState(new LoadReplayState());
} }

View File

@ -1336,8 +1336,14 @@ class PlayState extends MusicBeatState
super.update(elapsed); super.update(elapsed);
if (FlxG.save.data.accuracyDisplay)
{
scoreTxt.text = "Score:" + songScore + " | Misses:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% " + (fc ? "| FC" : misses == 0 ? "| A" : accuracy <= 75 ? "| BAD" : ""); scoreTxt.text = "Score:" + songScore + " | Misses:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% " + (fc ? "| FC" : misses == 0 ? "| A" : accuracy <= 75 ? "| BAD" : "");
}
else
{
scoreTxt.text = "Score:" + songScore);
}
if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause) if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause)
{ {
persistentUpdate = false; persistentUpdate = false;