AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

snappers

Browse Source
This commit is contained in:
Kade M 2021-06-04 14:40:05 -07:00
parent 8ed8942323
commit af3e47be07
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/ChartingState.hx
View File

@ -660,21 +660,16 @@ class ChartingState extends MusicBeatState
} }
var writingNotes:Bool = false; var writingNotes:Bool = false;
var doSnapShit:Bool = false; var doSnapShit:Bool = true;
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
updateHeads(); updateHeads();
snapText.text = "Snap: 1/" + snap + " (Control + Left or Right to change.)\nAdd Notes: 1-8 (or click)\n"; snapText.text = "Snap: 1/" + snap + " (" + (doSnapShit ? "Control to disable" : "Snap Disabled, Control to renable") + ")\nAdd Notes: 1-8 (or click)\n";
curStep = recalculateSteps(); curStep = recalculateSteps();
if (FlxG.keys.justPressed.ALT && UI_box.selected_tab == 0)
{
writingNotes = !writingNotes;
}
/*if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.RIGHT) /*if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.RIGHT)
snap = snap * 2; snap = snap * 2;
if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.LEFT) if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.LEFT)
@ -685,7 +680,7 @@ class ChartingState extends MusicBeatState
snap = 1;*/ snap = 1;*/
if (FlxG.keys.justPressed.CONTROL) if (FlxG.keys.justPressed.CONTROL)
doSnapShit = false; doSnapShit = !doSnapShit;
Conductor.songPosition = FlxG.sound.music.time; Conductor.songPosition = FlxG.sound.music.time;
_song.song = typingShit.text; _song.song = typingShit.text;
@ -944,6 +939,10 @@ class ChartingState extends MusicBeatState
resetSection(); resetSection();
} }
if (FlxG.sound.music.time < 0 || curStep < 0)
FlxG.sound.music.time = 0;
if (FlxG.mouse.wheel != 0) if (FlxG.mouse.wheel != 0)
{ {
FlxG.sound.music.pause(); FlxG.sound.music.pause();
@ -951,16 +950,13 @@ class ChartingState extends MusicBeatState
var stepMs = curStep * Conductor.stepCrochet; var stepMs = curStep * Conductor.stepCrochet;
if (FlxG.sound.music.time < 0 || curStep < 0)
FlxG.sound.music.time = 0;
trace(Conductor.stepCrochet / snap); trace(Conductor.stepCrochet / snap);
if (doSnapShit) if (doSnapShit)
FlxG.sound.music.time = (stepMs + (Conductor.stepCrochet / snap)) * FlxG.mouse.wheel; FlxG.sound.music.time = stepMs - (FlxG.mouse.wheel * Conductor.stepCrochet / snap);
else else
FlxG.sound.music.time = (stepMs + (Conductor.stepCrochet / 16)) * FlxG.mouse.wheel; FlxG.sound.music.time -= (FlxG.mouse.wheel * Conductor.stepCrochet * 0.4);
trace(stepMs + " + " + Conductor.stepCrochet / snap + " -> " + FlxG.sound.music.time); trace(stepMs + " + " + Conductor.stepCrochet / snap + " -> " + FlxG.sound.music.time);
vocals.time = FlxG.sound.music.time; vocals.time = FlxG.sound.music.time;