Cleaning Note.hx a bit

poec987 · Jun 27, 2024 · ffba7a4 · ffba7a4
1 parent 7f654e3
commit ffba7a4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 25 deletions.
diff --git a/source/Note.hx b/source/Note.hx
@@ -55,33 +55,31 @@ class Note extends FlxSprite
 
 		var daStage:String = PlayState.curStage;
 
+		var suffix:String = '';
+
+		if (PlayState.isGood || PlayState.curSong == "Thorns")
+			suffix = '-good';
 
 		if (daStage == 'school' || daStage == 'schoolEvil' || PlayState.isPixel) {
-			if (PlayState.curSong == "Thorns" || PlayState.isGood)
-				loadGraphic(Paths.image('stages/weeb/pixelUI/arrows-pixels-good'), true, 17, 17);
-			else
-				switch (noteType) {
-					case 'Kill':
-						loadGraphic(Paths.image('stages/weeb/pixelUI/customNotes/kill-pixels'), true, 17, 17);
-					default:
-						loadGraphic(Paths.image('stages/weeb/pixelUI/arrows-pixels'), true, 17, 17);
-				}
+			switch (noteType) {
+				case 'Kill':
+					loadGraphic(Paths.image('stages/weeb/pixelUI/customNotes/kill-pixels'+suffix), true, 17, 17);
+				default:
+					loadGraphic(Paths.image('stages/weeb/pixelUI/arrows-pixels'+suffix), true, 17, 17);
+			}
 			animation.add('greenScroll', [6]);
 			animation.add('redScroll', [7]);
 			animation.add('blueScroll', [5]);
 			animation.add('purpleScroll', [4]);
 
 			if (isSustainNote)
 			{
-				if (PlayState.curSong == "Thorns")
-					loadGraphic(Paths.image('weeb/pixelUI/arrowEnds-good'), true, 7, 6);
-				else
-					switch (noteType) {
-						case 'Kill':
-							loadGraphic(Paths.image('stages/weeb/pixelUI/customNotes/killEnds'), true, 7, 6);
-						default:
-							loadGraphic(Paths.image('stages/weeb/pixelUI/arrowEnds'), true, 7, 6);
-					}
+				switch (noteType) {
+					case 'Kill':
+						loadGraphic(Paths.image('stages/weeb/pixelUI/customNotes/killEnds'+suffix), true, 7, 6);
+					default:
+						loadGraphic(Paths.image('stages/weeb/pixelUI/arrowEnds'+suffix), true, 7, 6);
+				}
 
 				animation.add('purpleholdend', [4]);
 				animation.add('greenholdend', [6]);
@@ -101,14 +99,11 @@ class Note extends FlxSprite
 
 			switch (noteType) {
 				case 'Kill':
-					frames = Paths.getSparrowAtlas('customNotes/kill');
+					frames = Paths.getSparrowAtlas('customNotes/kill'+suffix);
 				case 'Shield Note':
-					frames = Paths.getSparrowAtlas('customNotes/shield');
+					frames = Paths.getSparrowAtlas('customNotes/shield'+suffix);
 				default:
-					if (!PlayState.isGood)
-						frames = Paths.getSparrowAtlas('NOTE_assets');
-					else
-						frames = Paths.getSparrowAtlas('NOTE_assets-good');
+					frames = Paths.getSparrowAtlas('NOTE_assets'+suffix);
 			}
 
 			animation.addByPrefix('greenScroll', 'green0');

diff --git a/vscode-project.hxml b/vscode-project.hxml
@@ -1,3 +1,3 @@
 #automatically generated do not edit
-#@date Wed Jun 26 2024 11:07:44 GMT-0500 (Central Daylight Time)
+#@date Thu Jun 27 2024 08:56:20 GMT-0500 (Central Daylight Time)
 -cp c:\users\cam\appdata\local\temp\8e05707c7e067ab4e2ebd5dea47d22f51847e1bb