AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit_fuckyou

Browse Source
This commit is contained in:
KadeDev 2021-03-22 19:06:36 -07:00
parent ea83641799
commit 9181f41b69
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/PlayState.hx
View File

@ -1590,7 +1590,7 @@ class PlayState extends MusicBeatState
if (FlxG.save.data.accuracyDisplay) if (FlxG.save.data.accuracyDisplay)
{ {
scoreTxt.text = "Score:" + songScore + " | Misses:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% | " + generateRanking(); scoreTxt.text = "Score:" + (FlxG.save.data.etternaMode ? etternaModeScore + " (" + songScore + ")" : "" + songScore) + " | Misses:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% | " + generateRanking();
} }
else else
{ {
@ -1894,7 +1894,7 @@ class PlayState extends MusicBeatState
health -= 0.075; health -= 0.075;
vocals.volume = 0; vocals.volume = 0;
if (theFunne) if (theFunne)
noteMiss(daNote.noteData); noteMiss(daNote.noteData, daNote);
} }
daNote.active = false; daNote.active = false;
@ -2108,7 +2108,9 @@ class PlayState extends MusicBeatState
sicks++; sicks++;
} }
trace('Weight: ' + wife);
if (FlxG.save.data.etternaMode)
etternaModeScore += Math.round(score / wife);
// trace('Wife accuracy loss: ' + wife + ' | Rating: ' + daRating + ' | Score: ' + score + ' | Weight: ' + (1 - wife)); // trace('Wife accuracy loss: ' + wife + ' | Rating: ' + daRating + ' | Score: ' + score + ' | Weight: ' + (1 - wife));
@ -2376,8 +2378,6 @@ class PlayState extends MusicBeatState
if (controlArray[ignoreList[shit]]) if (controlArray[ignoreList[shit]])
inIgnoreList = true; inIgnoreList = true;
} }
if (!inIgnoreList && !theFunne)
badNoteCheck();
} }
} }
} }
@ -2459,10 +2459,6 @@ class PlayState extends MusicBeatState
daNote.destroy(); daNote.destroy();
} }
} }
else if (!theFunne)
{
badNoteCheck();
}
} }
if ((up || right || down || left) && generatedMusic || (upHold || downHold || leftHold || rightHold) && loadRep && generatedMusic) if ((up || right || down || left) && generatedMusic || (upHold || downHold || leftHold || rightHold) && loadRep && generatedMusic)
@ -2551,7 +2547,7 @@ class PlayState extends MusicBeatState
}); });
} }
function noteMiss(direction:Int = 1):Void function noteMiss(direction:Int = 1, daNote:Note):Void
{ {
if (!boyfriend.stunned) if (!boyfriend.stunned)
{ {
@ -2563,6 +2559,11 @@ class PlayState extends MusicBeatState
combo = 0; combo = 0;
misses++; misses++;
var noteDiff:Float = Math.abs(daNote.strumTime - Conductor.songPosition);
var wife:Float = EtternaFunctions.wife3(noteDiff, 1);
totalNotesHit += wife;
songScore -= 10; songScore -= 10;
FlxG.sound.play(Paths.soundRandom('missnote', 1, 3), FlxG.random.float(0.1, 0.2)); FlxG.sound.play(Paths.soundRandom('missnote', 1, 3), FlxG.random.float(0.1, 0.2));
@ -2585,7 +2586,7 @@ class PlayState extends MusicBeatState
} }
} }
function badNoteCheck() /*function badNoteCheck()
{ {
// just double pasting this shit cuz fuk u // just double pasting this shit cuz fuk u
// REDO THIS SYSTEM! // REDO THIS SYSTEM!
@ -2604,7 +2605,7 @@ class PlayState extends MusicBeatState
noteMiss(1); noteMiss(1);
updateAccuracy(); updateAccuracy();
} }
*/
function updateAccuracy() function updateAccuracy()
{ {
if (misses > 0 || accuracy < 96) if (misses > 0 || accuracy < 96)
@ -2612,9 +2613,7 @@ class PlayState extends MusicBeatState
else else
fc = true; fc = true;
totalPlayed += 1; totalPlayed += 1;
accuracy = totalNotesHit / totalPlayed * 100; accuracy = Math.max(0,totalNotesHit / totalPlayed * 100);
trace('Notes Hit: ' + totalNotesHit + ' / ' + totalPlayed + ' = ' + accuracy);
trace(accuracy);
} }
@ -2638,22 +2637,20 @@ class PlayState extends MusicBeatState
var mashing:Int = 0; var mashing:Int = 0;
var mashViolations:Int = 0; var mashViolations:Int = 0;
var etternaModeScore:Int = 0;
function noteCheck(controlArray:Array<Bool>, note:Note):Void // sorry lol function noteCheck(controlArray:Array<Bool>, note:Note):Void // sorry lol
{ {
if (loadRep) if (loadRep)
{ {
if (controlArray[note.noteData]) if (controlArray[note.noteData])
goodNoteHit(note); goodNoteHit(note);
else if (!theFunne)
badNoteCheck();
else if (rep.replay.keyPresses.length > repPresses && !controlArray[note.noteData]) else if (rep.replay.keyPresses.length > repPresses && !controlArray[note.noteData])
{ {
if (NearlyEquals(note.strumTime,rep.replay.keyPresses[repPresses].time, 4)) if (NearlyEquals(note.strumTime,rep.replay.keyPresses[repPresses].time, 4))
{ {
goodNoteHit(note); goodNoteHit(note);
} }
else if (!theFunne)
badNoteCheck();
} }
} }
else if (controlArray[note.noteData]) else if (controlArray[note.noteData])
@ -2679,10 +2676,6 @@ class PlayState extends MusicBeatState
if (mashing != 0) if (mashing != 0)
mashing = 0; mashing = 0;
} }
else if (!theFunne)
{
badNoteCheck();
}
} }
function goodNoteHit(note:Note, resetMashViolation = true):Void function goodNoteHit(note:Note, resetMashViolation = true):Void