From 3d8dd8d60411b69d3ab172a0ad4b8f17d0684158 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Thu, 15 Jun 2023 00:29:40 -0400 Subject: [PATCH] More conductor rework changes --- source/funkin/play/PlayState.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 38cdca905..f39000633 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -972,10 +972,10 @@ class PlayState extends MusicBeatState oldNote = newNote; // Generate X sustain notes. - var sustainSections = Math.round(songNote.length / Conductor.stepCrochet); + var sustainSections = Math.round(songNote.length / Conductor.stepLengthMs); for (noteIndex in 0...sustainSections) { - var noteTimeOffset:Float = Conductor.stepCrochet + (Conductor.stepCrochet * noteIndex); + var noteTimeOffset:Float = Conductor.stepLengthMs + (Conductor.stepLengthMs * noteIndex); var sustainNote:Note = new Note(songNote.time + noteTimeOffset, songNote.data, oldNote, true, strumlineStyle); sustainNote.mustPress = mustHitNote; sustainNote.data.noteKind = songNote.kind; @@ -2216,7 +2216,7 @@ class PlayState extends MusicBeatState var frameShit:Float = (1 / 24) * 2; // equals 2 frames in the animation - new FlxTimer().start(((Conductor.crochet / 1000) * 1.25) - frameShit, function(tmr) { + new FlxTimer().start(((Conductor.beatLengthMs / 1000) * 1.25) - frameShit, function(tmr) { animShit.forceFinish(); }); }