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

Yuta12342 · Yuta12342 · commit 381820e5db73 · 2025-05-11T23:13:39.000-04:00
diff --git a/source/managers/FreeplayManager.hx b/source/managers/FreeplayManager.hx
@@ -161,7 +161,7 @@ class FreeplayManager {
                     }*/
                 }
 
-                if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) || (CategoryState.loadWeekForce == "all" && (leWeek.folder != '' || leWeek.folder != null) && !APEntryState.inArchipelagoMode))
+                if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) || (CategoryState.loadWeekForce == "all" && (searchText == null || searchText == '') && (leWeek.folder != '' || leWeek.folder != null) && !APEntryState.inArchipelagoMode))
                 {
                     addSong(song[0], i, song[1], [colors, [FlxColor.fromRGB(colors[0], colors[1], colors[2])]]);
                 }
diff --git a/source/states/freeplay/OsuFreeplayState.hx b/source/states/freeplay/OsuFreeplayState.hx
@@ -420,6 +420,7 @@ class OsuFreeplayState extends MusicBeatState
 				if(searchTypeText.text == '') {
 					searchTypeText.text = 'Type Here To Search!';
 					FreeplayManager.reloadFreeplay(true);
+					trace("Regual Refr");
 				}
 				else
 					FreeplayManager.reloadFreeplay(false, searchTypeText.text);

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ class FreeplayManager {`
`161`	`161`	`}*/`
`162`	`162`	`}`
`163`	`163`
`164`		`- if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) \|\| (CategoryState.loadWeekForce == "all" && (leWeek.folder != '' \|\| leWeek.folder != null) && !APEntryState.inArchipelagoMode))`
	`164`	`+ if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) \|\| (CategoryState.loadWeekForce == "all" && (searchText == null \|\| searchText == '') && (leWeek.folder != '' \|\| leWeek.folder != null) && !APEntryState.inArchipelagoMode))`
`165`	`165`	`{`
`166`	`166`	`addSong(song[0], i, song[1], [colors, [FlxColor.fromRGB(colors[0], colors[1], colors[2])]]);`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,7 @@ class OsuFreeplayState extends MusicBeatState`
`420`	`420`	`if(searchTypeText.text == '') {`
`421`	`421`	`searchTypeText.text = 'Type Here To Search!';`
`422`	`422`	`FreeplayManager.reloadFreeplay(true);`
	`423`	`+ trace("Regual Refr");`
`423`	`424`	`}`
`424`	`425`	`else`
`425`	`426`	`FreeplayManager.reloadFreeplay(false, searchTypeText.text);`