eeee

Author: Yuta12342

assets/embed/apworld/fridaynightfunkin.apworld

@@ -266,10 +266,10 @@ class APItem {
                     });
                 }), function() {
                     // Check if we need to download repository content first
-                    if (APInfo.slotData != null && APInfo.slotData.highQualityExpected) {
+                    if (APInfo.slotData != null && APInfo.slotData.highQualityExpected && archipelago.HighQualityTrapManager.needsWaitingState()) {
                         // If expected but not available, go to existing high quality waiting state
                         if (APInfo.apGame != null && APInfo.ap != null) {
-                            FlxG.switchState(new archipelago.states.HighQualityWaitingState(APInfo.apGame, APInfo.ap));
+                            FlxG.switchState(new archipelago.states.HighQualityWaitingState(APInfo.apGame, APInfo.ap, true));
                         } else {
                             // Fallback: use the non-AP waiting state if not in AP context
                             FlxG.switchState(new states.HighQualityTrapWaitingState());
@@ -684,6 +684,7 @@ class APItem {
                 }), function() {
                     popup('Oh god no here she comes', "Resistance Trap", true);
                     APPlayState.instance.startResisting();
+                    APPlayState.resisting = true;
                 }, true, false).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;

source/archipelago/APItem.hx

@@ -33,6 +33,7 @@ class APPlayState extends PlayState {
     public static var deathByLink:Bool = false;
     public static var deathByBlueBalls:Bool = false;
     public static var alreadyKilledByLink:Bool = false;
+    public static var resisting:Bool = false;
     public var antiHornySpray:Bool = false;
     public var noHorny(get, never):Bool;
 
@@ -2557,6 +2558,12 @@ class APPlayState extends PlayState {
 
 		ClientPrefs.data.downScroll = ogScroll;
 
+        if (resisting)
+        {
+            resisting = false;
+            boyfriend.playAnim('Hey!', true);
+        }
+
         if (releasethebeast)
         {
             // Null checks before tweening

source/archipelago/APPlayState.hx

@@ -531,6 +531,10 @@ class APStyledEntryState extends MusicBeatState {
         }
         FNF.destroy();
 
+
+        infoContent += "\n\nNote for Universal Tracker users: \n";
+        infoContent += "Ensure that when you connect with Universal Tracker, you have all of the YAML files of all players in your session placed in the Archipelago Players folder, so that all items and IDs can be properly synchronized.";
+
         openSubState(new InfoPanelSubstate(infoTitle, infoContent, FlxColor.CYAN));
     }
 
@@ -899,7 +903,7 @@ class APStyledEntryState extends MusicBeatState {
         // Check if high quality content is expected and should be downloaded
         if (slotData != null && slotData.highQualityExpected == true) {
             // Go to existing high quality waiting state first
-            FlxG.switchState(new archipelago.states.HighQualityWaitingState(apGame, ap));
+            FlxG.switchState(new archipelago.states.HighQualityWaitingState(apGame, ap, false));
         } else {
             // Normal flow - go directly to AP category state
             FlxG.switchState(new archipelago.APCategoryState(apGame, ap));