a

Author: Z11Coding

source/backend/Paths.hx

@@ -230,7 +230,7 @@ class Paths
 
 	// The "If All Else Fails" option
 	// The "If All Else Fails" option
-	public static function nukeMemory(?useAlt:Bool = true){
+	public static function nukeMemory(?useAlt:Bool = false){
 		if (useAlt) {
 			clearStoredWithoutStickers();
 

source/objects/StrumNote.hx

@@ -113,7 +113,7 @@ class StrumNote extends NoteObject
 			if(Paths.fileExists('images/$customSkin.png', IMAGE)) skin = customSkin;
 		}
 		else {
-			var customSkin:String = 'NOTE_assets';
+			var customSkin:String = skin = (PlayState.SONG != null ? PlayState.SONG.arrowSkin : 'NOTE_assets') + Note.getNoteSkinPostfix();
 			skin = (PlayState.isPixelStage ? customSkin : 'noteSkins/strums');
 		}
 
@@ -135,22 +135,18 @@ class StrumNote extends NoteObject
 		if(animation.curAnim != null) lastAnim = animation.curAnim.name;
 		var pxDV:Int = Note.pixelNotesDivisionValue[1];
 
-		var ogSkin:String = texture;
-		if (texture == 'noteSkins/NOTE_assets')
-			texture = 'noteSkins/' + (PlayState.isPixelStage ? ogSkin : 'strums');
-
 		animationArray[0] = Note.keysShit.get(PlayState.mania).get('strumAnims')[column];
 		animationArray[1] = Note.keysShit.get(PlayState.mania).get('letters')[column];
 		animationArray[2] = Note.keysShit.get(PlayState.mania).get('letters')[column]; //jic
 
 		if(PlayState.isPixelStage)
 		{
-			loadGraphic(Paths.image('pixelUI/' + texture));
+			loadGraphic(Paths.image('pixelUI/noteSkins/' + texture));
 			pxDV = Note.pixelNotesDivisionValue[width == 306 ? 1 : 0];
 			width = width / pxDV;
 			height = height / 5;
 			antialiasing = false;
-			loadGraphic(Paths.image('pixelUI/' + texture), true, Math.floor(width), Math.floor(height));
+			loadGraphic(Paths.image('pixelUI/noteSkins/' + texture), true, Math.floor(width), Math.floor(height));
 			var daFrames:Array<Int> = Note.keysShit.get(PlayState.mania).get('pixelAnimIndex');
 
 			setGraphicSize(Std.int(width * PlayState.daPixelZoom * Note.pixelScales[PlayState.mania]));
@@ -163,7 +159,22 @@ class StrumNote extends NoteObject
 		}
 		else
 		{
-			frames = Paths.getSparrowAtlas(texture);
+			var postfix:String = Note.getNoteSkinPostfix();
+			var skin:String = texture + postfix;
+			if(texture.length < 1)
+			{
+				skin = (PlayState.SONG != null ? PlayState.SONG.arrowSkin : (texture + postfix));
+				if (skin == null || skin.length < 1) {
+					if (postfix == null || postfix.length < 1)
+						skin = "noteSkins/strums";
+					else
+						skin = "noteSkins/NOTE_assets" + postfix;
+				}
+			}
+
+			trace("Skin: " + skin);
+
+			frames = Paths.getSparrowAtlas(skin);
 			antialiasing = ClientPrefs.data.antialiasing;
 			setGraphicSize(Std.int(width * Note.scales[PlayState.mania]));
 

source/states/LoadingState.hx

@@ -351,8 +351,6 @@ class LoadingState extends MusicBeatState
 		if (stopMusic && FlxG.sound.music != null)
 			FlxG.sound.music.stop();
 
-		MusicBeatState.allowNuke = false;
-
 		FlxG.camera.visible = false;
 		MusicBeatState.switchState(target);
 		transitioning = true;

source/states/PlayState.hx

@@ -539,7 +539,6 @@ class PlayState extends MusicBeatState
 
 	override public function create()
 	{
-
 		#if MULTITHREADED_LOADING
 		// Due to the Main thread and Discord thread, we decrease it by 2.
 		var threadCount:Int = Std.int(Math.max(1, LoadingState.getCPUThreadsCount() - #if DISCORD_ALLOWED 2 #else 1 #end));
@@ -5326,12 +5325,14 @@ class PlayState extends MusicBeatState
 
 	public function die(?trueKill:Bool = false):Void
 	{
-		bfkilledcheck = true;
-		health = 0;
-		if (trueKill) lives = 0;
-		else lives -= 1;
-		noteMissPress(3, opponentmode ? dadField : playerField); // just to make sure you actually die
-		doDeathCheck(true);
+		if (trueKill)
+			doDeathCheck(true);
+		else {
+			bfkilledcheck = true;
+			health = 0;
+			noteMissPress(3, opponentmode ? dadField : playerField); // just to make sure you actually die
+			doDeathCheck();
+		}
 	}
 
 	// the void varient of the function above with trueKill set to true
@@ -6586,7 +6587,6 @@ class PlayState extends MusicBeatState
 
 		LoadingState.noteCache = [];
 		curChart = [];
-		MusicBeatState.allowNuke = true;
 
 		ClientPrefs.openChartEditor();
 	}
@@ -7936,7 +7936,6 @@ class PlayState extends MusicBeatState
 		{
 			LoadingState.noteCache = [];
 			curChart = [];
-			MusicBeatState.allowNuke = true;
 			#if !switch
 			var percent:Float = comboManager.ratingPercent;
 			if(Math.isNaN(percent)) percent = 0;

source/substates/RankingSubstate.hx

@@ -41,8 +41,6 @@ class RankingSubstate extends MusicBeatSubstate
 
 		if (!PlayState.instance.cpuControlled)
 			backend.Highscore.saveRank(PlayState.SONG.song, rankingNum, PlayState.storyDifficulty);
-
-		MusicBeatState.allowNuke = true;
 	}
 
 	function getPauseSong()