Goodness.

Author: Yuta12342

source/archipelago/APPlayState.hx

@@ -1423,17 +1423,28 @@ class APPlayState extends PlayState {
 	var available:Array<Int> = [];
 
     public function doEffect(effect:String)
-	{
-        trace('im finna act up');
-		if (paused || endingSong) return;
-		
-		if (effectMap.exists(effect)) {
-			effectMap.get(effect)();
+    {
+        // trace('im finna act up');
+        if (!APEntryState.inArchipelagoMode)
+        if (paused || endingSong) return;
+        
+        if (APEntryState.inArchipelagoMode && (paused || endingSong)) {
+            new FlxTimer().start(0.1, function(tmr:FlxTimer) {
+                if (!paused && !endingSong) {
+                    doEffect(effect);
+                }
+                FlxDestroyUtil.destroy(tmr);
+            });
+            return;
+        }
+        
+        if (effectMap.exists(effect)) {
+            effectMap.get(effect)();
             trace('running effect: $effect');
-		} else {
-			trace("Effect not found: " + effect);
-		}
-	}
+        } else {
+            trace("Effect not found: " + effect);
+        }
+    }
 
 	inline public function applyEffect(ttl:Float, onEnd:(Void->Void), playSound:String, playSoundVol:Float, noIcon:Bool, alwaysEnd:Bool = false, ?effect:String = "")
 	{

source/psychlua/FunkinLua.hx

@@ -1,5 +1,6 @@
 #if LUA_ALLOWED
 package psychlua;
+import archipelago.APEntryState;
 
 import backend.WeekData;
 import backend.Highscore;
@@ -460,6 +461,12 @@ class FunkinLua {
 		});
 
 		Lua_helper.add_callback(lua, "loadSong", function(?name:String = null, ?difficultyNum:Int = -1) {
+			if(APEntryState.inArchipelagoMode)
+			{
+				luaTrace('loadSong: A Script is loading a new song. Checking!', false, false, FlxColor.RED);
+				states.FreeplayState.forceUnlockCheck(Song.loadedSongName, archipelago.APPlayState.currentMod);
+			}
+
 			if(name == null || name.length < 1)
 				name = Song.loadedSongName;
 			if (difficultyNum == -1)

source/psychlua/LegacyFunkinLua.hx

@@ -938,6 +938,11 @@ class LegacyFunkinLua {
 		});
 
 		Lua_helper.add_callback(lua, "loadSong", function(?name:String = null, ?difficultyNum:Int = -1) {
+			if(archipelago.APEntryState.inArchipelagoMode)
+				{
+					luaTrace('loadSong: A Script is loading a new song. Checking!', false, false, FlxColor.RED);
+					states.FreeplayState.forceUnlockCheck(Song.loadedSongName, archipelago.APPlayState.currentMod);
+				}
 			if(name == null || name.length < 1)
 				name = PlayState.SONG.song;
 			if (difficultyNum == -1)

source/states/FreeplayState.hx

@@ -725,7 +725,7 @@ class FreeplayState extends MusicBeatState
 	var holdTime:Float = 0;
 	var stopMusicPlay:Bool = false;
 
-	function forceUnlockCheck(songName:String, modName:String):Void {
+	public static function forceUnlockCheck(songName:String, modName:String):Void {
 		var locationId = songName;
 		trace(modName);
 		if (modName.trim() != "") {
@@ -804,9 +804,8 @@ class FreeplayState extends MusicBeatState
 				APEntryState.apGame.info().set_goal();
 			}
 		}
-
-		reloadSongs(true);
-		
+		if (instance != null)
+			instance.reloadSongs(true);
 	}