updates lol!

This commit is contained in:
KadeDev 2021-03-22 14:36:32 -07:00
parent b4252e3d56
commit 4115b7d602
4 changed files with 20 additions and 4 deletions

View File

@ -24,5 +24,8 @@ class KadeEngineData
if (FlxG.save.data.songPosition == null) if (FlxG.save.data.songPosition == null)
FlxG.save.data.songPosition = false; FlxG.save.data.songPosition = false;
if (FlxG.save.data.etternaMode == null)
FlxG.save.data.etternaMode = false;
} }
} }

View File

@ -31,6 +31,7 @@ class OptionsMenu extends MusicBeatState
"\n" + (FlxG.save.data.downscroll ? 'Downscroll' : 'Upscroll') + "\n" + (FlxG.save.data.downscroll ? 'Downscroll' : 'Upscroll') +
"\nAccuracy " + (!FlxG.save.data.accuracyDisplay ? "off" : "on") + "\nAccuracy " + (!FlxG.save.data.accuracyDisplay ? "off" : "on") +
"\nSong Position " + (!FlxG.save.data.songPosition ? "off" : "on") + "\nSong Position " + (!FlxG.save.data.songPosition ? "off" : "on") +
"\nEtterna Mode " + (!FlxG.save.data.etternaMode ? "off" : "on") +
"\nLoad replays"); "\nLoad replays");
trace(controlsStrings); trace(controlsStrings);
@ -89,7 +90,7 @@ class OptionsMenu extends MusicBeatState
if (controls.ACCEPT) if (controls.ACCEPT)
{ {
if (curSelected != 5) if (curSelected != 6)
grpControls.remove(grpControls.members[curSelected]); grpControls.remove(grpControls.members[curSelected]);
switch(curSelected) switch(curSelected)
{ {
@ -129,6 +130,12 @@ class OptionsMenu extends MusicBeatState
ctrl.targetY = curSelected - 4; ctrl.targetY = curSelected - 4;
grpControls.add(ctrl); grpControls.add(ctrl);
case 5: 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 - 5;
grpControls.add(ctrl);
case 6:
trace('switch'); trace('switch');
FlxG.switchState(new LoadReplayState()); FlxG.switchState(new LoadReplayState());
} }

View File

@ -166,6 +166,12 @@ class PlayState extends MusicBeatState
override public function create() override public function create()
{ {
if (FlxG.save.data.etternaMode)
Conductor.safeFrames = 7; // 116ms hit window (j3-4)
else
Conductor.safeFrames = 10; // 166ms hit window (j1)
theFunne = FlxG.save.data.newInput; theFunne = FlxG.save.data.newInput;
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
FlxG.sound.music.stop(); FlxG.sound.music.stop();
@ -1472,7 +1478,7 @@ class PlayState extends MusicBeatState
ranking = "(SDCB)"; ranking = "(SDCB)";
else if (misses == 0 && (shits >= 10 || bads >= 10)) // Regular FC else if (misses == 0 && (shits >= 10 || bads >= 10)) // Regular FC
ranking = "(FC)"; ranking = "(FC)";
else if (misses >= 1) // Combo Broken else if (misses >= 1 || (shits >= 10 || bads >= 10)) // Combo Breaks
ranking = "(CB)"; ranking = "(CB)";
// WIFE TIME :)))) (based on Wife3) // WIFE TIME :)))) (based on Wife3)
@ -2085,7 +2091,7 @@ class PlayState extends MusicBeatState
ss = false; ss = false;
goods++; goods++;
} }
else if (noteDiff > Conductor.safeZoneOffset * 0.25) else if (noteDiff > Conductor.safeZoneOffset * 0.35)
{ {
daRating = 'good'; daRating = 'good';
totalNotesHit += 0.65 - wife; totalNotesHit += 0.65 - wife;

View File

@ -1 +1 @@
1.2.2 1.3