Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

Commit

Permalink
updates lol!
Browse files Browse the repository at this point in the history
  • Loading branch information
Kade-github committed Mar 22, 2021
1 parent b4252e3 commit 4115b7d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
3 changes: 3 additions & 0 deletions source/KadeEngineData.hx
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@ class KadeEngineData

if (FlxG.save.data.songPosition == null)
FlxG.save.data.songPosition = false;

if (FlxG.save.data.etternaMode == null)
FlxG.save.data.etternaMode = false;
}
}
9 changes: 8 additions & 1 deletion source/OptionsMenu.hx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ 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") +
"\nEtterna Mode " + (!FlxG.save.data.etternaMode ? "off" : "on") +
"\nLoad replays");

trace(controlsStrings);
Expand Down Expand Up @@ -89,7 +90,7 @@ class OptionsMenu extends MusicBeatState

if (controls.ACCEPT)
{
if (curSelected != 5)
if (curSelected != 6)
grpControls.remove(grpControls.members[curSelected]);
switch(curSelected)
{
Expand Down Expand Up @@ -129,6 +130,12 @@ class OptionsMenu extends MusicBeatState
ctrl.targetY = curSelected - 4;
grpControls.add(ctrl);
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');
FlxG.switchState(new LoadReplayState());
}
Expand Down
10 changes: 8 additions & 2 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ class PlayState extends MusicBeatState
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;
if (FlxG.sound.music != null)
FlxG.sound.music.stop();
Expand Down Expand Up @@ -1472,7 +1478,7 @@ class PlayState extends MusicBeatState
ranking = "(SDCB)";
else if (misses == 0 && (shits >= 10 || bads >= 10)) // Regular FC
ranking = "(FC)";
else if (misses >= 1) // Combo Broken
else if (misses >= 1 || (shits >= 10 || bads >= 10)) // Combo Breaks
ranking = "(CB)";

// WIFE TIME :)))) (based on Wife3)
Expand Down Expand Up @@ -2085,7 +2091,7 @@ class PlayState extends MusicBeatState
ss = false;
goods++;
}
else if (noteDiff > Conductor.safeZoneOffset * 0.25)
else if (noteDiff > Conductor.safeZoneOffset * 0.35)
{
daRating = 'good';
totalNotesHit += 0.65 - wife;
Expand Down
2 changes: 1 addition & 1 deletion version.downloadMe
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.2
1.3

0 comments on commit 4115b7d

Please sign in to comment.