Meep.

Author: Yuta12342

source/archipelago/APGameState.hx

@@ -103,19 +103,40 @@ class APGameState {
 
     public function locationData(songName:String):Array<Int> {
         var matchingLocations:Array<Int> = [];
-        
-        for (missing in info().missingLocations) {
-            if (info().get_location_name(missing).startsWith(songName)) {
-                matchingLocations.push(missing);
+        var exactMatch:Int = -1;
+        var hasDashNumber:Bool = false;
+
+        var missingLocations = info()?.missingLocations;
+        var checkedLocations = info()?.checkedLocations;
+
+        if (missingLocations != null) {
+            for (missing in missingLocations) {
+                var locationName = info().get_location_name(missing);
+                if (locationName == songName) {
+                    exactMatch = missing;
+                } else if (new EReg("^" + songName + "-\\d+$", "").match(locationName)) {
+                    matchingLocations.push(missing);
+                    hasDashNumber = true;
+                }
             }
         }
 
-        for (checked in info().checkedLocations) {
-            if (info().get_location_name(checked).startsWith(songName)) {
-                matchingLocations.push(checked);
+        if (checkedLocations != null) {
+            for (checked in checkedLocations) {
+                var locationName = info().get_location_name(checked);
+                if (locationName == songName) {
+                    exactMatch = checked;
+                } else if (new EReg("^" + songName + "-\\d+$", "").match(locationName)) {
+                    matchingLocations.push(checked);
+                    hasDashNumber = true;
+                }
             }
         }
 
+        if (!hasDashNumber && exactMatch != -1) {
+            return [exactMatch];
+        }
+
         return matchingLocations;
     }
 
@@ -336,7 +357,6 @@ class APGameState {
             }
            }
            return false; 
-
         }
 
     function isModName(name:String):Bool {

source/states/FreeplayState.hx

@@ -642,15 +642,15 @@ class FreeplayState extends MusicBeatState
 
 				var songName:String = '';
 				var modName:String = '';
-				var locationId:Int = 0;
+				var locationId:Array<Int> = [];
 				var isMissing:Bool = false;
 				var color:FlxColor = 0xFFFFFFFF;
 
 				if (APEntryState.inArchipelagoMode) {
 					songName = songs[i].songName;
 					modName = WeekData.weeksLoaded.get(WeekData.weeksList[songs[i].week]).folder;
-					locationId = APEntryState.apGame.info().get_location_id(songName + (modName != "" ? " (" + modName + ")" : "") + "-0");
-					isMissing = APEntryState.apGame.isLocationMissing(APEntryState.apGame.info().get_location_name(locationId));
+					locationId = APEntryState.apGame.locationData(songName + (modName != "" ? " (" + modName + ")" : ""));
+					isMissing = [for (ID in locationId) APEntryState.apGame.isLocationMissing(APEntryState.apGame.info().get_location_name(ID))].indexOf(true) != -1 || locationId.length == 0;
 					color = isMissing ? FlxColor.RED : FlxColor.GREEN;
 
 					for (daSongName in curUnlocked.keys())
@@ -665,14 +665,18 @@ class FreeplayState extends MusicBeatState
 						trueMissing.push(songName);
 					}
 				}
-
 				var songText:Alphabet;
 				if (APEntryState.inArchipelagoMode) {
-					//trace('Song: ' + songName + ', Mod: ' + (modName != "" ? modName : "(not modded)") + ', Missing: ' + isMissing);
-					songText = isVictorySong(songName, modName) ? (isMissing ? new VictorySong(90, 320, songName, color) : new ColoredAlphabet(90, 320, songName, true, 0xFFFFD700)) : new ColoredAlphabet(90, 320, songName, true, color);
+					if (locationId.length > 0 && locationId.indexOf(0) == -1) {
+						//trace('Song: ' + songName + ', Mod: ' + (modName != "" ? modName : "(not modded)") + ', Missing: ' + isMissing);
+						songText = isVictorySong(songName, modName) ? (isMissing ? new VictorySong(90, 320, songName, color) : new ColoredAlphabet(90, 320, songName, true, 0xFFFFD700)) : new ColoredAlphabet(90, 320, songName, true, color);
+					} else {
+						continue;
+					}
 				} else {
 					songText = new Alphabet(90, 320, songs[i].songName, true);
 				}
+				// if (songText.exists(true)) {
 				songText.targetY = i;
 				grpSongs.add(songText);
 
@@ -692,6 +696,7 @@ class FreeplayState extends MusicBeatState
 				// but over on mixtape engine we do arrays better
 				iconArray.push(icon);
 				iconList.add(icon);
+				// }
 
 				// songText.x += 40;
 				// DONT PUT X IN THE FIRST PARAMETER OF new ALPHABET() !!

source/yutautil/CollectionUtils.hx

@@ -160,6 +160,11 @@ class CollectionUtils
 		}
 	}
 
+
+	public static inline function matchRegex(input:String, pattern:EReg):Bool {
+		return pattern.match(input);
+	}
+
 	public static inline function exists(input:Dynamic, ?checkUninitialized:Bool = false):Dynamic {
 		if (checkUninitialized) {
 			try {