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

Author: Yuta12342

source/objects/Note.hx

@@ -650,21 +650,21 @@ class Note extends NoteObject
 				prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.05;
 				if(createdFrom != null && createdFrom.songSpeed != null) prevNote.scale.y *= createdFrom.songSpeed;
 
-				if(PlayState.isPixelStage) {
+				/*if(PlayState.isPixelStage) {
 					prevNote.scale.y *= 1.19;
 					prevNote.scale.y *= (6 / height); //Auto adjust note size
-				}
+				}*/
 				prevNote.updateHitbox();
 
 				// offsetY += height / 2;
 				// prevNote.setGraphicSize();
 			}
 
-			if(PlayState.isPixelStage)
+			/*if(PlayState.isPixelStage)
 			{
 				scale.y *= PlayState.daPixelZoom;
 				updateHitbox();
-			}
+			}*/
 			earlyHitMult = 0;
 		}
 		else if(!isSustainNote)

source/options/GameplayChangersSubstate.hx

@@ -49,6 +49,8 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 		option.displayFormat = '%vX';
 		option.decimals = 2;
 		optionsArray.push(option);
+
+		optionsArray.push(new GameplayOption('Random Playback Rate', 'randomspeedchange', BOOL, false));
 		#end
 
 		var option:GameplayOption = new GameplayOption('Health Gain Multiplier', 'healthgain', FLOAT, 1);

source/options/MixtapeSettingsSubState.hx

@@ -33,8 +33,8 @@ class MixtapeSettingsSubState extends BaseOptionsMenu
 			[
 				"OG", 
 				"Mixtape", 
-				"Kade (NA)",
-				"Tabi (NA)", 
+				"Kade",
+				"Tabi", 
 				"Double (NA)", 
 				"Lives (NA)", 
 				"Lives + HealthBar (NA)", 

source/stages/PhillyBlazin.hx

@@ -109,21 +109,6 @@ class PhillyBlazin extends BaseStage
 			}
 		}
 
-		var off:Float = Math.min(FlxG.width, 1280) / 4;
-		var opp:Int = PlayState.instance.opponentmode ? 0 : 1;
-		
-		var halfKeys:Int = Math.floor(Note.ammo[PlayState.mania] / 2);
-		if (Note.ammo[PlayState.mania] % 2 != 0) // middle receptor dissappears, if there is one
-			PlayState.instance.modManager.setValue('alpha${halfKeys + 1}', 1.0, opp);
-		
-		for (i in 0...halfKeys)
-			PlayState.instance.modManager.setValue('transform${i}X', -off, opp);
-		for (i in Note.ammo[PlayState.mania]-halfKeys...Note.ammo[PlayState.mania])
-			PlayState.instance.modManager.setValue('transform${i}X', off, opp);
-
-		PlayState.instance.modManager.setValue("alpha", 1, opp);
-		PlayState.instance.modManager.setValue("opponentSwap", 0.5);
-
 	}
 
 	override function createPost()
@@ -159,6 +144,21 @@ class PhillyBlazin extends BaseStage
 		}
 		remove(dadGroup, true);
 		addBehindBF(dadGroup);
+
+		var off:Float = Math.min(FlxG.width, 1280) / 4;
+		var opp:Int = PlayState.instance.opponentmode ? 0 : 1;
+		
+		var halfKeys:Int = Math.floor(Note.ammo[PlayState.mania] / 2);
+		if (Note.ammo[PlayState.mania] % 2 != 0) // middle receptor dissappears, if there is one
+			PlayState.instance.modManager.setValue('alpha${halfKeys + 1}', 1.0, opp);
+		
+		for (i in 0...halfKeys)
+			PlayState.instance.modManager.setValue('transform${i}X', -off, opp);
+		for (i in Note.ammo[PlayState.mania]-halfKeys...Note.ammo[PlayState.mania])
+			PlayState.instance.modManager.setValue('transform${i}X', off, opp);
+
+		PlayState.instance.modManager.setValue("alpha", 1, opp);
+		PlayState.instance.modManager.setValue("opponentSwap", 0.5);
 	}
 
 	override function beatHit()

source/states/FreeplayState.hx

@@ -128,6 +128,7 @@ class FreeplayState extends MusicBeatState
 	var ticketCounter:FlxText = null;
 	override function create()
 	{
+		Cursor.cursorMode = Default;
 		instance = this; // For Archipelago
 
 		if (APEntryState.apGame != null && APEntryState.apGame.info() != null) {
@@ -1323,7 +1324,7 @@ class FreeplayState extends MusicBeatState
 		updateTexts(elapsed);
 		super.update(elapsed);
 
-		ticketCounter.text = 'Current ticket amount: ${APInfo.ticketCount}\nTickets Total: ${APInfo.ticketWinCount}\nTickets Left: ${Std.int(APInfo.ticketCount - APInfo.ticketWinCount)}';
+		if (ticketCounter != null) ticketCounter.text = 'Current ticket amount: ${APInfo.ticketCount}\nTickets Total: ${APInfo.ticketWinCount}\nTickets Left: ${Std.int(APInfo.ticketCount - APInfo.ticketWinCount)}';
 
 		grpLocks.forEach(function(lock:FlxSprite)
 		{

source/states/MainMenuState.hx

@@ -49,7 +49,7 @@ class MainMenuState extends MusicBeatState
 	override function create()
 	{
 
-
+		Cursor.cursorMode = Default;
 		checker = new flixel.addons.display.FlxBackdrop(Paths.image('mainmenu/Main_Checker'), XY, Std.int(0.2), Std.int(0.2));
 
 		super.create();