a

Author: Z11Coding

source/archipelago/APNote.hx

@@ -60,6 +60,7 @@ class APNote extends objects.Note {
             var location:Int = locations[i % locations.length];
             var apNote = new APNote(note, location, null); // Create a new APNote with the location
             newNotes.push(apNote);
+            notes.isCheck = true;
             notes[randomIndices[i]] = apNote; // Replace the original note with the APNote
         }
 

source/archipelago/APPlayState.hx

@@ -1355,7 +1355,8 @@ class APPlayState extends PlayState {
     public static var ghostChat:Bool = false;
     // I feel bad for the poor soul that has this trigger on them multiple times
     public function triggerGhostChat()
-    { ghostChat = true;
+    { 
+        ghostChat = true;
         randoTimer.start(FlxG.random.float(5, 10), function(tmr:FlxTimer)
         tmr.reset(FlxG.random.float(5, 10) + (FlxG.random.bool(10) ? FlxG.random.float(1, 20) : 0))); doEffect(effectArray[curEffect]);
         trace("Ghost Chat Activated! L E T  T H E  C H A O S  B E G I N !");
@@ -1495,6 +1496,11 @@ class APPlayState extends PlayState {
     private override function generateSong():Void
     {
         super.generateSong();
+        if (PlayState.SONG == null) return;
+        archipelago.APNote.replaceNotes(allNotes, apGame.excludeCheckedLocations(apGame.noteData(PlayState.SONG.song, currentMod)));
+
+        for (field in playfields.members)
+			field.clearStackedNotes();
     }
 
 	// override public function generateNotes(song:SwagSong, AI:Array<Array<Float>>):Void
@@ -1859,25 +1865,7 @@ class APPlayState extends PlayState {
         for (i in activeItems)
             if (i == 0)
                 FlxG.save.data.activeItems = null;
-
-        /*if (FlxG.keys.justPressed.F)
-        {
-            switch (FlxG.random.int(0, 2))
-            {
-                case 0:
-                    activeItems[0] += 1;
-                    ArchPopup.startPopupCustom('You Got an Item!', '+1 Shield ( ' + activeItems[0] + ' Left)', 'archColor');
-                case 1:
-                    activeItems[1] = 1;
-                    ArchPopup.startPopupCustom('You Got an Item!', "Blue Ball's Curse", 'archColor');
-                case 2:
-                    activeItems[2] += 1;
-                    ArchPopup.startPopupCustom('You Got an Item!', "Max HP Up!", 'archColor');
-                case 3:
-                    keybindSwitch('SAND');
-                    ArchPopup.startPopupCustom('You Got an Item!', "Keybind Switch (S A N D)", 'archColor');
-            }
-        }*/
+        
         #if windows
 		for (video in addedMP4s)
 		{
@@ -2245,8 +2233,7 @@ class APPlayState extends PlayState {
 		}
 
         if (note.isCheck) {
-            if (ClientPrefs.data.notePopup)
-                ArchPopup.startPopupCustom('You Found A Check!', '$check/$itemAmount', 'archColor'); // test
+            ArchPopup.startPopupCustom('You Found A Check!', 'One of em anyway', 'archColor'); // test
             checkedNotes.push(cast(note, archipelago.APNote));
         }
 

source/states/PlayState.hx

@@ -2421,18 +2421,18 @@ class PlayState extends MusicBeatState
 				daBpm = section.bpm;
 
 			// Function to get random mappings from available indexes and a list of special integers
-			function getAPLocations(max:Int, loc:Array<Int>, gottaHit:Array<Bool>):Array<{index:Int, loc:Int}> {
+			/*function getAPLocations(max:Int, loc:Array<Int>, gottaHit:Array<Bool>):Array<{index:Int, loc:Int}> {
 				var mappings:Array<{index:Int, loc:Int}> = [];
 				var indexes:Array<Int> = [for (i in 0...max) if (gottaHit[i]) i];
-				
+				//trace(indexes.length);
 				for (i in 0...Std.int(Math.min(indexes.length, loc.length))) {
 					mappings.push({index: indexes[i], loc: loc[i]});
 				}
 				return mappings;
-			}
+			}*/
 
-			var gottaHit:Array<Bool> = [for (note in section.sectionNotes) note[1] < (SONG.mania != null ? totalColumns : Note.ammo[3])];
-			var APNotes:Array<{index:Int, loc:Int}> = (this is archipelago.APPlayState) ? getAPLocations(section.sectionNotes.length, archipelago.APGameState.instance.noteData(PlayState.SONG.song, archipelago.APPlayState.currentMod), gottaHit) : [];
+			//var gottaHit:Array<Bool> = [for (note in section.sectionNotes) note[1] < (SONG.mania != null ? totalColumns : Note.ammo[3])];
+			//var APNotes:Array<{index:Int, loc:Int}> = (this is archipelago.APPlayState) ? getAPLocations(section.sectionNotes.length, archipelago.APGameState.instance.noteData(PlayState.SONG.song, archipelago.APPlayState.currentMod), gottaHit) : [];
 
 			for (i in 0...section.sectionNotes.length)
 			{
@@ -2442,15 +2442,15 @@ class PlayState extends MusicBeatState
 				var noteStartColumn:Int = Std.int(songNotes[1] % Note.ammo[SONG.mania != null ? SONG.mania : 3]);
 				var holdLength:Float = songNotes[2];
 				var noteType:String = !Std.isOfType(songNotes[3], String) ? Note.defaultNoteTypes[songNotes[3]] : songNotes[3];
-				var apNote:Bool = (function() {
+				/*var apNote:Bool = (function() {
 					for (apNoteData in APNotes) {
 						if (apNoteData.index == i) {
 							return true;
 						}
 					}
 					return false;
-				})();
-				var apLoc = APNotes.filter(function(apNoteData) return apNoteData.index == i)[0]?.loc;
+				})();*/
+				//var apLoc = APNotes.filter(function(apNoteData) return apNoteData.index == i)[0]?.loc;
 				if (Math.isNaN(holdLength)) holdLength = 0.0;
 
 				if (chartModifier != "4K Only" && chartModifier != "ManiaConverter") {
@@ -2856,8 +2856,13 @@ class PlayState extends MusicBeatState
 					oldNote = null;
 
 				var swagNote:Note = new Note(spawnTime, noteColumn, oldNote);
-				if (apNote)
+				/*if (apNote) {
 					swagNote = new archipelago.APNote(swagNote, apLoc);
+					swagNote.isCheck = true; //Just in case
+					swagNote.rgbShader.r = 0x3380CC;
+					swagNote.rgbShader.g = 0x3380CC; 
+					swagNote.rgbShader.b = 0x3380CC;   
+				}*/
 				swagNote.mustPress = gottaHitNote;
 				if (!swagNote.mustPress)
 				{