1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-12 05:07:06 +00:00

Clean up several messy chunks of code, and add support for dragging selected notes.

This commit is contained in:
EliteMasterEric 2023-10-26 05:45:53 -04:00
parent e14e6448ac
commit 8d875949b9

View file

@ -3582,13 +3582,13 @@ class ChartEditorState extends HaxeUIState
{ {
switch (event.type) switch (event.type)
{ {
case ScriptEventType.UPDATE: case UPDATE:
currentPlayerCharacterPlayer.onUpdate(cast event); currentPlayerCharacterPlayer.onUpdate(cast event);
case ScriptEventType.SONG_BEAT_HIT: case SONG_BEAT_HIT:
currentPlayerCharacterPlayer.onBeatHit(cast event); currentPlayerCharacterPlayer.onBeatHit(cast event);
case ScriptEventType.SONG_STEP_HIT: case SONG_STEP_HIT:
currentPlayerCharacterPlayer.onStepHit(cast event); currentPlayerCharacterPlayer.onStepHit(cast event);
case ScriptEventType.NOTE_HIT: case NOTE_HIT:
currentPlayerCharacterPlayer.onNoteHit(cast event); currentPlayerCharacterPlayer.onNoteHit(cast event);
} }
} }
@ -3597,13 +3597,13 @@ class ChartEditorState extends HaxeUIState
{ {
switch (event.type) switch (event.type)
{ {
case ScriptEventType.UPDATE: case UPDATE:
currentOpponentCharacterPlayer.onUpdate(cast event); currentOpponentCharacterPlayer.onUpdate(cast event);
case ScriptEventType.SONG_BEAT_HIT: case SONG_BEAT_HIT:
currentOpponentCharacterPlayer.onBeatHit(cast event); currentOpponentCharacterPlayer.onBeatHit(cast event);
case ScriptEventType.SONG_STEP_HIT: case SONG_STEP_HIT:
currentOpponentCharacterPlayer.onStepHit(cast event); currentOpponentCharacterPlayer.onStepHit(cast event);
case ScriptEventType.NOTE_HIT: case NOTE_HIT:
currentOpponentCharacterPlayer.onNoteHit(cast event); currentOpponentCharacterPlayer.onNoteHit(cast event);
} }
} }
@ -3919,7 +3919,7 @@ class ChartEditorState extends HaxeUIState
var tempNote:NoteSprite = new NoteSprite(NoteStyleRegistry.instance.fetchDefault()); var tempNote:NoteSprite = new NoteSprite(NoteStyleRegistry.instance.fetchDefault());
tempNote.noteData = noteData; tempNote.noteData = noteData;
tempNote.scrollFactor.set(0, 0); tempNote.scrollFactor.set(0, 0);
var event:NoteScriptEvent = new NoteScriptEvent(ScriptEventType.NOTE_HIT, tempNote, 1, true); var event:NoteScriptEvent = new NoteScriptEvent(NOTE_HIT, tempNote, 1, true);
dispatchEvent(event); dispatchEvent(event);
// Calling event.cancelEvent() skips all the other logic! Neat! // Calling event.cancelEvent() skips all the other logic! Neat!