e

Author: Yuta12342

source/archipelago/APGameState.hx

@@ -905,8 +905,8 @@ class APGameState
 		var specialItems:Map<String, Int> = new Map<String, Int>();
 		var apInfo = info();
 
-		// trace("FNF Package: " + currentPackages["Friday Night Funkin"]);
-		// trace("Item Name to ID: " + currentPackages["Friday Night Funkin"].item_name_to_id);
+		// // trace("FNF Package: " + currentPackages["Friday Night Funkin"]);
+		// // trace("Item Name to ID: " + currentPackages["Friday Night Funkin"].item_name_to_id);
 
 		for (item in currentPackages["Friday Night Funkin"].item_name_to_id.keys())
 		{
@@ -922,6 +922,7 @@ class APGameState
 			}
 		}
 		trace("Special Items: " + specialItems);
+		// trace("No more using this for now...");
 
 		return specialItems;
 	}

source/managers/APFreeplayManager.hx

@@ -63,6 +63,14 @@ class APFreeplayManager extends FreeplayManager {
 	public static var trueMissing:Array<String> = [];
 	public static var unplayedList:Array<String> = [];
     public static var callVictory:Bool = false;
+    var apSongData = archipelago.APInfo.apGame?.getSongsAndModsFromArray(archipelago.APInfo.slotData.selectedSongs).map(function(songData):{song:String, mod:String} {
+        return if (songData.mod == null) {
+            {song: songData.song, mod: ''}
+        } else {
+            {song: songData.song, mod: songData.mod}
+        };
+    });
+
     #end
 
     /////////////////////////////////////////////////////FUNCTIONS///////////////////////////////////////////////////////////////////////////////
@@ -336,18 +344,29 @@ class APFreeplayManager extends FreeplayManager {
             if(weekIsLocked(WeekData.weeksList[i]) && !APEntryState.inArchipelagoMode) continue;
             var leWeek:WeekData = WeekData.weeksLoaded.get(WeekData.weeksList[i]);
 
+            var categoryWhaat:Array<String> = Std.isOfType(leWeek.category, String) ? 
+                    (cast leWeek.category:String).split(',').map(function(cat:String):String {
+                        return cat.trim().toLowerCase();
+                    }) : Std.isOfType(leWeek.category, Array) ? 
+                    (cast leWeek.category:Array<String>).map(function(cat:String):String {
+                        return cat.trim().toLowerCase();
+                    }) : 
+                    [(cast leWeek.category:String)].map(function(cat:String):String {
+                        return cat.trim().toLowerCase();
+                    });
+
+
             function nullIfEmptyArray<T>(array:Array<T>):Null<Array<T>> {
                 if (array == null || array.length == 0) {
                     return null;
                 }
                 return array;
             }
 
-            var apSongData = archipelago.APInfo.apGame?.getSongsAndModsFromArray(archipelago.APInfo.slotData.selectedSongs);
 
             WeekData.setDirectoryFromWeek(leWeek);
             var allowedSongs:Array<Dynamic> = [for (song in leWeek.songs) {
-                for (songData in apSongData) {
+                for (songData in curUnlocked) {
                     if (songData.song == song[0] && songData.mod == leWeek.folder) {
                         song;
                     }
@@ -356,16 +375,6 @@ class APFreeplayManager extends FreeplayManager {
 
             for (song in allowedSongs)
             {
-                var categoryWhaat:Array<String> = Std.isOfType(leWeek.category, String) ? 
-                    (cast leWeek.category:String).split(',').map(function(cat:String):String {
-                        return cat.trim().toLowerCase();
-                    }) : Std.isOfType(leWeek.category, Array) ? 
-                    (cast leWeek.category:Array<String>).map(function(cat:String):String {
-                        return cat.trim().toLowerCase();
-                    }) : 
-                    [(cast leWeek.category:String)].map(function(cat:String):String {
-                        return cat.trim().toLowerCase();
-                    });
 
                 if (categoryWhaat.length == 1 && categoryWhaat[0] == "" || categoryWhaat.length == 0) {
                     categoryWhaat = [];

source/managers/FreeplayManager.hx

@@ -52,15 +52,36 @@ class FreeplayManager {
     }
 
     /////////////////////////////////////////////////////FUNCTIONS///////////////////////////////////////////////////////////////////////////////
-
     public static function loadFPManager() {
+        #if ARCHIPELAGO_ALLOWED
         return switch (APEntryState.inArchipelagoMode) {
             case true:
-                new APFreeplayManager();
+                if (instance != null && Std.isOfType(instance, APFreeplayManager)) {
+                    trace("Using existing APFreeplayManager instance.");
+                    return instance;
+                } else {
+                    trace("Creating new APFreeplayManager instance.");
+                    return instance = new APFreeplayManager();
+                }
             case false:
-                new FreeplayManager();
-
+                if (instance != null && Std.isOfType(instance, FreeplayManager)) {
+                    trace("Using existing FreeplayManager instance.");
+                    return instance;
+                } else {
+                    trace("Creating new FreeplayManager instance.");
+                    return instance = new FreeplayManager();
+                }
+        }
+        #else
+        return switch (instance != null && Std.isOfType(instance, FreeplayManager)) {
+            case true:
+                trace("Using existing FreeplayManager instance.");
+                instance;
+            case false:
+                trace("Creating new FreeplayManager instance.");
+                instance = new FreeplayManager();
         }
+        #end
     }
 
     //Static things