its a very bad patchwork, but it works for now so I dont care

Author: Z11Coding

assets/base_game/shared/data/blazin/blazin-easy.json

@@ -961,7 +961,7 @@
 		"format": "psych_v1_convert",
 		"bpm": 180,
 		"needsVoices": false,
-		"song": "Blazin'",
+		"song": "Blazin",
 		"offset": 0
 	}
 }

assets/base_game/shared/data/blazin/blazin-hard.json

@@ -979,7 +979,7 @@
 		"format": "psych_v1_convert",
 		"bpm": 180,
 		"needsVoices": false,
-		"song": "Blazin'",
+		"song": "Blazin",
 		"offset": 0
 	}
 }

assets/base_game/shared/data/blazin/blazin.json

@@ -965,7 +965,7 @@
 		"format": "psych_v1_convert",
 		"bpm": 180,
 		"needsVoices": false,
-		"song": "Blazin'",
+		"song": "Blazin",
 		"offset": 0
 	}
 }

source/archipelago/APEntryState.hx

@@ -409,6 +409,7 @@ class APEntryState extends MusicBeatState
 	function onSlotConnected(slotData:Dynamic):Void
 	{
 		trace("Connected - switching to game state");
+		gonnaRunSync = true; // You'll thank me later
 		polltimer.stop();
 		ap.onRoomInfo.remove(onRoomInfo);
 		ap.onSlotRefused.remove(onSlotRefused);
@@ -443,6 +444,7 @@ class APEntryState extends MusicBeatState
 		// if (ClientPrefs.data.deathlink)
 		apGame.info().toggleDeathLink(deathLink);
 
+		APGameState.isSync = true;
 		runArch();
 	}
 
@@ -655,7 +657,6 @@ class APEntryState extends MusicBeatState
 	function runArch():Void // Soon
 	{
 		inArchipelagoMode = true;
-		gonnaRunSync = true; // You'll thank me later
 		backend.WeekData.reloadWeekFiles(false);
 		FlxG.save.data.closeDuringOverRide = false;
 		FlxG.save.data.manualOverride = false;

source/archipelago/APGameState.hx

@@ -278,7 +278,7 @@ class APGameState {
     }
 
     public static var isSync:Bool = false;
-    var haventranyet:Bool = true;
+    public static var haventranyet:Bool = true;
     function addSongs(song:Array<NetworkItem>)
     {
         var nonSongs:Map<String, Int> = [];
@@ -390,15 +390,34 @@ class APGameState {
             }
             else
             {
-                ItemIndex = nonSongs.get(items);
-                archipelago.APItem.createItemByName(items);
+                if (haventranyet) {
+                    if (!trapList.contains(items)) {
+                        ItemIndex = nonSongs.get(items);
+                        archipelago.APItem.createItemByName(items);
+                    }
+                } else {
+                    ItemIndex = nonSongs.get(items);
+                    archipelago.APItem.createItemByName(items);
+                }
             }
         }
-        archipelago.APItem.doCheck();
+        if (!haventranyet) {
+            archipelago.APItem.doCheck();
+        }
+        //haventranyet = false;
         isSync = false;
 
     }
 
+    // A bandage fix till we have enough brainpower to fix this properly
+    var trapList:Array<String> = [
+        "Blue Balls Curse",
+        "Fake Transition",
+        "SvC Effect",
+        "Ghost Chat",
+        "Tutorial Trap"
+    ];
+
     public function isLocationMissing(location:String):Bool
     {
         for (missing in info().missingLocations)

source/archipelago/APItem.hx

@@ -103,9 +103,9 @@ class APItem {
             this.isException = true;
         }
 
-        if (APEntryState.gonnaRunSync && this.toSync) {
+        if (APGameState.isSync && this.toSync) {
             allItems.push(this); trace('Item to sync: ${this.name}');
-        } else if (!APEntryState.gonnaRunSync) {
+        } else if (!APGameState.isSync) {
             allItems.push(this); trace('Item: ${this.name}');
         }
 
@@ -179,23 +179,45 @@ class APItem {
         }
 
     public function trigger():Void {
-        trace("Triggering item: " + this.name);
-        trace("Is exception: " + this.isException);
-        trace("Condition type: " + this.condition.type);
-        trace("Condition check result: " + this.condition.checkFn());
-
-        if (!this.isException && this.condition.type != ConditionType.Everywhere && this.condition.checkFn()) {
-            trace("Setting active item to: " + this.name);
-            APItem.activeItem = this;
-        } else {
-            trace("Active item not set due to condition, exception rules, or being an Everywhere item.");
-        }
+        trace('is Gonna Run Sync: ${APGameState.isSync}');
+        if (APGameState.isSync && !this.toSync) {
+            trace("Triggering item: " + this.name);
+            trace("Is exception: " + this.isException);
+            trace("Condition type: " + this.condition.type);
+            trace("Condition check result: " + this.condition.checkFn());
+
+            if (!this.isException && this.condition.type != ConditionType.Everywhere && this.condition.checkFn()) {
+                trace("Setting active item to: " + this.name);
+                APItem.activeItem = this;
+            } else {
+                trace("Active item not set due to condition, exception rules, or being an Everywhere item.");
+            }
+
+            if (this.condition.checkFn()) {
+                trace("Condition passed, executing onTrigger for item: " + this.name);
+                onTrigger();
+            } else {
+                trace("Condition failed, onTrigger not executed for item: " + this.name);
+            }
+        } else if (!APGameState.isSync) {
+            trace("Triggering item: " + this.name);
+            trace("Is exception: " + this.isException);
+            trace("Condition type: " + this.condition.type);
+            trace("Condition check result: " + this.condition.checkFn());
+
+            if (!this.isException && this.condition.type != ConditionType.Everywhere && this.condition.checkFn()) {
+                trace("Setting active item to: " + this.name);
+                APItem.activeItem = this;
+            } else {
+                trace("Active item not set due to condition, exception rules, or being an Everywhere item.");
+            }
 
-        if (this.condition.checkFn()) {
-            trace("Condition passed, executing onTrigger for item: " + this.name);
-            onTrigger();
-        } else {
-            trace("Condition failed, onTrigger not executed for item: " + this.name);
+            if (this.condition.checkFn()) {
+                trace("Condition passed, executing onTrigger for item: " + this.name);
+                onTrigger();
+            } else {
+                trace("Condition failed, onTrigger not executed for item: " + this.name);
+            }
         }
 
         trace("Removing item from allItems: " + this.name);

source/archipelago/APPlayState.hx

@@ -1123,7 +1123,7 @@ effectMap = [
 			var content:String = sys.io.File.getContent(Paths.txt("words"));
 			wordList = content.toLowerCase().split("\n");
 		}
-        wordList.push(PlayState.SONG.song);
+        wordList.push(PlayState.SONG?.song);
 		trace(wordList.length + " words loaded");
 		trace(wordList);
 		validWords.resize(0);

source/archipelago/Client.hx

@@ -1405,7 +1405,6 @@ class Client {
 							games: gameData,
 						};
 						_dataPackage = data;
-						APGameState.isSync = true;
 						APGameState.instance.APLocations = missingLocations.concat(checkedLocations);
 						APGameState.instance.APItems = APGameState.instance.findSpecialItems();
 						return ArchPopup.startPopupCustom("The game can now be played!", "You are now connected to the server. Have fun!", "archColor");

source/states/FreeplayState.hx

@@ -131,7 +131,7 @@ class FreeplayState extends MusicBeatState
 		Cursor.cursorMode = Default;
 		instance = this; // For Archipelago
 
-		if (APEntryState.apGame != null && APEntryState.apGame.info() != null) {
+		if (APEntryState.apGame != null && APEntryState.apGame.info() != null && APEntryState.gonnaRunSync) {
 			APEntryState.apGame.info().Sync();
 			APEntryState.gonnaRunSync = false;
 
@@ -329,6 +329,9 @@ class FreeplayState extends MusicBeatState
 			ticketCounter.setFormat(Paths.font("fnf1.ttf"), 32, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 			ticketCounter.scrollFactor.set();
 			add(ticketCounter);
+			new FlxTimer().start(1, function(tmr:FlxTimer) {
+				archipelago.APGameState.haventranyet = false;
+			});
 		}
 	}
 

source/states/PlayState.hx

@@ -444,6 +444,11 @@ class PlayState extends MusicBeatState
 
 	override public function create()
 	{
+		if (SONG == null) {
+			var songLowercase:String = Paths.formatToSongPath('tutorial');
+			var poop:String = Highscore.formatSong(songLowercase, storyDifficulty);	
+			Song.loadFromJson(poop, songLowercase);
+		}
 		inArchipelagoMode = archipelago.APEntryState.inArchipelagoMode;
 		if (inArchipelagoMode && !(this is archipelago.APPlayState))
 		{
@@ -1964,7 +1969,7 @@ class PlayState extends MusicBeatState
 
 	private var noteTypes:Array<String> = [];
 	private var eventsPushed:Array<String> = [];
-	private var totalColumns:Int = Note.ammo[SONG.mania != null ? SONG.mania : mania];
+	private var totalColumns:Int = Note.ammo[SONG?.mania != null ? SONG?.mania : mania];
 	var prevNoteData:Int = -1;
 	var initialNoteData:Int = -1;
 	var caseExecutionCount:Int = FlxG.random.int(-50, 50);