Skip to content

Commit 7f2e859

Browse files
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents 42df993 + 80b0c9c commit 7f2e859

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

source/objects/Note.hx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,8 @@ class Note extends NoteObject
434434
function set_copyAngle(val:Bool)return copyVerts = val;
435435
#end
436436

437+
public var istail:Bool = false;
438+
437439
//AI Stuff
438440
public var AIStrumTime:Float = 0;
439441
public var AIMiss:Bool = false;
@@ -619,6 +621,8 @@ class Note extends NoteObject
619621
hitsoundDisabled = true;
620622
if(ClientPrefs.data.downScroll) flipY = true;
621623

624+
istail = true;
625+
622626
//offsetY += height / 2;
623627
copyAngle = false;
624628

source/objects/playfields/PlayField.hx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ class PlayField extends FlxTypedGroup<FlxBasic>
10521052
}else{
10531053
for(data in 0...keyCount){
10541054
if (keysPressed[data]){
1055-
var noteList = getNotesWithEnd(data, Conductor.songPosition, (note:Note) -> note.isSustainNote && (note.prevNote != null || note.unhitTail.length > 0));
1055+
var noteList = getNotesWithEnd(data, Conductor.songPosition, (note:Note) -> (note.isSustainNote || note.istail) && (note.prevNote != null || note.unhitTail.length > -1));
10561056
#if PE_MOD_COMPATIBILITY
10571057
// so lowPriority actually works (even though i hate it lol!)
10581058
noteList.sort((a, b) -> Std.int((b.strumTime + (b.lowPriority ? 10000 : 0)) - (a.strumTime + (a.lowPriority ? 10000 : 0))));
@@ -1063,7 +1063,6 @@ class PlayField extends FlxTypedGroup<FlxBasic>
10631063
{
10641064
var note:Note = noteList.pop();
10651065
noteHitCallback(note, this);
1066-
if (!note.isSustainNote) keysPressed[data] = false;
10671066
}
10681067
}
10691068
}

0 commit comments

Comments
 (0)