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

Author: Yuta12342

assets/embed/apworld/fridaynightfunkin.apworld

@@ -45,28 +45,3 @@ haxelib git tentools https://github.com/TentaRJ/tentools.git
 haxelib git systools https://github.com/haya3218/systools
 haxelib run lime rebuild systools windows
 echo Finished!
-pause
-
-REM Ask user if they want to ensure the exact required versions
-set /p ensure_versions="Do you want to ensure the exact required library versions? (y/n): "
-if /i "%ensure_versions%"=="y" (
-    haxelib set lime 8.2.2
-    haxelib set openfl 9.4.1
-    haxelib set flixel 5.6.2
-    haxelib set flixel-addons 3.3.2
-    haxelib set flixel-tools 1.5.1
-    haxelib set hscript-iris 1.1.3
-    haxelib set tjson 1.4.0
-    haxelib set hxdiscord_rpc 1.3.0
-    haxelib set hxvlc 2.0.1
-    haxelib set helder.set 0.3.1
-    haxelib set yaml 2.0.1
-    haxelib set hxWebSockets git
-    haxelib set haxe-concurrent 5.1.3
-    haxelib set actuate 1.9.0
-    haxelib set flixel-ui 2.6.1
-    haxelib set hscript 2.5.0
-    haxelib set noisehx 0.0.1
-    REM Add more haxelib set commands here if you add more versioned libraries above
-    echo All required library versions have been set.
-)

setup/windows.bat

@@ -261,12 +261,14 @@ class APItem {
             case "Pong Challenge":
                 return new APTrap(name, ConditionHelper.Everywhere(), function() {
                     popup('Ok but can you beat the Pong Master?', "APItem: Pong Challenge", true);
-                    APPlayState.instance.paused = true;
-                    APPlayState.instance.canResync = false;
-                    FlxG.camera.followLerp = 0;
-                    LoadingState.noteCache = [];
-                    states.PlayState.curChart = [];
-                    MusicBeatState.allowNuke = true;
+                    if (MusicBeatState.getState() == APPlayState.instance) {
+                        APPlayState.instance.paused = true;
+                        APPlayState.instance.canResync = false;
+                        FlxG.camera.followLerp = 0;
+                        LoadingState.noteCache = [];
+                        states.PlayState.curChart = [];
+                        MusicBeatState.allowNuke = true;
+                    }
                     FlxG.switchState(new archipelago.traps.games.APPongTrapState(MusicBeatState.getState()));
                 }, true, false).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
@@ -322,13 +324,15 @@ class APItem {
             case "UNO Challenge":
                 return new APTrap(name, ConditionHelper.Everywhere(), function() {
                     popup('Win the round to survive!', "APItem: UNO Challenge", true);
-                    APPlayState.instance.paused = true;
-                    APPlayState.instance.canResync = false;
-                    FlxG.camera.followLerp = 0;
-                    LoadingState.noteCache = [];
-                    states.PlayState.curChart = [];
-                    MusicBeatState.allowNuke = true;
-                    FlxG.switchState(new archipelago.traps.games.APPongTrapState(MusicBeatState.getState()));
+                    if (MusicBeatState.getState() == APPlayState.instance) {
+                        APPlayState.instance.paused = true;
+                        APPlayState.instance.canResync = false;
+                        FlxG.camera.followLerp = 0;
+                        LoadingState.noteCache = [];
+                        states.PlayState.curChart = [];
+                        MusicBeatState.allowNuke = true;
+                    }
+                    FlxG.switchState(new archipelago.traps.games.APUnoTrapState(MusicBeatState.getState()));
                 }, true, false).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;

source/archipelago/APItem.hx

@@ -489,7 +489,7 @@ class APFreeplayManager extends FreeplayManager {
                             }
                             for (songObj in curUnlocked)
                             {
-                                if (songObj.song.trim().toLowerCase().replace('-', ' ') == songNameThing.trim().toLowerCase().replace('-', ' ') && leWeek.folder == songObj.mod)
+                                if (songObj.song.trim().toLowerCase().replace('-', ' ') == songNameThing.trim().toLowerCase().replace('-', ' ') && leWeek.folder == songObj.mod && !isMissing)
                                     addSong(song[0], i, song[1], [colors, [FlxColor.fromRGB(colors[0], colors[1], colors[2])]]);
                             }
                         }
@@ -596,6 +596,7 @@ class APFreeplayManager extends FreeplayManager {
         }
 
 
+        Mods.currentModDirectory = '';
         if (refresh)
 		{
 			for (songObj in APFreeplayManager.curUnlocked) {

source/managers/APFreeplayManager.hx

@@ -246,23 +246,27 @@ class GameOverSubstate extends MusicBeatSubstate
 			}
 			else if (justPlayedLoop)
 			{
-				switch(PlayState.SONG.stage)
-				{
-					case 'tank':
-						coolStartDeath(0.2);
-
-						var exclude:Array<Int> = [];
-						//if(!ClientPrefs.cursing) exclude = [1, 3, 8, 13, 17, 21];
-
-						FlxG.sound.play(Paths.sound('jeffGameover/jeffGameover-' + FlxG.random.int(1, 25, exclude)), 1, false, null, true, function() {
-							if(!isEnding)
-							{
-								FlxG.sound.music.fadeIn(0.2, 1, 4);
-							}
-						});
-
-					default:
-						coolStartDeath();
+				if (PlayState.SONG != null) {
+					switch(PlayState.SONG.stage)
+					{
+						case 'tank':
+							coolStartDeath(0.2);
+
+							var exclude:Array<Int> = [];
+							//if(!ClientPrefs.cursing) exclude = [1, 3, 8, 13, 17, 21];
+
+							FlxG.sound.play(Paths.sound('jeffGameover/jeffGameover-' + FlxG.random.int(1, 25, exclude)), 1, false, null, true, function() {
+								if(!isEnding)
+								{
+									FlxG.sound.music.fadeIn(0.2, 1, 4);
+								}
+							});
+
+						default:
+							coolStartDeath();
+					}
+				} else {
+					coolStartDeath();
 				}
 			}