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

pog

Browse Source
This commit is contained in:
Kade M 2021-07-11 16:13:01 -07:00
parent 200f36995a
commit f8ae7c1234
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Main.hx
View File

@ -1,8 +1,11 @@
package; package;
import lime.app.Application;
#if windows
import Discord.DiscordClient;
#end
import openfl.display.BlendMode; import openfl.display.BlendMode;
import openfl.text.TextFormat; import openfl.text.TextFormat;
import openfl.display.Application;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import flixel.FlxG; import flixel.FlxG;
import flixel.FlxGame; import flixel.FlxGame;

20
source/PlayState.hx
View File

@ -1547,6 +1547,9 @@ class PlayState extends MusicBeatState
{ {
var coolNote = dataNotes[0]; var coolNote = dataNotes[0];
if (!coolNote.sustainActive)
return;
if (dataNotes.length > 1) // stacked notes or really close ones if (dataNotes.length > 1) // stacked notes or really close ones
{ {
for (i in 0...dataNotes.length) for (i in 0...dataNotes.length)
@ -2842,7 +2845,7 @@ class PlayState extends MusicBeatState
if (!daNote.isSustainNote) if (!daNote.isSustainNote)
health -= 0.075; health -= 0.075;
vocals.volume = 0; vocals.volume = 0;
if (theFunne && daNote.sustainActive) if (theFunne && !daNote.isSustainNote)
noteMiss(daNote.noteData, daNote); noteMiss(daNote.noteData, daNote);
} }
} }
@ -2851,7 +2854,7 @@ class PlayState extends MusicBeatState
if (!daNote.isSustainNote) if (!daNote.isSustainNote)
health -= 0.075; health -= 0.075;
vocals.volume = 0; vocals.volume = 0;
if (theFunne && daNote.sustainActive) if (theFunne && !daNote.isSustainNote)
noteMiss(daNote.noteData, daNote); noteMiss(daNote.noteData, daNote);
} }
} }
@ -2861,10 +2864,8 @@ class PlayState extends MusicBeatState
health -= 0.2; // give a health punishment for failing a LN health -= 0.2; // 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.sustainActive = false; i.sustainActive = false;
} }
}
daNote.visible = false; daNote.visible = false;
daNote.kill(); daNote.kill();
@ -3095,7 +3096,7 @@ class PlayState extends MusicBeatState
score = -300; score = -300;
combo = 0; combo = 0;
misses++; misses++;
health -= 0.35; health -= 0.45;
ss = false; ss = false;
shits++; shits++;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
@ -3103,7 +3104,7 @@ class PlayState extends MusicBeatState
case 'bad': case 'bad':
daRating = 'bad'; daRating = 'bad';
score = 0; score = 0;
health -= 0.1; health -= 0.2;
ss = false; ss = false;
bads++; bads++;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
@ -3114,12 +3115,12 @@ class PlayState extends MusicBeatState
ss = false; ss = false;
goods++; goods++;
if (health < 2) if (health < 2)
health += 0.02; health += 0.001;
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.15; health += 0.02;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 1; totalNotesHit += 1;
sicks++; sicks++;
@ -3415,7 +3416,10 @@ class PlayState extends MusicBeatState
notes.forEachAlive(function(daNote:Note) notes.forEachAlive(function(daNote:Note)
{ {
if (daNote.isSustainNote && daNote.canBeHit && daNote.mustPress && holdArray[daNote.noteData] && daNote.sustainActive) if (daNote.isSustainNote && daNote.canBeHit && daNote.mustPress && holdArray[daNote.noteData] && daNote.sustainActive)
{
trace(daNote.sustainActive);
goodNoteHit(daNote); goodNoteHit(daNote);
}
}); });
} }