cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-07-15 14:45:56 +00:00
Code Issues Releases Wiki Activity

charting editor diff selector in progress

Browse source
This commit is contained in:
Cameron Taylor 2022-02-03 10:32:29 -05:00
parent bec17ca5f4
commit 7958c49007
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/SongLoad.hx
View file

@ -96,11 +96,19 @@ class SongLoad
}
}
checkAndCreateNotemap(curDiff);
songShit = songData.noteMap[diff];
return songShit;
}
public static function checkAndCreateNotemap(diff:String):Void
{
if (songData.noteMap[diff] == null)
songData.noteMap[diff] = [];
}
public static function getSpeed(?diff:String):Float
{
if (diff == null)
@ -120,6 +128,9 @@ class SongLoad
speedShit = songData.speed.hard;
}
if (songData.speedMap[diff] == null)
songData.speedMap[diff] = 1;
speedShit = songData.speedMap[diff];
return speedShit;

11
source/charting/ChartingState.hx
View file

@ -250,6 +250,13 @@ class ChartingState extends MusicBeatState
});
player2DropDown.selectedLabel = _song.player2;
var difficultyDropDown = new FlxUIDropDownMenu(10, 230, FlxUIDropDownMenu.makeStrIdLabelArray(_song.difficulties, true), function(diff:String)
{
SongLoad.curDiff = _song.difficulties[Std.parseInt(diff)];
SongLoad.checkAndCreateNotemap(SongLoad.curDiff);
});
difficultyDropDown.selectedLabel = SongLoad.curDiff;
var tab_group_song = new FlxUI(null, UI_box);
tab_group_song.name = "Song";
tab_group_song.add(UI_songTitle);
@ -265,6 +272,7 @@ class ChartingState extends MusicBeatState
tab_group_song.add(stepperSpeed);
tab_group_song.add(player1DropDown);
tab_group_song.add(player2DropDown);
tab_group_song.add(difficultyDropDown);
UI_box.addGroup(tab_group_song);
UI_box.scrollFactor.set();
@ -582,6 +590,9 @@ class ChartingState extends MusicBeatState
playheadTest.y = CoolUtil.coolLerp(playheadTest.y, FlxMath.remapToRange(Conductor.songPosition, 0, FlxG.sound.music.length, 0, FlxG.height), 0.5);
trace(_song.noteMap.toString());
trace(SongLoad.songData.noteMap.toString());
trace(SongLoad.curDiff);
var strumLinePos:Float = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * SongLoad.getSong()[curSection].lengthInSteps));
if (FlxG.sound.music != null)