cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

WIP shit for nicer charting hehe

This commit is contained in:
Cameron Taylor 2020-11-13 18:49:20 -08:00
parent ca629dd03e
commit c883f958b1
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/ChartingState.hx
View File

@ -374,16 +374,24 @@ class ChartingState extends MusicBeatState
var updatedSection:Bool = false;
function lengthBpmBullshit():Float
{
if (_song.notes[curSection].changeBPM)
return _song.notes[curSection].lengthInSteps * (_song.notes[curSection].bpm / _song.bpm);
else
return _song.notes[curSection].lengthInSteps;
}
override function update(elapsed:Float)
{
Conductor.songPosition = FlxG.sound.music.time;
_song.song = typingShit.text;
strumLine.y = getYfromStrum(Conductor.songPosition % (Conductor.stepCrochet * _song.notes[curSection].lengthInSteps));
strumLine.y = getYfromStrum(Conductor.songPosition % (Conductor.stepCrochet * lengthBpmBullshit()));
if (curBeat % 4 == 0)
{
if (curStep > (_song.notes[curSection].lengthInSteps) * (curSection + 1))
if (curStep > lengthBpmBullshit() * (curSection + 1))
{
trace(curStep);
trace((_song.notes[curSection].lengthInSteps) * (curSection + 1));
@ -525,14 +533,14 @@ class ChartingState extends MusicBeatState
vocals.pause();
var daNum:Int = 0;
var daLength:Int = 0;
var daLength:Float = 0;
while (daNum <= sec)
{
daLength += _song.notes[daNum].lengthInSteps;
daLength += lengthBpmBullshit();
daNum++;
}
FlxG.sound.music.time = (daLength - (_song.notes[sec].lengthInSteps)) * Conductor.stepCrochet;
FlxG.sound.music.time = (daLength - lengthBpmBullshit()) * Conductor.stepCrochet;
vocals.time = FlxG.sound.music.time;
updateCurStep();
}
@ -620,7 +628,7 @@ class ChartingState extends MusicBeatState
note.setGraphicSize(GRID_SIZE, GRID_SIZE);
note.updateHitbox();
note.x = Math.floor(daNoteInfo * GRID_SIZE);
note.y = getYfromStrum(daStrumTime) % gridBG.height;
note.y = Math.floor(getYfromStrum(daStrumTime)) % gridBG.height;
curRenderedNotes.add(note);
@ -691,7 +699,7 @@ class ChartingState extends MusicBeatState
private function addNote():Void
{
var noteStrum = Math.round(getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * 16)));
var noteStrum = getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * lengthBpmBullshit()));
var noteData = Math.floor(FlxG.mouse.x / GRID_SIZE);
var noteSus = 0;
@ -699,7 +707,7 @@ class ChartingState extends MusicBeatState
curSelectedNote = _song.notes[curSection].sectionNotes[_song.notes[curSection].sectionNotes.length - 1];
trace(getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * 16)));
trace(getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * lengthBpmBullshit()))));
trace(curSection);
updateGrid();

2
source/MusicBeatState.hx
View File

@ -34,7 +34,7 @@ class MusicBeatState extends FlxUIState
everyStep();
updateCurStep();
curBeat = Math.round(curStep / 4);
curBeat = Math.floor(curStep / 4);
super.update(elapsed);
}

2
source/TitleState.hx
View File

@ -68,7 +68,7 @@ class TitleState extends MusicBeatState
}
#if SKIP_TO_PLAYSTATE
FlxG.switchState(new StoryMenuState());
FlxG.switchState(new ChartingState());
#else
startIntro();
#end