make variant shit actually work

was being sent as a blank string for some reason

Author: rodney528

engine/source/imaginative/backend/music/Conductor.hx

@@ -545,7 +545,7 @@ class Conductor extends FlxBasic implements IBeat {
 		FlxG.sound.loadHelper(audio, 1, soundGroup);
 		audio.persist = true;
 
-		data = getMetadata('content/songs/$song/audio${variant == null ? '' : '-$variant'}');
+		data = getMetadata('content/songs/$song/audio${variant.isNullOrEmpty() ? '' : '-$variant'}');
 		applyBPMChanges();
 
 		#if FLX_PITCH pitch = pitch; #end
@@ -589,7 +589,7 @@ class Conductor extends FlxBasic implements IBeat {
 	public function addVocalTrack(song:String, suffix:String, ?variant:String, ?afterLoad:FlxSound->Void):FlxSound {
 		var file:ModPath = Paths.vocal(song, suffix, variant);
 		if (!file.isFile) {
-			log('Failed to find ${suffix.isNullOrEmpty() ? 'base ' : ''}vocal track for song "$song"${variant == null ? '' : ', variant "$variant"'}${suffix.isNullOrEmpty() ? '' : ' with a suffix of "$suffix"'}.', WarningMessage);
+			log('Failed to find ${suffix.isNullOrEmpty() ? 'base ' : ''}vocal track for song "$song"${variant.isNullOrEmpty() ? '' : ' of variant "$variant"'}${suffix.isNullOrEmpty() ? '' : ' with a suffix of "$suffix"'}.', WarningMessage);
 			return null;
 		}
 		var vocals:FlxSound = FlxG.sound.list.add(new FlxSound());
@@ -649,7 +649,7 @@ class Conductor extends FlxBasic implements IBeat {
 				if (tracks.empty())
 					addVocalTrack(song, '', variant);
 			} catch(error:haxe.Exception) {
-				log('Chart parse for song "$song"${variant == null ? '' : ', variant "${FunkinUtil.getDifficultyDisplay(variant)}"'} failed.', ErrorMessage);
+				log('Chart parse for song "$song"${variant.isNullOrEmpty() ? '' : ' of variant "${FunkinUtil.getDifficultyDisplay(variant)}"'} failed. (error:$error)', ErrorMessage);
 
 				var tracks:Array<FlxSound> = [];
 				// loads main suffixes

engine/source/imaginative/backend/system/Assets.hx

@@ -615,13 +615,13 @@ class Assets {
 	 * @param variant The variant key.
 	 * @return ChartData ~ The chart data.
 	 */
-	public static function chart(song:String, difficulty:String, variant:String = 'normal'):ChartData {
+	public static function chart(song:String, difficulty:String, ?variant:String):ChartData {
 		final list:ChartDataList = charts.get(Paths.file('content/songs/$song').format(), false);
 		if (list._fields().empty()) {
 			_log('[Assets] No list instance found. (song:$song)', DebugMessage);
 			return null;
 		}
-		if (variant != 'normal') {
+		if (!variant.isNullOrEmpty()) {
 			final list:ChartDataList = list.variants.get(variant);
 			if (list._fields().empty()) {
 				_log('[Assets] No list instance found. (song:$song, variant:$variant)', DebugMessage);

engine/source/imaginative/backend/system/Paths.hx

@@ -532,7 +532,7 @@ class Paths {
 	 * @return ModPath ~ The path data.
 	 */
 	inline public static function chart(song:String, difficulty:String, ?variant:String):ModPath
-		return json('content/songs/$song/charts/${variant == null ? '' : '$variant/'}$difficulty');
+		return json('content/songs/$song/charts/${variant.isNullOrEmpty() ? '' : '$variant/'}$difficulty');
 	/**
 	 * Gets the path of a character json from "../content/objects/characters/".
 	 * @param file The mod path.
@@ -585,16 +585,16 @@ class Paths {
 	 * @return ModPath ~ The path data.
 	 */
 	inline public static function inst(song:String, ?variant:String):ModPath
-		return audio('content/songs/$song/audio/${variant == null ? '' : '$variant/'}Inst');
+		return audio('content/songs/$song/audio/${variant.isNullOrEmpty() ? '' : '$variant/'}Inst');
 	/**
 	 * Gets the path of a songs vocal track from "../content/songs/{song}/audio/".
 	 * @param song The song folder name.
 	 * @param suffix The suffix tag.
 	 * @param variant The variation key.
 	 * @return ModPath ~ The path data.
 	 */
-	inline public static function vocal(song:String, suffix:String, ?variant:String):ModPath
-		return audio('content/songs/$song/audio/${variant == null ? '' : '$variant/'}Voices${suffix.isNullOrEmpty() ? '' : '-$suffix'}');
+	inline public static function vocal(song:String, ?suffix:String, ?variant:String):ModPath
+		return audio('content/songs/$song/audio/${variant.isNullOrEmpty() ? '' : '$variant/'}Voices${suffix.isNullOrEmpty() ? '' : '-$suffix'}');
 	/**
 	 * Gets the path of a song from "../music/".
 	 * @param file The mod path.

engine/source/imaginative/states/PlayState.hx

@@ -828,7 +828,7 @@ class PlayState extends BeatState {
 		storyMode = true;
 		ArrowField.enemyPlay = ArrowField.enableP2 = false;
 		renderChart(songList[0], difficulty, variant);
-		_log('[PlayState] Rendering level "${level.name}", rendering songs ${[for (song in levelData.songs) song.name].cleanDisplayList()} under difficulty "${FunkinUtil.getDifficultyDisplay(difficulty)}"${variant == null ? '.' : ' in variant "$variant".'}', SystemMessage);
+		_log('[PlayState] Rendering level "${level.name}", rendering songs ${[for (song in levelData.songs) song.name].cleanDisplayList()} under difficulty "${FunkinUtil.getDifficultyDisplay(difficulty)}"${variant.isNullOrEmpty() ? '.' : ' in variant "$variant".'}', SystemMessage);
 	}
 
 	/**
@@ -844,7 +844,7 @@ class PlayState extends BeatState {
 		ArrowField.enemyPlay = playAsEnemy;
 		ArrowField.enableP2 = p2AsEnemy;
 		renderChart(setSong = song, curDifficulty = difficulty, curVariant = variant);
-		_log('[PlayState] Rendering song "$song" under difficulty "${FunkinUtil.getDifficultyDisplay(difficulty)}"${variant == null ? '.' : ' in variant "$variant".'}', SystemMessage);
+		_log('[PlayState] Rendering song "$song" under difficulty "${FunkinUtil.getDifficultyDisplay(difficulty)}"${variant.isNullOrEmpty() ? '.' : ' in variant "$variant".'}', SystemMessage);
 	}
 
 	/**

engine/source/imaginative/states/menus/FreeplayMenu.hx

@@ -232,7 +232,7 @@ class FreeplayMenu extends BeatState {
 		infoTextGroup.add(infoTextBox);
 
 		songNameText = new FlxText(10, 10, boxWidth - 20, 'Song: crAzy');
-		variantText = new FlxText(10, songNameText.y + songNameText.height + 17, boxWidth - 20, 'Variant: Normal');
+		variantText = new FlxText(10, songNameText.y + songNameText.height + 17, boxWidth - 20, 'Variant: [NONE]');
 		difficultyText = new FlxText(10, variantText.y + variantText.height + 20, boxWidth - 20, 'Normal');
 		sideArrowsText = new FlxText(10, difficultyText.y, difficultyText.width, '<                       >');
 		for (text in [songNameText, variantText, difficultyText, sideArrowsText]) {