Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago

Z11Coding · Z11Coding · commit 0b8ea654ef19 · 2025-04-11T18:50:19.000-04:00
diff --git a/source/archipelago/APGameState.hx b/source/archipelago/APGameState.hx
@@ -228,12 +228,12 @@ class APGameState {
     }
 
     public function getSongLocations(songName:String, modName:String):Array<Int> {
-        return locationData(songName + " (" + modName + ")").concat(noteData(songName, modName));
+        return locationData(songName + (modName != "" ? " (" + modName + ")" : "")).concat(noteData(songName, modName));
     }
 
     public function checkGoal(songName:String, modName:String):Bool {
         var info = info();
-        var locations = locationData(songName + " (" + modName + ")").concat(noteData(songName, modName));
+        var locations = locationData(songName + (modName != "" ? " (" + modName + ")" : "")).concat(noteData(songName, modName));
         var isGoal:Bool = true;
         for (location in locations) {
             if (info.missingLocations.contains(location)) {

Original file line number	Diff line number	Diff line change
`@@ -228,12 +228,12 @@ class APGameState {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`public function getSongLocations(songName:String, modName:String):Array<Int> {`
`231`		`- return locationData(songName + " (" + modName + ")").concat(noteData(songName, modName));`
	`231`	`+ return locationData(songName + (modName != "" ? " (" + modName + ")" : "")).concat(noteData(songName, modName));`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`public function checkGoal(songName:String, modName:String):Bool {`
`235`	`235`	`var info = info();`
`236`		`- var locations = locationData(songName + " (" + modName + ")").concat(noteData(songName, modName));`
	`236`	`+ var locations = locationData(songName + (modName != "" ? " (" + modName + ")" : "")).concat(noteData(songName, modName));`
`237`	`237`	`var isGoal:Bool = true;`
`238`	`238`	`for (location in locations) {`
`239`	`239`	`if (info.missingLocations.contains(location)) {`