i love fixing 20k

Vortex2Oblivion · Feb 17, 2024 · 486f458 · 486f458
1 parent 06cc743
commit 486f458
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -6,9 +6,9 @@ name: github-pages
 on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
-    branches: [ "main" ]
+    branches: [ ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/source/game/StrumNote.hx b/source/game/StrumNote.hx
@@ -85,12 +85,8 @@ class StrumNote extends FlxSkewedSprite
 			else{
 				charColors = (isPlayer == 1) ? PlayState.boyfriend : PlayState.dad;
 			}
-			if (!customColors) 
-				noteColor = charColors.noteColors[localKeyCount - 1][noteData]; 
-			else 
-				noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[keyCount - 1][noteData]);
+			noteColor = !customColors ? charColors.noteColors[localKeyCount - 1][noteData] : NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[keyCount - 1][noteData]); 
 
-			//idk why || doesnt work??
 			if(Options.getData("customNoteColors"))
 				noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[keyCount - 1][noteData]);
 

diff --git a/source/shaders/NoteColors.hx b/source/shaders/NoteColors.hx
@@ -25,7 +25,7 @@ class NoteColors {
 		[[194,75,153],[0,255,255],[18,250,5],[249,57,63],[175,0,158],[255,0,0],[204,204,204],[30,255,255],[175,0,158],[0,255,33],[204,204,204],[30,41,255],[175,0,158],[255,255,0],[139,74,255],[255,0,0],[0,51,255]],
 		[[194,75,153],[0,255,255],[18,250,5],[249,57,63],[255,255,0],[139,74,255],[255,0,0],[0,51,255],[204,204,204],[175,0,158],[255,0,0],[30,255,255],[0,255,33],[30,41,255],[98,0,255],[169,255,30],[255,131,0],[30,255,105]],
 		[[194,75,153],[0,255,255],[18,250,5],[249,57,63],[255,255,0],[139,74,255],[255,0,0],[0,51,255],[255,131,0],[175,0,158],[169,255,30],[255,0,0],[30,255,255],[0,255,33],[30,41,255],[98,0,255],[169,255,30],[255,131,0],[30,255,105]],
-		[[194,75,153],[0,255,255],[18,250,5],[249,57,63],[255,255,0],[139,74,255],[255,0,0],[0,51,255],[249,57,63],[0,255,33],[30,41,255],[30,255,255],[30,255,255],[0,255,33],[30,41,255],[98,0,255],[169,255,30],[255,131,0],[30,255,105]],
+		[[194,75,153],[0,255,255],[18,250,5],[249,57,63],[255,255,0],[139,74,255],[255,0,0],[0,51,255],[249,57,63],[0,255,33],[30,41,255],[30,255,255],[30,255,255],[0,255,33],[30,41,255],[98,0,255],[169,255,30],[255,131,0],[30,255,105],[30,255,105]],
 		[[194,75,153],[0,255,255],[18,250,5],[249,57,63],[255,255,0],[139,74,255],[255,0,0],[0,51,255],[249,57,63],[0,255,33],[175,0,158],[30,41,255],[30,255,255],[30,255,255],[0,255,33],[30,41,255],[98,0,255],[169,255,30],[255,131,0],[30,255,105],[0,51,255]],
 	];