Help-

Author: Yuta12342

source/archipelago/APGameState.hx

@@ -546,13 +546,16 @@ class APGameState
 			|| _ap.clientStatus == ClientStatus.READY;
 	}
 
-	public var _slotData:Dynamic;
+	public var _slotData:APInfo.APSlotData;
 
 	public function new(ap:Client, slotData:Dynamic)
 	{
 		_ap = ap;
 		_slotData = slotData;
 
+		trace("slotData: " + Std.string(slotData));
+		trace("Retained slotData: " + Std.string(_slotData));
+
 		_seed = _ap.seed;
 
 		archipelago.APPlayState.apGame = this;
@@ -885,6 +888,18 @@ class APGameState
 		return songAndMod;
 	}
 
+	// Check for songs and mods from an array of song names
+	public function getSongsAndModsFromArray(songNames:Array<String>):Array<{song:String, ?mod:String}>
+	{
+		var songsAndMods:Array<{song:String, ?mod:String}> = [];
+		for (songName in songNames)
+		{
+			var songAndMod = getSongAndMod(songName);
+			songsAndMods.push(songAndMod);
+		}
+		return songsAndMods;
+	}
+
 	public function findSpecialItems():Map<String, Int>
 	{
 		var specialItems:Map<String, Int> = new Map<String, Int>();

source/archipelago/APInfo.hx

@@ -1,6 +1,82 @@
 package archipelago;
 
 import substates.RankingSubstate;
+
+typedef SongDetailData = {
+	id: Int,
+	modded: Bool,
+	playerOwner: String,
+	sharedWith: Array<String>,
+	songName: String
+}
+
+typedef APSlotDataType = {
+	deathLink: Bool,
+	fullSongCount: Int,
+	victoryLocation: String,
+	victoryID: Int,
+	ticketWinCount: Int,
+	gradeNeeded: String,
+	accuracyNeeded: String,
+	locationType: String,
+	locationMethod: String,
+	selectedSongs: Array<String>,
+	songData: Map<String, SongDetailData>
+}
+
+abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
+	public function new(?data:APSlotDataType) {
+		this = data != null ? data : {
+			deathLink: false,
+			fullSongCount: 0,
+			victoryLocation: "",
+			victoryID: 0,
+			ticketWinCount: 1,
+			gradeNeeded: "Any",
+			accuracyNeeded: "Any",
+			locationType: "Song Completion",
+			locationMethod: "Per Song",
+			selectedSongs: [],
+			songData: new Map<String, SongDetailData>()
+		};
+	}
+
+	public var deathLink(get, never):Bool;
+	public var fullSongCount(get, never):Int;
+	public var victoryLocation(get, never):String;
+	public var victoryID(get, never):Int;
+	public var ticketWinCount(get, never):Int;
+	public var gradeNeeded(get, never):String;
+	public var accuracyNeeded(get, never):String;
+	public var locationType(get, never):String;
+	public var locationMethod(get, never):String;
+	public var selectedSongs(get, never):Array<String>;
+	public var songData(get, never):Map<String, SongDetailData>;
+
+	private function get_deathLink():Bool return this.deathLink;
+	private function get_fullSongCount():Int return this.fullSongCount;
+	private function get_victoryLocation():String return this.victoryLocation;
+	private function get_victoryID():Int return this.victoryID;
+	private function get_ticketWinCount():Int return this.ticketWinCount;
+	private function get_gradeNeeded():String return this.gradeNeeded;
+	private function get_accuracyNeeded():String return this.accuracyNeeded;
+	private function get_locationType():String return this.locationType;
+	private function get_locationMethod():String return this.locationMethod;
+	private function get_selectedSongs():Array<String> return this.selectedSongs;
+	private function get_songData():Map<String, SongDetailData> return this.songData;
+
+	public function get(key:String):Dynamic {
+		return Reflect.field(this, key);
+	}
+
+	public function set(key:String, value:Dynamic):Void {
+		Reflect.setField(this, key, value);
+	}
+
+	public function hasKey(key:String):Bool {
+		return Reflect.hasField(this, key);
+	}
+}
 class APInfo {
 	public static var ap:Client;
 	public static var apGame:APGameState;
@@ -19,8 +95,8 @@ class APInfo {
 	public static var hintPoints(get, never):Int;
 	public static var hintCost(get, never):Int;
 
-	public static var slotData(get, never):Dynamic;
-	public static function get_slotData():Dynamic {
+	public static var slotData(get, never):APSlotData;
+	public static function get_slotData():APSlotData {
 		return apGame?._slotData;
 	}
 

source/managers/APFreeplayManager.hx

@@ -17,6 +17,39 @@ import archipelago.PacketTypes.ClientStatus;
 /*
     
 */
+
+    // SongInfo structure as typedef
+    typedef SongInfo = {
+        var song:String;
+        var mod:String;
+        var unlocked:Bool;
+        var missing:Bool;
+        var hinted:Bool;
+        var otherData:Dynamic;
+    }
+
+abstract APSongData(SongInfo) {
+    // SongInfo holds all relevant data for a song
+    public static function create(song:String, mod:String, unlocked:Bool, missing:Bool, hinted:Bool, otherData:Dynamic):APSongData {
+        return new APSongData({song: song, mod: mod, unlocked: unlocked, missing: missing, hinted: hinted, otherData: otherData});
+    }
+
+    public var song(get, never):String;
+    public var mod(get, never):String;
+    public var unlocked(get, never):Bool;
+    public var missing(get, never):Bool;
+    public var hinted(get, never):Bool;
+    public var otherData(get, never):Dynamic;
+
+    inline function get_song():String return this.song;
+    inline function get_mod():String return this.mod;
+    inline function get_unlocked():Bool return this.unlocked;
+    inline function get_missing():Bool return this.missing;
+    inline function get_hinted():Bool return this.hinted;
+    inline function get_otherData():Dynamic return this.otherData;
+
+
+}
 class APFreeplayManager extends FreeplayManager {
     #if ARCHIPELAGO_ALLOWED
     public static var curUnlocked:Array<{song:String, mod:String}> = [];
@@ -132,8 +165,8 @@ class APFreeplayManager extends FreeplayManager {
 			}
 		}
 
-		trace("Reloading songs in FreeplayState instance...");
-		FreeplayManager.getInstance().fpManager.reloadFreeplay(true);
+		trace("Reloading songs in FreeplayManager instance...");
+		FreeplayManager.instance.reloadFreeplay(true);
 
 		trace("Checking if the song is a victory song...");
 		if (archipelago.APEntryState.apGame.checkGoal(songName, modName)) {
@@ -306,8 +339,18 @@ class APFreeplayManager extends FreeplayManager {
                 return array;
             }
 
+            var apSongData = archipelago.APInfo.apGame?.getSongAndModsFromArray(archipelago.APInfo.slotData.selectedSongs);
+
             WeekData.setDirectoryFromWeek(leWeek);
-            for (song in leWeek.songs)
+            var allowedSongs = [for (song in leWeek.songs) {
+                for (songData in apSongData) {
+                    if (songData.song == song[0] && songData.mod == leWeek.folder) {
+                        song;
+                    }
+                }
+            }];
+
+            for (song in allowedSongs)
             {
                 var categoryWhaat:Array<String> = Std.isOfType(leWeek.category, String) ? 
                     (cast leWeek.category:String).split(',').map(function(cat:String):String {