Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Function_Stop on note callbacks and add noteMissPre #15234

Open
wants to merge 5 commits into
base: experimental
Choose a base branch
from
Open

Fix Function_Stop on note callbacks and add noteMissPre #15234

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5569ff
Fix Function_Stop on note callbacks and add noteMissPre
LarryFrosty Aug 3, 2024
e230a6a
little eventEarlyTrigger fix
LarryFrosty Sep 7, 2024
87b7da2
wrong branch also i realized that was already fixed LOL
LarryFrosty Sep 7, 2024
e5f8a4f
add this back
LarryFrosty Sep 15, 2024
46a1ac5
check Function_StopHScript/All on "pre" functions
LarryFrosty Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions source/states/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2814,10 +2814,13 @@ class PlayState extends MusicBeatState
invalidateNote(note);
});

var result:Dynamic = callOnLuas('noteMissPre', [notes.members.indexOf(daNote), daNote.noteData, daNote.noteType, daNote.isSustainNote]);
var result2:Dynamic = (result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) ? callOnHScript('noteMissPre', [daNote]) : null;
if (result == LuaUtils.Function_Stop || result2 == LuaUtils.Function_Stop) return;
noteMissCommon(daNote.noteData, daNote);
stagesFunc(function(stage:BaseStage) stage.noteMiss(daNote));
var result:Dynamic = callOnLuas('noteMiss', [notes.members.indexOf(daNote), daNote.noteData, daNote.noteType, daNote.isSustainNote]);
if(result != LuaUtils.Function_Stop && result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('noteMiss', [daNote]);
if (result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('noteMiss', [daNote]);
}

function noteMissPress(direction:Int = 1):Void //You pressed a key when there was no notes to press for this key
Expand Down Expand Up @@ -2914,7 +2917,8 @@ class PlayState extends MusicBeatState
function opponentNoteHit(note:Note):Void
{
var result:Dynamic = callOnLuas('opponentNoteHitPre', [notes.members.indexOf(note), Math.abs(note.noteData), note.noteType, note.isSustainNote]);
if(result != LuaUtils.Function_Stop && result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('opponentNoteHitPre', [note]);
var result2:Dynamic = (result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) ? callOnHScript('opponentNoteHitPre', [note]) : null;
if (result == LuaUtils.Function_Stop || result2 == LuaUtils.Function_Stop) return;

if (songName != 'tutorial')
camZooming = true;
Expand Down Expand Up @@ -2952,7 +2956,7 @@ class PlayState extends MusicBeatState

stagesFunc(function(stage:BaseStage) stage.opponentNoteHit(note));
var result:Dynamic = callOnLuas('opponentNoteHit', [notes.members.indexOf(note), Math.abs(note.noteData), note.noteType, note.isSustainNote]);
if(result != LuaUtils.Function_Stop && result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('opponentNoteHit', [note]);
if (result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('opponentNoteHit', [note]);

if (!note.isSustainNote) invalidateNote(note);
}
Expand All @@ -2967,7 +2971,8 @@ class PlayState extends MusicBeatState
var leType:String = note.noteType;

var result:Dynamic = callOnLuas('goodNoteHitPre', [notes.members.indexOf(note), leData, leType, isSus]);
if(result != LuaUtils.Function_Stop && result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('goodNoteHitPre', [note]);
var result2:Dynamic = (result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) ? callOnHScript('goodNoteHitPre', [note]) : null;
if (result == LuaUtils.Function_Stop || result2 == LuaUtils.Function_Stop) return;

note.wasGoodHit = true;

Expand Down Expand Up @@ -3053,7 +3058,8 @@ class PlayState extends MusicBeatState

stagesFunc(function(stage:BaseStage) stage.goodNoteHit(note));
var result:Dynamic = callOnLuas('goodNoteHit', [notes.members.indexOf(note), leData, leType, isSus]);
if(result != LuaUtils.Function_Stop && result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('goodNoteHit', [note]);
if (result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('goodNoteHit', [note]);

if(!note.isSustainNote) invalidateNote(note);
}

Expand Down