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

unforseen

Browse Source
This commit is contained in:
Kade M 2021-06-05 13:52:40 -07:00
parent 0d4c7b7978
commit e03475737d
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/FreeplayState.hx
View File

@ -202,6 +202,8 @@ class FreeplayState extends MusicBeatState
if (accepted) if (accepted)
{ {
trace(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase());
var poop:String = Highscore.formatSong(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(), curDifficulty); var poop:String = Highscore.formatSong(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(), curDifficulty);
trace(poop); trace(poop);

13
source/PlayState.hx
View File

@ -859,8 +859,15 @@ class PlayState extends MusicBeatState
// startCountdown(); // startCountdown();
if (SONG.song == null)
trace('song is null???');
else
trace('song looks gucci');
generateSong(SONG.song); generateSong(SONG.song);
trace('generated');
// add(strumLine); // add(strumLine);
camFollow = new FlxObject(0, 0, 1, 1); camFollow = new FlxObject(0, 0, 1, 1);
@ -987,6 +994,8 @@ class PlayState extends MusicBeatState
// cameras = [FlxG.cameras.list[1]]; // cameras = [FlxG.cameras.list[1]];
startingSong = true; startingSong = true;
trace('starting');
if (isStoryMode) if (isStoryMode)
{ {
switch (curSong.toLowerCase()) switch (curSong.toLowerCase())
@ -1345,6 +1354,8 @@ class PlayState extends MusicBeatState
else else
vocals = new FlxSound(); vocals = new FlxSound();
trace('loaded vocals');
FlxG.sound.list.add(vocals); FlxG.sound.list.add(vocals);
notes = new FlxTypedGroup<Note>(); notes = new FlxTypedGroup<Note>();
@ -1359,7 +1370,7 @@ class PlayState extends MusicBeatState
// Per song offset check // Per song offset check
#if windows #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)) for(file in sys.FileSystem.readDirectory(songPath))
{ {
var path = haxe.io.Path.join([songPath, file]); var path = haxe.io.Path.join([songPath, file]);

2
source/Song.hx
View File

@ -46,6 +46,8 @@ class Song
public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong 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(); var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim();
while (!rawJson.endsWith("}")) while (!rawJson.endsWith("}"))