HELP-

Author: Yuta12342

source/archipelago/APGameState.hx

@@ -146,6 +146,100 @@ class APGameState {
         return matchingLocations;
     }
 
+    public function noteData(songName:String, modName:String):Array<Int> {
+        trace("Starting noteData function with songName: " + songName + " and modName: " + modName);
+        var matchingNotes:Array<Int> = [];
+        var reg = new EReg("^Note \\d+: " + EReg.escape(songName) + "$", "");
+        var apInfo = info();
+    
+        trace("Looking for locations matching pattern: " + "Note #: " + songName);
+    
+        // Initial matching using the regular expression
+        trace("Iterating through APLocations...");
+        for (location in APLocations) {
+            var locationName = apInfo.get_location_name(location);
+            if (reg.match(locationName)) {
+                matchingNotes.push(location);
+            }
+        }
+    
+        // Fallback logic if no matches are found
+        if (matchingNotes.length == 0) {
+            trace("No matches found. Attempting fallback logic...");
+            for (song in WeekData.getCurrentWeek().songs) {
+                trace("Checking song in current week: " + song[0]);
+                if ((cast song[0] : String).toLowerCase().trim() == songName.toLowerCase().trim() ||
+                    (cast song[0] : String).toLowerCase().trim().replace(" ", "-") == songName.toLowerCase().trim().replace(" ", "-")) {
+                    var fallbackReg = new EReg("^Note \\d+: " + EReg.escape(song[0]) + "$", "");
+                    for (location in APLocations) {
+                        var locationName = apInfo.get_location_name(location);
+                        if (fallbackReg.match(locationName)) {
+                            trace("Fallback match found: " + locationName);
+                            matchingNotes.push(location);
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+    
+        // Secondary fallback logic using JSON data
+        if (matchingNotes.length == 0) {
+            trace("No matches found in fallback logic. Attempting secondary fallback...");
+            for (song in WeekData.getCurrentWeek().songs) {
+                trace("Checking song in secondary fallback logic: " + song[0]);
+                var songPath = modName.trim() != ""
+                    ? "mods/" + modName + "/data/" + song[0] + "/" + song[0] + "-" + Difficulty.getString(PlayState.storyDifficulty) + ".json"
+                    : "assets/shared" + (song[0] + Difficulty.getFilePath());
+                trace("Constructed songPath: " + songPath);
+    
+                var songJson:backend.Song.SwagSong = null;
+                var jsonStuff:Array<String> = Paths.crawlDirectoryOG("mods/" + modName + "/data", ".json");
+                trace("Retrieved JSON files: " + jsonStuff);
+    
+                for (json in jsonStuff) {
+                    trace("Checking JSON file: " + json);
+                    if (json.trim().toLowerCase().replace(" ", "-") == songPath.trim().toLowerCase().replace(" ", "-")) {
+                        trace("Match found for JSON file: " + json);
+                        songJson = backend.Song.parseJSON(File.getContent(json));
+                        if (songJson != null) {
+                            trace("Parsed song JSON successfully. Checking song name...");
+                            if (songJson.song.trim().toLowerCase().replace(" ", "-") == songName.toLowerCase().trim().replace(" ", "-")) {
+                                trace("Match found for song in JSON: " + songJson.song);
+                                var fallbackReg = new EReg("^Note \\d+: " + EReg.escape(song[0]) + "$", "");
+                                for (location in APLocations) {
+                                    var locationName = apInfo.get_location_name(location);
+                                    if (fallbackReg.match(locationName)) {
+                                        trace("Secondary fallback match found: " + locationName);
+                                        matchingNotes.push(location);
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    
+        trace("Finished iterating through APLocations.");
+        trace("Returning matching notes: " + matchingNotes);
+        return matchingNotes;
+    }
+
+    public function excludeCheckedLocations(locations:Array<Int>):Array<Int> {
+        var checkedLocations:Array<Int> = info().checkedLocations;
+        var uncheckedLocations:Array<Int> = [];
+
+        for (location in locations) {
+            if (!checkedLocations.contains(location)) {
+                uncheckedLocations.push(location);
+            }
+        }
+
+        return uncheckedLocations;
+    }
+
     public static var currentPackages:DynamicAccess<GameData> = new DynamicAccess<GameData>();
 
     public var itemManager(get, set):Dynamic;    

source/archipelago/APNote.hx

@@ -14,7 +14,6 @@ class APNote extends objects.Note {
         this.noteType = note.noteType;
 
         // Copy the properties from the original note to this new note, via reflection
-        // This is a bit of a hack, but it works for now.
         trace("Copying properties from original note to new note...");
         for (field in Reflect.fields(note)) {
             if (field != "ignoreNote" && field != "noteType" && field != "strumTime" && field != "noteData" && field != "prevNote" && field != "isSustainNote") {
@@ -25,13 +24,16 @@ class APNote extends objects.Note {
         trace("Properties copied. Destroying original note...");
 
         APItem = item;
-
         APItemLocation = location;
 
+        // Set a unique RGBShader color for APNotes
+        this.rgbShader.r = Std.int(Std.int((0x3380CC >> 16) & 0xFF) / Std.int(0xFF));
+        this.rgbShader.g = Std.int(Std.int((0x3380CC >> 8) & 0xFF) / Std.int(0xFF)); 
+        this.rgbShader.b = Std.int(Std.int(0x3380CC & 0xFF) / Std.int(0xFF));   
     }
 
     // Replace notes with a certain amount of locations.
-    public static function replaceNotes(notes:Array<objects.Note>, locations:Array<Int>, ?ignoreNonEmptyNoteType:Bool = false):Array<APNote> {
+    public static function replaceNotes(notes:Array<objects.Note>, locations:Array<Int>, ?ignoreNonEmptyNoteType:Bool = true):Array<APNote> {
         var newNotes:Array<APNote> = [];
         var randomIndices:Array<Int> = [];
 

source/archipelago/APPlayState.hx

@@ -1492,6 +1492,13 @@ class APPlayState extends PlayState {
 		super.stepHit();
 	}
 
+    private override function generateSong():Void
+    {
+        super.generateSong();
+        if (PlayState.SONG == null) return;
+        archipelago.APNote.replaceNotes(unspawnNotes, apGame.excludeCheckedLocations(apGame.noteData(PlayState.SONG.song, currentMod)));
+    }
+
 	// override public function generateNotes(song:SwagSong, AI:Array<Array<Float>>):Void
 	// 	super.generateNotes(song, AI);