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

Author: Z11Coding

source/psychlua/FunkinLua.hx

@@ -225,6 +225,10 @@ class FunkinLua {
 		set('mania', PlayState.mania);
 		set('trueMania', Note.ammo[PlayState.mania]);
 
+		// function addProtectedCallback(lua:State, name:String, func:Dynamic) {
+			
+		// }
+
 		//Fun cursor things for lua
 		Lua_helper.add_callback(lua, "getCursorMode", function()
 		{

source/states/PlayState.hx

@@ -2303,7 +2303,7 @@ class PlayState extends MusicBeatState
 
 	private function generateSong():Void
 	{
-		trace('Generating Song: ${SONG.song}');
+		// trace('Generating Song: ${SONG.song}');
 		// FlxG.log.add(ChartParser.parse());
 		songSpeed = PlayState.SONG.speed;
 		songSpeedType = ClientPrefs.getGameplaySetting('scrolltype');
@@ -7164,7 +7164,7 @@ class PlayState extends MusicBeatState
 				}
 			}
 
-			if(!cpuControlled && !ClientPrefs.getGameplaySetting('showcase', false))
+			if(!cpuControlled && !ClientPrefs.getGameplaySetting('showcase', false) && !note.botNote)
 			{
 				var spr = field.strumNotes[note.column];
 				if(spr != null) spr.playAnim('confirm', true);