cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-23 18:39:33 +00:00
Code Issues Releases Wiki Activity

double notes???

Browse source
This commit is contained in:
Cameron Taylor 2021-01-17 21:23:40 -05:00
parent de0ccd03f3
commit cb22536109
1 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
source/PlayState.hx
View file

@ -1250,6 +1250,8 @@ class PlayState extends MusicBeatState
var downR = controls.DOWN_R; var downR = controls.DOWN_R;
var leftR = controls.LEFT_R; var leftR = controls.LEFT_R;
var controlArray:Array<Bool> = [leftP, downP, upP, rightP];
// FlxG.watch.addQuick('asdfa', upP); // FlxG.watch.addQuick('asdfa', upP);
if ((upP || rightP || downP || leftP) && !boyfriend.stunned && generatedMusic) if ((upP || rightP || downP || leftP) && !boyfriend.stunned && generatedMusic)
{ {
@ -1257,14 +1259,17 @@ class PlayState extends MusicBeatState
var possibleNotes:Array<Note> = []; var possibleNotes:Array<Note> = [];
var ignoreList:Array<Int> = [];
notes.forEachAlive(function(daNote:Note) notes.forEachAlive(function(daNote:Note)
{ {
if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate) if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate)
{ {
// the sorting probably doesn't need to be in here? who cares lol
possibleNotes.push(daNote); possibleNotes.push(daNote);
trace(possibleNotes[0].strumTime);
possibleNotes.sort((a, b) -> Std.int(a.strumTime - b.strumTime)); possibleNotes.sort((a, b) -> Std.int(a.strumTime - b.strumTime));
trace(possibleNotes[0].strumTime);
ignoreList.push(daNote.noteData);
} }
}); });
@ -1275,22 +1280,44 @@ class PlayState extends MusicBeatState
if (perfectMode) if (perfectMode)
noteCheck(true, daNote); noteCheck(true, daNote);
switch (daNote.noteData) for (coolNote in possibleNotes)
{ {
case 2: // NOTES YOU JUST PRESSED if (controlArray[coolNote.noteData])
if (upP || rightP || downP || leftP) goodNoteHit(coolNote);
noteCheck(upP, daNote); else
case 3: {
if (upP || rightP || downP || leftP) var inIgnoreList:Bool = false;
noteCheck(rightP, daNote); for (shit in 0...ignoreList.length)
case 1: {
if (upP || rightP || downP || leftP) if (controlArray[ignoreList[shit]])
noteCheck(downP, daNote); inIgnoreList = true;
case 0: }
if (upP || rightP || downP || leftP) if (!inIgnoreList)
noteCheck(leftP, daNote); badNoteCheck();
}
} }
/*
if (controlArray[daNote.noteData])
goodNoteHit(daNote);
*/
// trace(daNote.noteData);
/*
switch (daNote.noteData)
{
case 2: // NOTES YOU JUST PRESSED
if (upP || rightP || downP || leftP)
noteCheck(upP, daNote);
case 3:
if (upP || rightP || downP || leftP)
noteCheck(rightP, daNote);
case 1:
if (upP || rightP || downP || leftP)
noteCheck(downP, daNote);
case 0:
if (upP || rightP || downP || leftP)
noteCheck(leftP, daNote);
}
*/
if (daNote.wasGoodHit) if (daNote.wasGoodHit)
{ {
daNote.kill(); daNote.kill();
@ -1423,30 +1450,6 @@ class PlayState extends MusicBeatState
var downP = controls.DOWN_P; var downP = controls.DOWN_P;
var leftP = controls.LEFT_P; var leftP = controls.LEFT_P;
var gamepad = FlxG.gamepads.lastActive;
if (gamepad != null)
{
if (gamepad.anyJustPressed(["DPAD_LEFT", "LEFT_STICK_DIGITAL_LEFT", X]))
{
leftP = true;
}
if (gamepad.anyJustPressed(["DPAD_RIGHT", "LEFT_STICK_DIGITAL_RIGHT", B]))
{
rightP = true;
}
if (gamepad.anyJustPressed(['DPAD_UP', "LEFT_STICK_DIGITAL_UP", Y]))
{
upP = true;
}
if (gamepad.anyJustPressed(["DPAD_DOWN", "LEFT_STICK_DIGITAL_DOWN", A]))
{
downP = true;
}
}
if (leftP) if (leftP)
noteMiss(0); noteMiss(0);
if (upP) if (upP)