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

Author: Yuta12342

source/archipelago/APInfo.hx

@@ -129,12 +129,12 @@ class APInfo {
 	public static final basePico:Array<String> = 
 	[
 		'Darnell', 'Lit Up', '2Hot', 'Blazin',
-		'Bopeebo (Pico mix)', 'Fresh (Pico mix)', 'Dad Battle (Pico mix)',
+		'Bopeebo (Pico Mix)', 'Fresh (Pico mix)', 'Dad Battle (Pico mix)',
 		'Spookeez (Pico mix)', 'South (Pico mix)',
 		'Pico (Pico mix)', 'Philly Nice (Pico mix)', 'Blammed (Pico mix)',
-		'Eggnog (Pico mix)', 'Cocoa (Pico mix)',
+		'Eggnog (Pico Mix)', 'Cocoa (Pico Mix)',
 		'Senpai (Pico mix)', 'Roses (Pico mix)',
-		'Ugh (Pico mix)', 'Guns (Pico mix)', 'Stress (Pico mix)'
+		'Ugh (Pico mix)', 'Guns (Pico mix)', 'Stress (Pico Mix)'
 	];
 
 	public static final secrets:Array<String> = [

source/objects/Note.hx

@@ -970,9 +970,9 @@ class Note extends NoteObject
 			skin = PlayState.SONG != null ? PlayState.SONG.arrowSkin : null;
 			if (skin == null || skin.length < 1)
 				skin = "noteSkins/NOTE_assets" + postfix;
-			if (PlayState.isPixelStage) rgbShader.enabled = false;
+			if (PlayState.isPixelStage)
+				rgbShader.enabled = false;
 		}
-		else rgbShader.enabled = false;
 
 		var animName:String = null;
 		if(animation.curAnim != null) {

source/objects/StrumNote.hx

@@ -107,14 +107,19 @@ class StrumNote extends NoteObject
 
 	public function reloadNote()
 	{
-		var skin:String = texture;
+		var postfix:String = Note.getNoteSkinPostfix();
+		var skin:String = texture + postfix;
 		if(texture.length < 1)
 		{
 			skin = PlayState.SONG != null ? PlayState.SONG.arrowSkin : null;
-			if ((skin == null || skin.length < 1) && PlayState.isPixelStage)
-				skin = "noteSkins/NOTE_assets";
-			else if ((skin == null || skin.length < 1) && !PlayState.isPixelStage)
-				skin = "noteSkins/strums";
+			if (skin == null || skin.length < 1) {
+				if (postfix == null || postfix.length < 1)
+					skin = "noteSkins/strums";
+				else
+					skin = "noteSkins/NOTE_assets" + postfix;
+			}
+			if (PlayState.isPixelStage)
+				rgbShader.enabled = false;
 		}
 
 		var lastAnim:String = null;

source/stages/PhillyBlazin.hx

@@ -27,6 +27,7 @@ class PhillyBlazin extends BaseStage
 
 	override function create()
 	{
+		StickerSubState.STICKER_PACK = "weekend";
 		FlxTransitionableState.skipNextTransOut = true; //skip the original transition fade
 		function setupScale(spr:BGSprite)
 		{
@@ -74,21 +75,13 @@ class PhillyBlazin extends BaseStage
 			additionalLighten.visible = false;
 			add(additionalLighten);
 		}
-
-		abot = new ABotSpeaker(gfGroup.x, gfGroup.y + 550);
-		add(abot);
 
 		if(ClientPrefs.data.shaders)
 			setupRainShader();
 
-		var _song = PlayState.SONG;
-		if(_song.gameOverSound == null || _song.gameOverSound.trim().length < 1) GameOverSubstate.deathSoundName = 'fnf_loss_sfx-pico-gutpunch';
-		if(_song.gameOverLoop == null || _song.gameOverLoop.trim().length < 1) GameOverSubstate.loopSoundName = 'gameOver-pico';
-		if(_song.gameOverEnd == null || _song.gameOverEnd.trim().length < 1) GameOverSubstate.endSoundName = 'gameOverEnd-pico';
-		if(_song.gameOverChar == null || _song.gameOverChar.trim().length < 1) GameOverSubstate.characterName = 'pico-blazin';
-		GameOverSubstate.deathDelay = 0.15;
-
 		setDefaultGF('nene');
+		gfGroup.y += 200;
+		gfGroup.x += 50;
 		precache();
 
 		if (isStoryMode)
@@ -113,6 +106,15 @@ class PhillyBlazin extends BaseStage
 
 	override function createPost()
 	{
+		super.createPost();
+
+		var _song = PlayState.SONG;
+		if(_song.gameOverSound == null || _song.gameOverSound.trim().length < 1) GameOverSubstate.deathSoundName = 'fnf_loss_sfx-pico-gutpunch';
+		if(_song.gameOverLoop == null || _song.gameOverLoop.trim().length < 1) GameOverSubstate.loopSoundName = 'gameOver-pico';
+		if(_song.gameOverEnd == null || _song.gameOverEnd.trim().length < 1) GameOverSubstate.endSoundName = 'gameOverEnd-pico';
+		if(_song.gameOverChar == null || _song.gameOverChar.trim().length < 1) GameOverSubstate.characterName = 'pico-blazin';
+		GameOverSubstate.deathDelay = 0.15;
+
 		FlxG.camera.focusOn(camFollow.getPosition());
 		FlxG.camera.fade(FlxColor.BLACK, 1.5, true, null, true);
 
@@ -131,7 +133,7 @@ class PhillyBlazin extends BaseStage
 			if(character == null) continue;
 			character.color = 0xFF888888;
 		}
-		abot.color = 0xFF888888;
+		PicoCapableStage.instance.abot.color = 0xFF888888;
 
 		var unspawnNotes:Array<Note> = cast game.unspawnNotes;
 		for (note in unspawnNotes)