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

Merge branch 'master' into master

Browse Source
This commit is contained in:
CuckyDev
2021-07-11 18:38:20 -04:00
committed by GitHub
parent 321badd0b2 55415c9864
commit 6876a48875
4 changed files with 3118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
source/PlayState.hx
View File

@ -2794,16 +2794,20 @@ class PlayState extends MusicBeatState
daNote.visible = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].visible;
daNote.x = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].x;
if (!daNote.isSustainNote)
daNote.modAngle = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].angle;
daNote.alpha = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].alpha;
daNote.angle = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].angle;
if (daNote.sustainActive)
daNote.alpha = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].alpha;
daNote.modAngle = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].angle;
}
else if (!daNote.wasGoodHit && !daNote.modifiedByLua)
{
daNote.visible = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].visible;
daNote.x = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].x;
if (!daNote.isSustainNote)
daNote.modAngle = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].angle;
daNote.alpha = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].alpha;
daNote.angle = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].angle;
if (daNote.sustainActive)
daNote.alpha = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].alpha;
daNote.modAngle = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].angle;
}
if (daNote.isSustainNote)
@ -2825,11 +2829,6 @@ class PlayState extends MusicBeatState
{
daNote.kill();
notes.remove(daNote, true);
if (!daNote.isParent)
{
for(i in daNote.parent.children)
i.sustainActive = false;
}
}
else
{
@ -2840,29 +2839,33 @@ class PlayState extends MusicBeatState
totalNotesHit += 1;
else
{
if (daNote.isSustainNote)
{
daNote.kill();
notes.remove(daNote, true);
}
else
{
if (!daNote.isSustainNote)
health -= 0.075;
vocals.volume = 0;
if (theFunne)
noteMiss(daNote.noteData, daNote);
}
vocals.volume = 0;
if (theFunne && daNote.sustainActive)
noteMiss(daNote.noteData, daNote);
}
}
else
{
health -= 0.075;
if (!daNote.isSustainNote)
health -= 0.075;
vocals.volume = 0;
if (theFunne)
if (theFunne && daNote.sustainActive)
noteMiss(daNote.noteData, daNote);
}
}
if (!daNote.wasGoodHit && daNote.isSustainNote && daNote.sustainActive && daNote.spotInLine != daNote.parent.children.length)
{
health -= 0.2; // give a health punishment for failing a LN
trace("hold fell over at " + daNote.spotInLine);
for(i in daNote.parent.children)
{
i.sustainActive = false;
}
}
daNote.visible = false;
daNote.kill();
notes.remove(daNote, true);
@ -3092,7 +3095,7 @@ class PlayState extends MusicBeatState
score = -300;
combo = 0;
misses++;
health -= 0.2;
health -= 0.35;
ss = false;
shits++;
if (FlxG.save.data.accuracyMod == 0)
@ -3100,7 +3103,7 @@ class PlayState extends MusicBeatState
case 'bad':
daRating = 'bad';
score = 0;
health -= 0.06;
health -= 0.1;
ss = false;
bads++;
if (FlxG.save.data.accuracyMod == 0)
@ -3111,12 +3114,12 @@ class PlayState extends MusicBeatState
ss = false;
goods++;
if (health < 2)
health += 0.04;
health += 0.02;
if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 0.75;
case 'sick':
if (health < 2)
health += 0.1;
health += 0.15;
if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 1;
sicks++;
@ -3680,7 +3683,7 @@ class PlayState extends MusicBeatState
{
if (!boyfriend.stunned)
{
health -= 0.04;
//health -= 0.2;
if (combo > 5 && gf.animOffsets.exists('sad'))
{
gf.playAnim('sad');
@ -3718,8 +3721,14 @@ class PlayState extends MusicBeatState
if (FlxG.save.data.accuracyMod == 1)
totalNotesHit -= 1;
songScore -= 10;
if (daNote != null)
{
if (!daNote.isSustainNote)
songScore -= 10;
}
else
songScore -= 10;
FlxG.sound.play(Paths.soundRandom('missnote', 1, 3), FlxG.random.float(0.1, 0.2));
// FlxG.sound.play(Paths.sound('missnote1'), 1, false);
// FlxG.log.add('played imss note');