From 8d875949b9f9b018139768b1c736d8eb96b368df Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 26 Oct 2023 05:45:53 -0400
Subject: [PATCH] Clean up several messy chunks of code, and add support for
dragging selected notes.
---
.../ui/debug/charting/ChartEditorState.hx | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 5956877bf..5585f9fdf 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -3582,13 +3582,13 @@ class ChartEditorState extends HaxeUIState
{
switch (event.type)
{
- case ScriptEventType.UPDATE:
+ case UPDATE:
currentPlayerCharacterPlayer.onUpdate(cast event);
- case ScriptEventType.SONG_BEAT_HIT:
+ case SONG_BEAT_HIT:
currentPlayerCharacterPlayer.onBeatHit(cast event);
- case ScriptEventType.SONG_STEP_HIT:
+ case SONG_STEP_HIT:
currentPlayerCharacterPlayer.onStepHit(cast event);
- case ScriptEventType.NOTE_HIT:
+ case NOTE_HIT:
currentPlayerCharacterPlayer.onNoteHit(cast event);
}
}
@@ -3597,13 +3597,13 @@ class ChartEditorState extends HaxeUIState
{
switch (event.type)
{
- case ScriptEventType.UPDATE:
+ case UPDATE:
currentOpponentCharacterPlayer.onUpdate(cast event);
- case ScriptEventType.SONG_BEAT_HIT:
+ case SONG_BEAT_HIT:
currentOpponentCharacterPlayer.onBeatHit(cast event);
- case ScriptEventType.SONG_STEP_HIT:
+ case SONG_STEP_HIT:
currentOpponentCharacterPlayer.onStepHit(cast event);
- case ScriptEventType.NOTE_HIT:
+ case NOTE_HIT:
currentOpponentCharacterPlayer.onNoteHit(cast event);
}
}
@@ -3919,7 +3919,7 @@ class ChartEditorState extends HaxeUIState
var tempNote:NoteSprite = new NoteSprite(NoteStyleRegistry.instance.fetchDefault());
tempNote.noteData = noteData;
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);
// Calling event.cancelEvent() skips all the other logic! Neat!