funny stuff

This commit is contained in:
Kade M 2021-07-11 19:00:46 -07:00
parent d6d3bb340f
commit 361555cfa3
2 changed files with 68 additions and 15 deletions

View File

@ -218,8 +218,12 @@ class Note extends FlxSprite
angle = modAngle + localAngle; angle = modAngle + localAngle;
if (!modifiedByLua) if (!modifiedByLua)
{
if (!sustainActive) if (!sustainActive)
alpha = 0.4; {
alpha = 0.3;
}
}
if (mustPress) if (mustPress)
{ {

View File

@ -2856,6 +2856,35 @@ class PlayState extends MusicBeatState
vocals.volume = 0; vocals.volume = 0;
if (theFunne && !daNote.isSustainNote) if (theFunne && !daNote.isSustainNote)
noteMiss(daNote.noteData, daNote); noteMiss(daNote.noteData, daNote);
if (daNote.isParent)
{
health -= 0.20; // give a health punishment for failing a LN
trace("hold fell over at the start");
for (i in daNote.children)
{
i.alpha = 0.3;
i.sustainActive = false;
}
}
else
{
if (!daNote.wasGoodHit
&& daNote.isSustainNote
&& daNote.sustainActive
&& daNote.spotInLine != daNote.parent.children.length)
{
health -= 0.20; // give a health punishment for failing a LN
trace("hold fell over at " + daNote.spotInLine);
for (i in daNote.parent.children)
{
i.alpha = 0.3;
i.sustainActive = false;
}
if (daNote.parent.wasGoodHit)
misses++;
updateAccuracy();
}
}
} }
} }
else else
@ -2865,9 +2894,20 @@ class PlayState extends MusicBeatState
vocals.volume = 0; vocals.volume = 0;
if (theFunne && !daNote.isSustainNote) if (theFunne && !daNote.isSustainNote)
noteMiss(daNote.noteData, daNote); noteMiss(daNote.noteData, daNote);
}
}
if (daNote.isParent)
{
health -= 0.20; // give a health punishment for failing a LN
trace("hold fell over at the start");
for (i in daNote.children)
{
i.alpha = 0.3;
i.sustainActive = false;
trace(i.alpha);
}
}
else
{
if (!daNote.wasGoodHit if (!daNote.wasGoodHit
&& daNote.isSustainNote && daNote.isSustainNote
&& daNote.sustainActive && daNote.sustainActive
@ -2876,7 +2916,17 @@ class PlayState extends MusicBeatState
health -= 0.20; // give a health punishment for failing a LN health -= 0.20; // give a health punishment for failing a LN
trace("hold fell over at " + daNote.spotInLine); trace("hold fell over at " + daNote.spotInLine);
for (i in daNote.parent.children) for (i in daNote.parent.children)
{
i.alpha = 0.3;
i.sustainActive = false; i.sustainActive = false;
trace(i.alpha);
}
if (daNote.parent.wasGoodHit)
misses++;
updateAccuracy();
}
}
}
} }
daNote.visible = false; daNote.visible = false;
@ -3116,7 +3166,7 @@ class PlayState extends MusicBeatState
case 'bad': case 'bad':
daRating = 'bad'; daRating = 'bad';
score = 0; score = 0;
health -= 0.02; health -= 0.03;
ss = false; ss = false;
bads++; bads++;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
@ -3130,7 +3180,7 @@ class PlayState extends MusicBeatState
totalNotesHit += 0.75; totalNotesHit += 0.75;
case 'sick': case 'sick':
if (health < 2) if (health < 2)
health += 0.02; health += 0.04;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 1; totalNotesHit += 1;
sicks++; sicks++;
@ -3782,7 +3832,6 @@ class PlayState extends MusicBeatState
*/ */
function updateAccuracy() function updateAccuracy()
{ {
trace(totalPlayed + "/" + totalNotesHit);
totalPlayed += 1; totalPlayed += 1;
accuracy = Math.max(0, totalNotesHit / totalPlayed * 100); accuracy = Math.max(0, totalNotesHit / totalPlayed * 100);
accuracyDefault = Math.max(0, totalNotesHitDefault / totalPlayed * 100); accuracyDefault = Math.max(0, totalNotesHitDefault / totalPlayed * 100);