unforseen
This commit is contained in:
parent
0d4c7b7978
commit
e03475737d
@ -202,6 +202,8 @@ class FreeplayState extends MusicBeatState
|
||||
|
||||
if (accepted)
|
||||
{
|
||||
trace(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase());
|
||||
|
||||
var poop:String = Highscore.formatSong(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(), curDifficulty);
|
||||
|
||||
trace(poop);
|
||||
|
@ -859,8 +859,15 @@ class PlayState extends MusicBeatState
|
||||
|
||||
// startCountdown();
|
||||
|
||||
if (SONG.song == null)
|
||||
trace('song is null???');
|
||||
else
|
||||
trace('song looks gucci');
|
||||
|
||||
generateSong(SONG.song);
|
||||
|
||||
trace('generated');
|
||||
|
||||
// add(strumLine);
|
||||
|
||||
camFollow = new FlxObject(0, 0, 1, 1);
|
||||
@ -987,6 +994,8 @@ class PlayState extends MusicBeatState
|
||||
// cameras = [FlxG.cameras.list[1]];
|
||||
startingSong = true;
|
||||
|
||||
trace('starting');
|
||||
|
||||
if (isStoryMode)
|
||||
{
|
||||
switch (curSong.toLowerCase())
|
||||
@ -1345,6 +1354,8 @@ class PlayState extends MusicBeatState
|
||||
else
|
||||
vocals = new FlxSound();
|
||||
|
||||
trace('loaded vocals');
|
||||
|
||||
FlxG.sound.list.add(vocals);
|
||||
|
||||
notes = new FlxTypedGroup<Note>();
|
||||
@ -1359,7 +1370,7 @@ class PlayState extends MusicBeatState
|
||||
|
||||
// Per song offset check
|
||||
#if windows
|
||||
var songPath = 'assets/data/' + PlayState.SONG.song.toLowerCase() + '/';
|
||||
var songPath = 'assets/data/' + StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase() + '/';
|
||||
for(file in sys.FileSystem.readDirectory(songPath))
|
||||
{
|
||||
var path = haxe.io.Path.join([songPath, file]);
|
||||
|
@ -46,6 +46,8 @@ class Song
|
||||
|
||||
public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
|
||||
{
|
||||
trace('loading ' + folder.toLowerCase() + '/' + jsonInput.toLowerCase());
|
||||
|
||||
var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim();
|
||||
|
||||
while (!rawJson.endsWith("}"))
|
||||
|
Loading…
x
Reference in New Issue
Block a user