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

Yuta12342 · Yuta12342 · commit 7a19d70096e1 · 2025-03-18T22:07:44.000-04:00
diff --git a/source/substates/RankingSubstate.hx b/source/substates/RankingSubstate.hx
@@ -155,7 +155,7 @@ class RankingSubstate extends MusicBeatSubstate
 						locationId += " (" + archipelago.APPlayState.currentMod + ")";
 					}
 					trace(locationId.trim());
-					var locationIdInts = APInfo.apGame.locationData(locationId.trim());
+					var locationIdInts = APEntryState.apGame.locationData(locationId.trim());
 					trace('Location IDs: ' + locationIdInts);
 
 					if (locationIdInts == null || locationIdInts.length == 0 || locationIdInts.indexOf(0) != -1)
@@ -168,7 +168,7 @@ class RankingSubstate extends MusicBeatSubstate
 								locationId = archipelago.APPlayState.currentMod.trim() != ""
 									? song[0] + " (" + archipelago.APPlayState.currentMod + ")"
 									: song[0];
-								locationIdInts = APInfo.apGame.locationData(locationId.trim());
+								locationIdInts = APEntryState.apGame.locationData(locationId.trim());
 								break;
 							}
 						}
@@ -196,7 +196,7 @@ class RankingSubstate extends MusicBeatSubstate
 											locationId = archipelago.APPlayState.currentMod.trim() != "" 
 												? song[0] + " (" + archipelago.APPlayState.currentMod + ")" 
 												: song[0];
-											locationIdInts = APInfo.apGame.locationData(locationId.trim());
+											locationIdInts = APEntryState.apGame.locationData(locationId.trim());
 											break;
 										}
 									}

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ class RankingSubstate extends MusicBeatSubstate`
`155`	`155`	`locationId += " (" + archipelago.APPlayState.currentMod + ")";`
`156`	`156`	`}`
`157`	`157`	`trace(locationId.trim());`
`158`		`- var locationIdInts = APInfo.apGame.locationData(locationId.trim());`
	`158`	`+ var locationIdInts = APEntryState.apGame.locationData(locationId.trim());`
`159`	`159`	`trace('Location IDs: ' + locationIdInts);`
`160`	`160`
`161`	`161`	`if (locationIdInts == null \|\| locationIdInts.length == 0 \|\| locationIdInts.indexOf(0) != -1)`
`@@ -168,7 +168,7 @@ class RankingSubstate extends MusicBeatSubstate`
`168`	`168`	`locationId = archipelago.APPlayState.currentMod.trim() != ""`
`169`	`169`	`? song[0] + " (" + archipelago.APPlayState.currentMod + ")"`
`170`	`170`	`: song[0];`
`171`		`- locationIdInts = APInfo.apGame.locationData(locationId.trim());`
	`171`	`+ locationIdInts = APEntryState.apGame.locationData(locationId.trim());`
`172`	`172`	`break;`
`173`	`173`	`}`
`174`	`174`	`}`
`@@ -196,7 +196,7 @@ class RankingSubstate extends MusicBeatSubstate`
`196`	`196`	`locationId = archipelago.APPlayState.currentMod.trim() != ""`
`197`	`197`	`? song[0] + " (" + archipelago.APPlayState.currentMod + ")"`
`198`	`198`	`: song[0];`
`199`		`- locationIdInts = APInfo.apGame.locationData(locationId.trim());`
	`199`	`+ locationIdInts = APEntryState.apGame.locationData(locationId.trim());`
`200`	`200`	`break;`
`201`	`201`	`}`
`202`	`202`	`}`