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

fix some stuff and LN work

Browse Source
This commit is contained in:
Kade M 2021-07-11 15:32:55 -07:00
parent 2897fdc489
commit 9a7a4b3463
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Note.hx
View File

@ -76,7 +76,7 @@ class Note extends FlxSprite
//defaults if no noteStyle was found in chart //defaults if no noteStyle was found in chart
var noteTypeCheck:String = 'normal'; var noteTypeCheck:String = 'normal';
if (!inCharter) if (inCharter)
{ {
frames = Paths.getSparrowAtlas('NOTE_assets'); frames = Paths.getSparrowAtlas('NOTE_assets');

61
source/PlayState.hx
View File

@ -2845,7 +2845,8 @@ class PlayState extends MusicBeatState
daNote.x = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].x; daNote.x = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].x;
if (!daNote.isSustainNote) if (!daNote.isSustainNote)
daNote.angle = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].angle; daNote.angle = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].angle;
daNote.alpha = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].alpha; if (daNote.sustainActive)
daNote.alpha = playerStrums.members[Math.floor(Math.abs(daNote.noteData))].alpha;
} }
else if (!daNote.wasGoodHit && !daNote.modifiedByLua) else if (!daNote.wasGoodHit && !daNote.modifiedByLua)
{ {
@ -2853,7 +2854,8 @@ class PlayState extends MusicBeatState
daNote.x = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].x; daNote.x = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].x;
if (!daNote.isSustainNote) if (!daNote.isSustainNote)
daNote.angle = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].angle; daNote.angle = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].angle;
daNote.alpha = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].alpha; if (daNote.sustainActive)
daNote.alpha = strumLineNotes.members[Math.floor(Math.abs(daNote.noteData))].alpha;
} }
if (daNote.isSustainNote) if (daNote.isSustainNote)
@ -2871,11 +2873,6 @@ class PlayState extends MusicBeatState
{ {
daNote.kill(); daNote.kill();
notes.remove(daNote, true); notes.remove(daNote, true);
if (!daNote.isParent)
{
for(i in daNote.parent.children)
i.sustainActive = false;
}
} }
else else
{ {
@ -2886,29 +2883,33 @@ class PlayState extends MusicBeatState
totalNotesHit += 1; totalNotesHit += 1;
else else
{ {
if (daNote.isSustainNote) if (!daNote.isSustainNote)
{
daNote.kill();
notes.remove(daNote, true);
}
else
{
health -= 0.075; health -= 0.075;
vocals.volume = 0; vocals.volume = 0;
if (theFunne) if (theFunne && daNote.sustainActive)
noteMiss(daNote.noteData, daNote); noteMiss(daNote.noteData, daNote);
}
} }
} }
else else
{ {
health -= 0.075; if (!daNote.isSustainNote)
health -= 0.075;
vocals.volume = 0; vocals.volume = 0;
if (theFunne) if (theFunne && daNote.sustainActive)
noteMiss(daNote.noteData, daNote); 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.visible = false;
daNote.kill(); daNote.kill();
notes.remove(daNote, true); notes.remove(daNote, true);
@ -3138,7 +3139,7 @@ class PlayState extends MusicBeatState
score = -300; score = -300;
combo = 0; combo = 0;
misses++; misses++;
health -= 0.2; health -= 0.35;
ss = false; ss = false;
shits++; shits++;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
@ -3146,7 +3147,7 @@ class PlayState extends MusicBeatState
case 'bad': case 'bad':
daRating = 'bad'; daRating = 'bad';
score = 0; score = 0;
health -= 0.06; health -= 0.1;
ss = false; ss = false;
bads++; bads++;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
@ -3157,12 +3158,12 @@ class PlayState extends MusicBeatState
ss = false; ss = false;
goods++; goods++;
if (health < 2) if (health < 2)
health += 0.04; health += 0.02;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 0.75; totalNotesHit += 0.75;
case 'sick': case 'sick':
if (health < 2) if (health < 2)
health += 0.1; health += 0.15;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 1; totalNotesHit += 1;
sicks++; sicks++;
@ -3726,7 +3727,7 @@ class PlayState extends MusicBeatState
{ {
if (!boyfriend.stunned) if (!boyfriend.stunned)
{ {
health -= 0.04; //health -= 0.2;
if (combo > 5 && gf.animOffsets.exists('sad')) if (combo > 5 && gf.animOffsets.exists('sad'))
{ {
gf.playAnim('sad'); gf.playAnim('sad');
@ -3764,8 +3765,14 @@ class PlayState extends MusicBeatState
if (FlxG.save.data.accuracyMod == 1) if (FlxG.save.data.accuracyMod == 1)
totalNotesHit -= 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.soundRandom('missnote', 1, 3), FlxG.random.float(0.1, 0.2));
// FlxG.sound.play(Paths.sound('missnote1'), 1, false); // FlxG.sound.play(Paths.sound('missnote1'), 1, false);
// FlxG.log.add('played imss note'); // FlxG.log.add('played imss note');