gf fix on non codename charts

This commit is contained in:
Yoshman29
2023-03-19 13:15:59 +01:00
parent 7fa6cdd91e
commit 36ab52b160
9 changed files with 38 additions and 110 deletions
-1
View File
@@ -5,7 +5,6 @@ import funkin.chart.ChartData;
import openfl.Lib;
import flixel.FlxState;
import funkin.interfaces.IBeatReceiver;
import funkin.system.Song.SwagSong;
import flixel.util.FlxSignal.FlxTypedSignal;
/**
-12
View File
@@ -1,12 +0,0 @@
package funkin.system;
typedef SwagSection =
{
var sectionNotes:Array<Dynamic>;
var lengthInSteps:Int;
var mustHitSection:Bool;
var bpm:Float;
var changeBPM:Bool;
var altAnim:Bool;
@:optional var camTarget:Null<Float>;
}
-50
View File
@@ -1,50 +0,0 @@
package funkin.system;
import funkin.system.Section.SwagSection;
import haxe.Json;
import haxe.format.JsonParser;
import lime.utils.Assets;
using StringTools;
typedef SwagSong =
{
var song:String;
var notes:Array<SwagSection>;
var bpm:Float;
var needsVoices:Bool;
var speed:Float;
var stage:String;
var noteTypes:Array<String>;
var player1:String;
var player2:String;
var gf:String;
var validScore:Bool;
// ADDITIONAL STUFF THAT MAY NOT BE PRESENT IN CHART
var ?maxHealth:Float;
var ?beatsPerMesure:Float;
var ?stepsPerBeat:Float;
}
class Song
{
public static function loadFromJson(songName:String, ?difficulty:String = "normal"):SwagSong
{
var assetPath = Paths.chart(songName, difficulty);
PlayState.fromMods = Paths.assetsTree.existsSpecific(assetPath, "TEXT", MODS);
var rawJson = Assets.getText(assetPath).trim();
rawJson = rawJson.substr(0, rawJson.lastIndexOf('}') + 1);
return parseJSONshit(rawJson);
}
public static function parseJSONshit(rawJson:String):SwagSong
{
var swagShit:SwagSong = cast Json.parse(rawJson).song;
swagShit.validScore = true;
return swagShit;
}
}