gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

finally fixed offsets in charter

Browse Source
This commit is contained in:
Frakist
2023-08-28 17:08:39 +03:00
parent 2403517989
commit 857904cba8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/charter/Charter.hx
+6 -6
View File
@@ -362,7 +362,7 @@ class Charter extends UIState {
scrollBar.cameras = [uiCamera];
scrollBar.onChange = function(v) {
if (!FlxG.sound.music.playing)
Conductor.songPosition = Conductor.getTimeForStep(v);
Conductor.songPosition = Conductor.getTimeForStep(v) + Conductor.songOffset;
};
uiGroup.add(scrollBar);
@@ -874,7 +874,7 @@ class Charter extends UIState {
}
} else {
if (!FlxG.sound.music.playing) {
Conductor.songPosition -= __crochet * FlxG.mouse.wheel;
Conductor.songPosition -= (__crochet * FlxG.mouse.wheel) - Conductor.songOffset;
}
}
}
@@ -1139,7 +1139,7 @@ class Charter extends UIState {
FlxG.state.openSubState(new MetaDataScreen(PlayState.SONG.meta));
function _playback_play(_) {
if (Conductor.songPosition >= FlxG.sound.music.getDefault(vocals).length) return;
if (Conductor.songPosition >= FlxG.sound.music.getDefault(vocals).length - Conductor.songOffset) return;
if (FlxG.sound.music.playing) {
FlxG.sound.music.pause();
@@ -1147,7 +1147,7 @@ class Charter extends UIState {
} else {
FlxG.sound.music.play();
vocals.play();
vocals.time = FlxG.sound.music.time = Conductor.songPosition;
vocals.time = FlxG.sound.music.time = Conductor.songPosition + Conductor.songOffset * 2;
}
}
@@ -1164,11 +1164,11 @@ class Charter extends UIState {
}
function _playback_back(_) {
if (FlxG.sound.music.playing) return;
Conductor.songPosition -= Conductor.beatsPerMesure * __crochet;
Conductor.songPosition -= Conductor.songOffset - (Conductor.beatsPerMesure * __crochet);
}
function _playback_forward(_) {
if (FlxG.sound.music.playing) return;
Conductor.songPosition += Conductor.beatsPerMesure * __crochet;
Conductor.songPosition += (Conductor.beatsPerMesure * __crochet) + Conductor.songOffset;
}
function _playback_start(_) {
if (FlxG.sound.music.playing) return;
source/funkin/options/categories/GameplayOptions.hx
+2 -2
View File
@@ -43,9 +43,9 @@ class GameplayOptions extends OptionsScreen {
FlxG.camera.zoom += 0.03;
__lastBeat = Conductor.curBeat;
}
if (__lastSongBeat != Math.floor(Conductor.getStepForTime(FlxG.sound.music.time / 2) / Conductor.stepsPerBeat)) {
if (__lastSongBeat != Math.floor(Conductor.getStepForTime(FlxG.sound.music.time) / Conductor.stepsPerBeat)) {
__metronome.replay();
__lastSongBeat = Math.floor(Conductor.getStepForTime(FlxG.sound.music.time / 2) / Conductor.stepsPerBeat);
__lastSongBeat = Math.floor(Conductor.getStepForTime(FlxG.sound.music.time) / Conductor.stepsPerBeat);
}
}
else FlxG.sound.music.volume = 1;