Beep.

Author: Yuta12342

source/states/CategoryState.hx

@@ -161,10 +161,24 @@ class CategoryState extends MusicBeatState
 
 			if (softCoded && catMode != 'Mods')
 		for (week in weeks) {
-			if (week.category != null && !existingCategories.contains(week.category.toLowerCase())) {
-				menuItems.push(week.category);
+			if (week.category != null) {
+				if (Std.is(week.category, String)) {
+					var category:String = cast week.category;
+					if (!existingCategories.contains(category.toLowerCase())) {
+						menuItems.push(category);
+					}
+				} else if (Std.is(week.category, Array)) {
+					var categories:Array<String> = cast week.category;
+					for (cat in categories) {
+						if (!existingCategories.contains(cat.toLowerCase())) {
+							menuItems.push(cat);
+						}
+					}
+				}
 			}
-		}
+				// menuItems.push(cast week.category);
+			}
+
 
 		// Remove duplicates from menuItems
 		var filteredItems:Array<String> = [];

source/states/FreeplayState.hx

@@ -489,28 +489,32 @@ class FreeplayState extends MusicBeatState
 				// trace("CurUnlocked: " + curUnlocked);
 				// trace("CurMissing: " + curMissing);
 
+				function nullIfEmptyArray<T>(array:Array<T>):Null<Array<T>> {
+					if (array == null || array.length == 0) {
+						return null;
+					}
+					return array;
+				}
+
 				WeekData.setDirectoryFromWeek(leWeek);
 				for (song in leWeek.songs)
 				{
-					var categoryWhaat:flixel.util.typeLimit.OneOfTwo<String, Array<String>> = null;
-					if (leWeek.category is String)
-					{
-						categoryWhaat = leWeek.category.split(',').map(function(cat:String):String {
+					var categoryWhaat:Array<String> = Std.isOfType(leWeek.category, String) ? 
+						(cast leWeek.category:String).split(',').map(function(cat:String):String {
 							return cat.trim().toLowerCase();
-						});
-					}
-					else if (leWeek.category is Array<String>)
-					{
-						categoryWhaat = leWeek.category.map(function(cat:String):String {
+						}) : Std.isOfType(leWeek.category, Array) ? 
+						(cast leWeek.category:Array<String>).map(function(cat:String):String {
 							return cat.trim().toLowerCase();
-						});
-					}
-					else
-					{
-						categoryWhaat = [leWeek.category].map(function(cat:String):String {
+						}) : 
+						[(cast leWeek.category:String)].map(function(cat:String):String {
 							return cat.trim().toLowerCase();
 						});
+
+					if (categoryWhaat.length == 1 && categoryWhaat[0] == "" || categoryWhaat.length == 0) {
+						categoryWhaat = [];
 					}
+
+					// trace("CategoryWhaat2: " + categoryWhaat);
 					var colors:Array<Int> = song[2];
 					if(colors == null || colors.length < 3)
 					{
@@ -520,7 +524,7 @@ class FreeplayState extends MusicBeatState
 					{
 						addSong(song[0], i, song[1], FlxColor.fromRGB(colors[0], colors[1], colors[2]));
 					}
-					else if (categoryWhaat.toLowerCase() == CategoryState.loadWeekForce || (CategoryState.loadWeekForce == "mods" && categoryWhaat == null) || (CategoryState.loadWeekForce == "all" || APEntryState.inArchipelagoMode))
+					else if (categoryWhaat.indexOf(CategoryState.loadWeekForce.toLowerCase()) != -1 || (CategoryState.loadWeekForce == "mods" && categoryWhaat.isEmpty()) || (CategoryState.loadWeekForce == "all" || APEntryState.inArchipelagoMode))
 					{
 						if (refresh)
 						{
@@ -582,7 +586,7 @@ class FreeplayState extends MusicBeatState
 								}
 
 							}
-							else if (categoryWhaat.toLowerCase() == CategoryState.loadWeekForce || (CategoryState.loadWeekForce == "mods" && categoryWhaat == null) || CategoryState.loadWeekForce == "all")
+							else if (categoryWhaat.indexOf(CategoryState.loadWeekForce.toLowerCase()) != -1 || (CategoryState.loadWeekForce == "mods" && categoryWhaat.isEmpty()) || CategoryState.loadWeekForce == "all")
 							{
 								if (APEntryState.inArchipelagoMode)
 								{
@@ -635,7 +639,7 @@ class FreeplayState extends MusicBeatState
 											addSong(song[0], i, song[1], FlxColor.fromRGB(colors[0], colors[1], colors[2]));
 									}
 								}
-								else if (categoryWhaat.toLowerCase() == CategoryState.loadWeekForce || (CategoryState.loadWeekForce == "mods" && categoryWhaat == null) || CategoryState.loadWeekForce == "all")
+								else if (categoryWhaat.indexOf(CategoryState.loadWeekForce.toLowerCase()) != -1 || (CategoryState.loadWeekForce == "mods" && categoryWhaat.isEmpty()) || CategoryState.loadWeekForce == "all")
 								{
 									if (APEntryState.inArchipelagoMode)
 									{

source/states/editors/WeekEditorState.hx

@@ -391,6 +391,7 @@ class WeekEditorState extends MusicBeatState implements PsychUIEventHandler.Psyc
 				weekFile.difficulties = difficultiesInputText.text.trim();
 				unsavedProgress = true;
 			} else if(sender == categoryInputText) {
+				categoryInputText.text = categoryInputText.text.replace("[", "").replace("]", "").replace("\"", "").replace("'", "");
 				weekFile.category = categoryInputText.text.indexOf(",") != -1 
 					? categoryInputText.text.trim().split(",").map(function(item) return item.trim()) 
 					: categoryInputText.text.trim();