mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-12 05:07:06 +00:00
charting editor diff selector in progress
This commit is contained in:
parent
bec17ca5f4
commit
7958c49007
|
@ -96,11 +96,19 @@ class SongLoad
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
checkAndCreateNotemap(curDiff);
|
||||||
|
|
||||||
songShit = songData.noteMap[diff];
|
songShit = songData.noteMap[diff];
|
||||||
|
|
||||||
return songShit;
|
return songShit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function checkAndCreateNotemap(diff:String):Void
|
||||||
|
{
|
||||||
|
if (songData.noteMap[diff] == null)
|
||||||
|
songData.noteMap[diff] = [];
|
||||||
|
}
|
||||||
|
|
||||||
public static function getSpeed(?diff:String):Float
|
public static function getSpeed(?diff:String):Float
|
||||||
{
|
{
|
||||||
if (diff == null)
|
if (diff == null)
|
||||||
|
@ -120,6 +128,9 @@ class SongLoad
|
||||||
speedShit = songData.speed.hard;
|
speedShit = songData.speed.hard;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (songData.speedMap[diff] == null)
|
||||||
|
songData.speedMap[diff] = 1;
|
||||||
|
|
||||||
speedShit = songData.speedMap[diff];
|
speedShit = songData.speedMap[diff];
|
||||||
|
|
||||||
return speedShit;
|
return speedShit;
|
||||||
|
|
|
@ -250,6 +250,13 @@ class ChartingState extends MusicBeatState
|
||||||
});
|
});
|
||||||
player2DropDown.selectedLabel = _song.player2;
|
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);
|
var tab_group_song = new FlxUI(null, UI_box);
|
||||||
tab_group_song.name = "Song";
|
tab_group_song.name = "Song";
|
||||||
tab_group_song.add(UI_songTitle);
|
tab_group_song.add(UI_songTitle);
|
||||||
|
@ -265,6 +272,7 @@ class ChartingState extends MusicBeatState
|
||||||
tab_group_song.add(stepperSpeed);
|
tab_group_song.add(stepperSpeed);
|
||||||
tab_group_song.add(player1DropDown);
|
tab_group_song.add(player1DropDown);
|
||||||
tab_group_song.add(player2DropDown);
|
tab_group_song.add(player2DropDown);
|
||||||
|
tab_group_song.add(difficultyDropDown);
|
||||||
|
|
||||||
UI_box.addGroup(tab_group_song);
|
UI_box.addGroup(tab_group_song);
|
||||||
UI_box.scrollFactor.set();
|
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);
|
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));
|
var strumLinePos:Float = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * SongLoad.getSong()[curSection].lengthInSteps));
|
||||||
|
|
||||||
if (FlxG.sound.music != null)
|
if (FlxG.sound.music != null)
|
||||||
|
|
Loading…
Reference in a new issue