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

merge into master

Browse Source
This commit is contained in:
Kade M
2021-06-21 01:22:54 -07:00
parent e03475737d
commit ee21040835
31 changed files with 2300 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/Song.hx
View File

@ -33,9 +33,9 @@ class Song
public var player1:String = 'bf';
public var player2:String = 'dad';
public var gfVersion:String = 'gf';
public var noteStyle:String = 'normal';
public var stage:String = 'stage';
public var gfVersion:String = '';
public var noteStyle:String = '';
public var stage:String = '';
public function new(song, notes, bpm)
{
@ -46,9 +46,18 @@ class Song
public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
{
trace('loading ' + folder.toLowerCase() + '/' + jsonInput.toLowerCase());
trace(jsonInput);
var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim();
// pre lowercasing the folder name
var folderLowercase = StringTools.replace(folder, " ", "-").toLowerCase();
switch (folderLowercase) {
case 'dad-battle': folderLowercase = 'dadbattle';
case 'philly-nice': folderLowercase = 'philly';
}
trace('loading ' + folderLowercase + '/' + jsonInput.toLowerCase());
var rawJson = Assets.getText(Paths.json(folderLowercase + '/' + jsonInput.toLowerCase())).trim();
while (!rawJson.endsWith("}"))
{