YIPPEE

added pixel support for all rating types added red pixel notes
JordanSantiagoYT · Nov 25, 2023 · 72cb797 · 72cb797
1 parent 3d8acd0
commit 72cb797
Show file tree

Hide file tree

Showing 70 changed files with 7 additions and 11 deletions.
diff --git a/assets/shared/images/dokistuff/bad-pixel.png b/assets/shared/images/dokistuff/bad-pixel.png
diff --git a/assets/shared/images/dokistuff/combo-pixel.png b/assets/shared/images/dokistuff/combo-pixel.png
diff --git a/assets/shared/images/dokistuff/good-pixel.png b/assets/shared/images/dokistuff/good-pixel.png
diff --git a/assets/shared/images/dokistuff/marv-pixel.png b/assets/shared/images/dokistuff/marv-pixel.png
diff --git a/assets/shared/images/dokistuff/num0-pixel.png b/assets/shared/images/dokistuff/num0-pixel.png
diff --git a/assets/shared/images/dokistuff/num1-pixel.png b/assets/shared/images/dokistuff/num1-pixel.png
diff --git a/assets/shared/images/dokistuff/num2-pixel.png b/assets/shared/images/dokistuff/num2-pixel.png
diff --git a/assets/shared/images/dokistuff/num3-pixel.png b/assets/shared/images/dokistuff/num3-pixel.png
diff --git a/assets/shared/images/dokistuff/num4-pixel.png b/assets/shared/images/dokistuff/num4-pixel.png
diff --git a/assets/shared/images/dokistuff/num5-pixel.png b/assets/shared/images/dokistuff/num5-pixel.png
diff --git a/assets/shared/images/dokistuff/num6-pixel.png b/assets/shared/images/dokistuff/num6-pixel.png
diff --git a/assets/shared/images/dokistuff/num7-pixel.png b/assets/shared/images/dokistuff/num7-pixel.png
diff --git a/assets/shared/images/dokistuff/num8-pixel.png b/assets/shared/images/dokistuff/num8-pixel.png
diff --git a/assets/shared/images/dokistuff/num9-pixel.png b/assets/shared/images/dokistuff/num9-pixel.png
diff --git a/assets/shared/images/dokistuff/shit-pixel.png b/assets/shared/images/dokistuff/shit-pixel.png
diff --git a/assets/shared/images/dokistuff/sick-pixel.png b/assets/shared/images/dokistuff/sick-pixel.png
diff --git a/assets/shared/images/goldstuff/marv-pixel.png b/assets/shared/images/goldstuff/marv-pixel.png
diff --git a/assets/shared/images/goldstuff/num0-pixel.png b/assets/shared/images/goldstuff/num0-pixel.png
diff --git a/assets/shared/images/goldstuff/num1-pixel.png b/assets/shared/images/goldstuff/num1-pixel.png
diff --git a/assets/shared/images/goldstuff/num2-pixel.png b/assets/shared/images/goldstuff/num2-pixel.png
diff --git a/assets/shared/images/goldstuff/num3-pixel.png b/assets/shared/images/goldstuff/num3-pixel.png
diff --git a/assets/shared/images/goldstuff/num4-pixel.png b/assets/shared/images/goldstuff/num4-pixel.png
diff --git a/assets/shared/images/goldstuff/num5-pixel.png b/assets/shared/images/goldstuff/num5-pixel.png
diff --git a/assets/shared/images/goldstuff/num6-pixel.png b/assets/shared/images/goldstuff/num6-pixel.png
diff --git a/assets/shared/images/goldstuff/num7-pixel.png b/assets/shared/images/goldstuff/num7-pixel.png
diff --git a/assets/shared/images/goldstuff/num8-pixel.png b/assets/shared/images/goldstuff/num8-pixel.png
diff --git a/assets/shared/images/goldstuff/num9-pixel.png b/assets/shared/images/goldstuff/num9-pixel.png
diff --git a/assets/shared/images/goldstuff/sick-pixel.png b/assets/shared/images/goldstuff/sick-pixel.png
diff --git a/assets/shared/images/kadethings/bad-pixel.png b/assets/shared/images/kadethings/bad-pixel.png
diff --git a/assets/shared/images/kadethings/combo-pixel.png b/assets/shared/images/kadethings/combo-pixel.png
diff --git a/assets/shared/images/kadethings/good-pixel.png b/assets/shared/images/kadethings/good-pixel.png
diff --git a/assets/shared/images/kadethings/marv-pixel.png b/assets/shared/images/kadethings/marv-pixel.png
diff --git a/assets/shared/images/kadethings/num0-pixel.png b/assets/shared/images/kadethings/num0-pixel.png
diff --git a/assets/shared/images/kadethings/num1-pixel.png b/assets/shared/images/kadethings/num1-pixel.png
diff --git a/assets/shared/images/kadethings/num2-pixel.png b/assets/shared/images/kadethings/num2-pixel.png
diff --git a/assets/shared/images/kadethings/num3-pixel.png b/assets/shared/images/kadethings/num3-pixel.png
diff --git a/assets/shared/images/kadethings/num4-pixel.png b/assets/shared/images/kadethings/num4-pixel.png
diff --git a/assets/shared/images/kadethings/num5-pixel.png b/assets/shared/images/kadethings/num5-pixel.png
diff --git a/assets/shared/images/kadethings/num6-pixel.png b/assets/shared/images/kadethings/num6-pixel.png
diff --git a/assets/shared/images/kadethings/num7-pixel.png b/assets/shared/images/kadethings/num7-pixel.png
diff --git a/assets/shared/images/kadethings/num8-pixel.png b/assets/shared/images/kadethings/num8-pixel.png
diff --git a/assets/shared/images/kadethings/num9-pixel.png b/assets/shared/images/kadethings/num9-pixel.png
diff --git a/assets/shared/images/kadethings/shit-pixel.png b/assets/shared/images/kadethings/shit-pixel.png
diff --git a/assets/shared/images/kadethings/sick-pixel.png b/assets/shared/images/kadethings/sick-pixel.png
diff --git a/assets/shared/images/pixelUI/NOTE_assets_colored.png b/assets/shared/images/pixelUI/NOTE_assets_colored.png
diff --git a/assets/shared/images/pixelUI/NOTE_assets_coloredENDS.png b/assets/shared/images/pixelUI/NOTE_assets_coloredENDS.png
diff --git a/assets/shared/images/pixelUI/NOTE_assets_doki.png b/assets/shared/images/pixelUI/NOTE_assets_doki.png
diff --git a/assets/shared/images/pixelUI/NOTE_assets_dokiENDS.png b/assets/shared/images/pixelUI/NOTE_assets_dokiENDS.png
diff --git a/assets/shared/images/pixelUI/RED_NOTE_assets.png b/assets/shared/images/pixelUI/RED_NOTE_assets.png
diff --git a/assets/shared/images/pixelUI/RED_NOTE_assetsENDS.png b/assets/shared/images/pixelUI/RED_NOTE_assetsENDS.png
diff --git a/assets/shared/images/pixelUI/marv-pixel.png b/assets/shared/images/pixelUI/marv-pixel.png
diff --git a/assets/shared/images/tgtstuff/bad-pixel.png b/assets/shared/images/tgtstuff/bad-pixel.png
diff --git a/assets/shared/images/tgtstuff/combo-pixel.png b/assets/shared/images/tgtstuff/combo-pixel.png
diff --git a/assets/shared/images/tgtstuff/good-pixel.png b/assets/shared/images/tgtstuff/good-pixel.png
diff --git a/assets/shared/images/tgtstuff/marv-pixel.png b/assets/shared/images/tgtstuff/marv-pixel.png
diff --git a/assets/shared/images/tgtstuff/num0-pixel.png b/assets/shared/images/tgtstuff/num0-pixel.png
diff --git a/assets/shared/images/tgtstuff/num1-pixel.png b/assets/shared/images/tgtstuff/num1-pixel.png
diff --git a/assets/shared/images/tgtstuff/num2-pixel.png b/assets/shared/images/tgtstuff/num2-pixel.png
diff --git a/assets/shared/images/tgtstuff/num3-pixel.png b/assets/shared/images/tgtstuff/num3-pixel.png
diff --git a/assets/shared/images/tgtstuff/num4-pixel.png b/assets/shared/images/tgtstuff/num4-pixel.png
diff --git a/assets/shared/images/tgtstuff/num5-pixel.png b/assets/shared/images/tgtstuff/num5-pixel.png
diff --git a/assets/shared/images/tgtstuff/num6-pixel.png b/assets/shared/images/tgtstuff/num6-pixel.png
diff --git a/assets/shared/images/tgtstuff/num7-pixel.png b/assets/shared/images/tgtstuff/num7-pixel.png
diff --git a/assets/shared/images/tgtstuff/num8-pixel.png b/assets/shared/images/tgtstuff/num8-pixel.png
diff --git a/assets/shared/images/tgtstuff/num9-pixel.png b/assets/shared/images/tgtstuff/num9-pixel.png
diff --git a/assets/shared/images/tgtstuff/shit-pixel.png b/assets/shared/images/tgtstuff/shit-pixel.png
diff --git a/assets/shared/images/tgtstuff/sick-pixel.png b/assets/shared/images/tgtstuff/sick-pixel.png
diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -7257,17 +7257,14 @@ if (ClientPrefs.showNPS) {
 		if (allSicks && ClientPrefs.marvRateColor == 'Golden' && noteDiff < ClientPrefs.sickWindow && ClientPrefs.hudType != 'Tails Gets Trolled V4' && ClientPrefs.hudType != 'Doki Doki+' && !ClientPrefs.noMarvJudge)
 		{
 			pixelShitPart1 = 'goldstuff/';
-			pixelShitPart2 = '';
 		}
 		if (!allSicks && ClientPrefs.marvRateColor == 'Golden' && noteDiff < ClientPrefs.marvWindow && ClientPrefs.hudType != 'Tails Gets Trolled V4' && ClientPrefs.hudType != 'Doki Doki+' && !ClientPrefs.noMarvJudge)
 		{
 			pixelShitPart1 = 'goldstuff/';
-			pixelShitPart2 = '';
 		}
 		if (!allSicks && ClientPrefs.marvRateColor == 'Rainbow' && noteDiff < ClientPrefs.marvWindow && ClientPrefs.hudType != 'Tails Gets Trolled V4' && ClientPrefs.hudType != 'Doki Doki+' && !ClientPrefs.noMarvJudge)
 		{
 			pixelShitPart1 = '';
-			pixelShitPart2 = '';
 		}
 		if (ClientPrefs.ratesAndCombo) {
 		var rating = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + daRating.image + pixelShitPart2));

diff --git a/source/StrumNote.hx b/source/StrumNote.hx
@@ -47,8 +47,6 @@ class StrumNote extends FlxSprite
 		var skin:String = 'NOTE_assets';
 		if(PlayState.instance != null && PlayState.SONG.arrowSkin != null && PlayState.SONG.arrowSkin.length > 1) skin = PlayState.SONG.arrowSkin;
 
-		if (!PlayState.isPixelStage)
-		{
 			if(ClientPrefs.noteStyleThing == 'VS Nonsense V2') {
 				skin = 'Nonsense_NOTE_assets';
 			}
@@ -76,7 +74,6 @@ class StrumNote extends FlxSprite
 			if(ClientPrefs.noteColorStyle == 'Char-Based') {
 				skin = 'NOTE_assets_colored';
 			}
-		}
 		texture = skin; //Load texture and anims
 
 		scrollFactor.set();

diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx
@@ -1187,7 +1187,7 @@ class ChartingState extends MusicBeatState
 			if(value == 0) {
 			return;
 			} 
-			if(Math.isNaN(_song.notes[curSection].sectionNotes.length)) {
+			if(_song.notes[curSection].sectionNotes.length < 1 || Math.isNaN(_song.notes[curSection].sectionNotes.length)) {
 			trace ("HEY! your section doesn't have any notes! please place at least 1 note then try using this.");
 			return; //prevent a crash if the section doesn't have any notes
 			}
@@ -1657,9 +1657,11 @@ class ChartingState extends MusicBeatState
 		};
 
 			lilBuddiesBox = new FlxUICheckBox(mouseScrollingQuant.x + 150, mouseScrollingQuant.y, null, null, "Lil' Buddies", 100);
-			lilBuddiesBox.checked = true;
+			if (FlxG.save.data.lilBuddies == null) FlxG.save.data.lilBuddies = false;
+			lilBuddiesBox.checked = FlxG.save.data.lilBuddies;
 			lilBuddiesBox.callback = function()
 			{
+				FlxG.save.data.lilBuddies = lilBuddiesBox.checked;
 				lilBf.visible = lilBuddiesBox.checked;
 				lilOpp.visible = lilBuddiesBox.checked;
 				lilStage.visible = lilBuddiesBox.checked;
@@ -2628,7 +2630,7 @@ class ChartingState extends MusicBeatState
 					var data:Int = note.noteData % 4;
 					var noteDataToCheck:Int = note.noteData;
 					if(noteDataToCheck > -1 && note.mustPress != _song.notes[curSec].mustHitSection) noteDataToCheck += 4;
-					if (ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader)
+					if ((ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader) && vortex)
 						strumLineNotes.members[noteDataToCheck].playAnim('confirm', true, note.colorSwap.hue, note.colorSwap.saturation, note.colorSwap.brightness);
 					else
 						strumLineNotes.members[noteDataToCheck].playAnim('confirm', true);
@@ -2646,7 +2648,7 @@ class ChartingState extends MusicBeatState
 						}
 
 						data = note.noteData;
-						if (note.mustPress) {
+						if (note.mustPress && lilBuddiesBox.checked) {
 						if (ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader) 
 						{
 						lilBuddiesColorSwap.hue = note.colorSwap.hue;
@@ -2655,7 +2657,7 @@ class ChartingState extends MusicBeatState
 						}
 						lilBf.animation.play("" + (data % 4), true);
 						}
-						if (!note.mustPress) 
+						if (!note.mustPress && lilBuddiesBox.checked) 
 						{
 							if (ClientPrefs.enableColorShader || ClientPrefs.showNotes && ClientPrefs.enableColorShader) 
 							{