ES

Fixed stretched stuff with Long D&B health bar Fixed an issue where turning off color shaders would crash the game because of notes Builds now automatically get uploaded after release
JordanSantiagoYT · Dec 17, 2023 · 37d9ed3 · 37d9ed3
1 parent 2401c01
commit 37d9ed3
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,105 @@
+name: Release
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    name: Build
+    uses: ./.github/workflows/main.yml
+    with:
+      buildFlags: officialBuild
+
+  release-windows:
+    name: Release windowsBuild
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download Windows artifact
+      uses: actions/download-artifact@v3
+      with:
+        path: build
+        name: windowsBuild
+    - name: Compress build
+      run: |
+        sudo apt-get install p7zip-full
+        7z a -tzip build.zip -w ./build/.
+    - name: Upload windowsBuild to release
+      uses: svenstaro/upload-release-action@2.5.0
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref_name }}
+        file: build.zip
+        asset_name: Windows64.zip
+        overwrite: false
+
+  release-android:
+    name: Release Android Build
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download Android artifact
+      uses: actions/download-artifact@v3
+      with:
+        path: build
+        name: androidBuild
+    - name: Compress build
+      run: |
+        sudo apt-get install p7zip-full
+        7z a -tzip build.zip -w ./build/.
+    - name: Upload Android build to release
+      uses: svenstaro/upload-release-action@2.5.0
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref_name }}
+        file: build.zip
+        asset_name: Android Build.zip
+        overwrite: false
+
+  release-linux:
+    name: Release linuxBuild
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download Linux artifact
+      uses: actions/download-artifact@v3
+      with:
+        path: build
+        name: linuxBuild
+    - name: Compress build
+      run: |
+        sudo apt-get install p7zip-full
+        7z a -y -ttar build.tar -w ./build/.
+        gzip build.tar
+    - name: Upload linuxBuild to release
+      uses: svenstaro/upload-release-action@2.5.0
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref_name }}
+        file: build.tar.gz
+        asset_name: Linux64.tar.gz
+        overwrite: false
+
+  release-mac:
+    name: Release macBuild
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download Mac artifact
+      uses: actions/download-artifact@v3
+      with:
+        path: build
+        name: macBuild
+    - name: Compress build
+      run: |
+        sudo apt-get install p7zip-full
+        7z a -tzip build.zip -w ./build/.
+    - name: Upload macBuild to release
+      uses: svenstaro/upload-release-action@2.5.0
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref_name }}
+        file: build.zip
+        asset_name: Mac64.zip
+        overwrite: false
diff --git a/assets/shared/images/longDnBHealthBar.png b/assets/shared/images/longDnBHealthBar.png
diff --git a/source/MusicBeatState.hx b/source/MusicBeatState.hx
@@ -162,7 +162,7 @@ class MusicBeatState extends FlxUIState
 	override function update(elapsed:Float)
 	{
 		//everyStep();
-		var oldStep:Int = curStep;
+		final oldStep:Int = curStep;
 
 		updateCurStep();
 		updateBeat();
@@ -206,7 +206,7 @@ class MusicBeatState extends FlxUIState
 	{
 		if(curStep < 0) return;
 
-		var lastSection:Int = curSection;
+		final lastSection:Int = curSection;
 		curSection = 0;
 		stepsToDo = 0;
 		for (i in 0...PlayState.SONG.notes.length)

diff --git a/source/Note.hx b/source/Note.hx
@@ -137,7 +137,7 @@ class Note extends FlxSprite
 
 	function quantCheck():Void 
 	{
-		if (ClientPrefs.noteColorStyle == 'Quant-Based' && !isSustainNote)
+		if (ClientPrefs.noteColorStyle == 'Quant-Based' && !isSustainNote && (ClientPrefs.showNotes && ClientPrefs.enableColorShader))
 			{
 				var time = strumTime;
 				var theCurBPM = Conductor.bpm;
@@ -423,7 +423,7 @@ class Note extends FlxSprite
 			animation.play(colArray[noteData % 4] + 'holdend');
 			if (ClientPrefs.showNotes)
 			{
-				if (ClientPrefs.noteColorStyle == 'Quant-Based')
+				if (ClientPrefs.noteColorStyle == 'Quant-Based' && ClientPrefs.enableColorShader)
 				{
 				colorSwap.hue = prevNote.colorSwap.hue;
 				colorSwap.saturation = prevNote.colorSwap.saturation;

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -8124,7 +8124,7 @@ if (!allSicks && ClientPrefs.colorRatingFC && shits > 0 && noteDiff > ClientPref
 				final spr:StrumNote = playerStrums.members[note.noteData];
 
 				if(spr != null) {
-				if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes) {
+				if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes && ClientPrefs.enableColorShader) {
 				spr.playAnim('confirm', true, note.colorSwap.hue, note.colorSwap.saturation, note.colorSwap.brightness);
 				} else {
 				spr.playAnim('confirm', true, 0, 0, 0, ClientPrefs.noteColorStyle == 'Char-Based', note.mustPress, note.gfNote);
@@ -8136,7 +8136,7 @@ if (!allSicks && ClientPrefs.colorRatingFC && shits > 0 && noteDiff > ClientPref
 				final spr = playerStrums.members[note.noteData];
 				if(spr != null)
 				{
-				if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes) {
+				if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes && ClientPrefs.enableColorShader) {
 				spr.playAnim('confirm', true, note.colorSwap.hue, note.colorSwap.saturation, note.colorSwap.brightness);
 				} else {
 				spr.playAnim('confirm', true, 0, 0, 0, ClientPrefs.noteColorStyle == 'Char-Based', note.mustPress, note.gfNote);
@@ -8300,7 +8300,7 @@ if (!allSicks && ClientPrefs.colorRatingFC && shits > 0 && noteDiff > ClientPref
 					final spr:StrumNote = opponentStrums.members[daNote.noteData];
 
 					if(spr != null) {
-					if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes) {
+					if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes && ClientPrefs.enableColorShader) {
 					spr.playAnim('confirm', true, daNote.colorSwap.hue, daNote.colorSwap.saturation, daNote.colorSwap.brightness);
 					} else {
 					spr.playAnim('confirm', true, 0, 0, 0, ClientPrefs.noteColorStyle == 'Char-Based', false, daNote.gfNote);
@@ -8355,8 +8355,7 @@ if (!allSicks && ClientPrefs.colorRatingFC && shits > 0 && noteDiff > ClientPref
 	}
 
 	public function spawnNoteSplash(x:Float, y:Float, data:Int, ?note:Note = null, ?hue:Float = 0, ?sat:Float = 0, ?brt:Float = 0, ?isGfNote:Bool = false, ?isDadNote:Bool = true) {
-		var skin:String = 'noteSplashes';
-		if(PlayState.SONG.splashSkin != null && PlayState.SONG.splashSkin.length > 0) skin = PlayState.SONG.splashSkin;
+		var skin:String = (PlayState.SONG.splashSkin != null && PlayState.SONG.splashSkin.length > 0) ? PlayState.SONG.splashSkin : 'noteSplashes';
 
 		if (data > -1 && data < ClientPrefs.arrowHSV.length)
 		{
@@ -8693,7 +8692,7 @@ if (!allSicks && ClientPrefs.colorRatingFC && shits > 0 && noteDiff > ClientPref
 					cameraSpeed = 1;
 			}
 		}
-		var gamerValue = 20 * playbackRate;
+		final gamerValue = 20 * playbackRate;
 		if (!ClientPrefs.noSyncing && ClientPrefs.songLoading && playbackRate < 256) //much better resync code, doesn't just resync every step!!
 		{
 		if (FlxG.sound.music.time > Conductor.songPosition + gamerValue