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

wife accuracy things

Browse Source
This commit is contained in:
KadeDev 2021-03-22 13:44:34 -07:00
parent d05c3e6ace
commit 359e9d2b06
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/PlayState.hx
View File

@ -1997,6 +1997,7 @@ class PlayState extends MusicBeatState
private function popUpScore(strumtime:Float):Void private function popUpScore(strumtime:Float):Void
{ {
var noteDiff:Float = Math.abs(strumtime - Conductor.songPosition); var noteDiff:Float = Math.abs(strumtime - Conductor.songPosition);
var wife:Float = noteDiff / 1000;
// boyfriend.playAnim('hey'); // boyfriend.playAnim('hey');
vocals.volume = 1; vocals.volume = 1;
@ -2015,7 +2016,7 @@ class PlayState extends MusicBeatState
if (noteDiff > Conductor.safeZoneOffset * 2) if (noteDiff > Conductor.safeZoneOffset * 2)
{ {
daRating = 'shit'; daRating = 'shit';
totalNotesHit -= 2; totalNotesHit -= 2 - wife;
ss = false; ss = false;
if (theFunne) if (theFunne)
{ {
@ -2029,7 +2030,7 @@ class PlayState extends MusicBeatState
else if (noteDiff < Conductor.safeZoneOffset * -2) else if (noteDiff < Conductor.safeZoneOffset * -2)
{ {
daRating = 'shit'; daRating = 'shit';
totalNotesHit -= 2; totalNotesHit -= 2 - wife;
if (theFunne) if (theFunne)
{ {
score = -3000; score = -3000;
@ -2043,7 +2044,7 @@ class PlayState extends MusicBeatState
else if (noteDiff < Conductor.safeZoneOffset * -0.45) else if (noteDiff < Conductor.safeZoneOffset * -0.45)
{ {
daRating = 'bad'; daRating = 'bad';
totalNotesHit += 0.2; totalNotesHit += 0.2 - wife;
if (theFunne) if (theFunne)
{ {
score = -1000; score = -1000;
@ -2058,7 +2059,7 @@ class PlayState extends MusicBeatState
else if (noteDiff > Conductor.safeZoneOffset * 0.45) else if (noteDiff > Conductor.safeZoneOffset * 0.45)
{ {
daRating = 'bad'; daRating = 'bad';
totalNotesHit += 0.2; totalNotesHit += 0.2 - wife;
if (theFunne) if (theFunne)
{ {
score = -1000; score = -1000;
@ -2073,7 +2074,7 @@ class PlayState extends MusicBeatState
else if (noteDiff < Conductor.safeZoneOffset * -0.25) else if (noteDiff < Conductor.safeZoneOffset * -0.25)
{ {
daRating = 'good'; daRating = 'good';
totalNotesHit += 0.65; totalNotesHit += 0.65 - wife;
if (theFunne) if (theFunne)
{ {
score = 200; score = 200;
@ -2087,7 +2088,7 @@ class PlayState extends MusicBeatState
else if (noteDiff > Conductor.safeZoneOffset * 0.25) else if (noteDiff > Conductor.safeZoneOffset * 0.25)
{ {
daRating = 'good'; daRating = 'good';
totalNotesHit += 0.65; totalNotesHit += 0.65 - wife;
if (theFunne) if (theFunne)
{ {
score = 200; score = 200;
@ -2100,12 +2101,14 @@ class PlayState extends MusicBeatState
} }
if (daRating == 'sick') if (daRating == 'sick')
{ {
totalNotesHit += 1; totalNotesHit += 1 - wife;
if (health < 2) if (health < 2)
health += 0.1; health += 0.1;
sicks++; sicks++;
} }
trace(noteDiff);
if (daRating != 'shit' || daRating != 'bad') if (daRating != 'shit' || daRating != 'bad')
{ {
@ -2622,6 +2625,8 @@ class PlayState extends MusicBeatState
possibleNotes.sort((a, b) -> Std.int(a.strumTime - b.strumTime)); possibleNotes.sort((a, b) -> Std.int(a.strumTime - b.strumTime));
} }
}); });
if (possibleNotes.length == 1)
return possibleNotes.length + 1;
return possibleNotes.length; return possibleNotes.length;
} }
@ -2655,10 +2660,10 @@ class PlayState extends MusicBeatState
// ANTI MASH CODE FOR THE BOYS // ANTI MASH CODE FOR THE BOYS
if (mashing <= getKeyPresses(note) + 1 && mashViolations < 2) if (mashing <= getKeyPresses(note) && mashViolations < 2)
{ {
mashViolations++; mashViolations++;
goodNoteHit(note, (mashing <= getKeyPresses(note) + 1)); goodNoteHit(note, (mashing <= getKeyPresses(note)));
} }
else else
{ {