Note RGB fix + Toggleable note splashes for pre 0.6 mods

Author: CharGoldenYT

.DS_Store

@@ -7,6 +7,8 @@
 - Fixed the result screen accidentally making a camera that becomes the default draw target.
 - Fixed the result screen occasionally failing to end the song.
 - Fixed the HXCPP version used when compiling the windows build.
+- Fixed note RGB not being disabled on RGB Shader being disabled in the song
+- Added 2 checkboxes to the chart editor to disable note RGB or note splashes.
 
 # [Solar Engine 0.6.0](https://github.com/Team-SolarEngine/Universe-Engine-Archive/releases/tag/0.6.0)
 

CHANGELOG.md

@@ -71,7 +71,6 @@ class Note extends FlxSkewedSprite
 	public var eventVal1:String = '';
 	public var eventVal2:String = '';
 
-	public var colorSwap:ColorSwap;
 	public var inEditor:Bool = false;
 
 	public var animSuffix:String = '';
@@ -192,12 +191,6 @@ class Note extends FlxSkewedSprite
 		noteSplashData.texture = PlayState.SONG != null ? PlayState.SONG.splashSkin : 'noteSplashes';
 
 		noteSplashTexture = PlayState.SONG.splashSkin;
-		if (noteData > -1 && noteData < ClientPrefs.arrowHSV.length)
-		{
-			colorSwap.hue = ClientPrefs.arrowHSV[noteData][0] / 360;
-			colorSwap.saturation = ClientPrefs.arrowHSV[noteData][1] / 100;
-			colorSwap.brightness = ClientPrefs.arrowHSV[noteData][2] / 100;
-		}
 
 		if (noteData > -1 && noteType != value)
 		{
@@ -207,9 +200,7 @@ class Note extends FlxSkewedSprite
 					ignoreNote = mustPress;
 					reloadNote('HURT');
 					noteSplashTexture = 'HURTnoteSplashes';
-					colorSwap.hue = 0;
-					colorSwap.saturation = 0;
-					colorSwap.brightness = 0;
+					rgbShader.enabled = false;
 					lowPriority = true;
 
 					if (isSustainNote)
@@ -231,9 +222,6 @@ class Note extends FlxSkewedSprite
 			}
 			noteType = value;
 		}
-		noteSplashHue = colorSwap.hue;
-		noteSplashSat = colorSwap.saturation;
-		noteSplashBrt = colorSwap.brightness;
 		return value;
 	}
 
@@ -329,8 +317,6 @@ class Note extends FlxSkewedSprite
 		if (noteData > -1)
 		{
 			texture = '';
-			colorSwap = new ColorSwap();
-			shader = colorSwap.shader;
 
 			x += swagWidth * (noteData);
 			if (!isSustainNote && noteData > -1 && noteData < 4)
@@ -348,8 +334,6 @@ class Note extends FlxSkewedSprite
 				catch (e)
 				{
 				};
-				if (PlayState.SONG != null && PlayState.SONG.disableNoteRGB)
-					rgbShader.enabled = useRGBShader = false;
 			}
 			else
 				useRGBShader = false;
@@ -410,6 +394,8 @@ class Note extends FlxSkewedSprite
 			earlyHitMult = 1;
 		}
 		x += offsetX;
+		if (PlayState.SONG != null && PlayState.SONG.disableNoteRGB)
+			rgbShader.enabled = useRGBShader = false;
 	}
 
 	var lastNoteOffsetXForPixelAutoAdjusting:Float = 0;

source/Note.hx

@@ -1169,7 +1169,7 @@ class PlayState extends MusicBeatState
 			playfieldRenderer.cameras = [camHUD];
 			add(playfieldRenderer);
 		}
-		add(grpNoteSplashes);
+		if (!SONG.disableSplashes && ClientPrefs.noteSplashes) add(grpNoteSplashes);
 
 		camFollow = new FlxPoint();
 		camFollowPos = new FlxObject(0, 0, 1, 1);
@@ -5332,7 +5332,7 @@ class PlayState extends MusicBeatState
 
 	public function spawnNoteSplashOnNote(note:Note)
 	{
-		if (ClientPrefs.noteSplashes && note != null)
+		if (ClientPrefs.noteSplashes && !SONG.disableSplashes && note != null)
 			{
 				var strum:StrumNote = playerStrums.members[note.noteData];
 				if (strum != null)

source/PlayState.hx

@@ -30,6 +30,7 @@ typedef SwagSong =
 	var splashSkin:String;
 
 	@:optional var disableNoteRGB:Bool;
+	@:optional var disableSplashes:Bool;
 }
 
 class Song
@@ -47,6 +48,9 @@ class Song
 	public var player2:String = 'dad';
 	public var gfVersion:String = 'gf';
 
+	public var disableNoteRGB:Bool = false;
+	public var disableSplashes:Bool = false;
+
 	private static function onLoadJson(songJson:Dynamic) // Convert old charts to newest format
 	{
 		if(songJson.gfVersion == null)

source/Song.hx

@@ -501,6 +501,25 @@ class ChartingState extends MusicBeatState
 			// trace('CHECKED!');
 		};
 
+		var check_rgbEnable = new FlxUICheckBox(10, 45, null, null, "Disable Note RGB", 100);
+		check_rgbEnable.checked = _song.disableNoteRGB;
+		// _song.needsVoices = check_voices.checked;
+		check_rgbEnable.callback = function()
+		{
+			_song.disableNoteRGB = check_rgbEnable.checked;
+			updateGrid();
+			// trace('CHECKED!');
+		};
+
+		var check_splashEnable = new FlxUICheckBox(110, 80, null, null, "Disable Note Splashes", 100);
+		check_splashEnable.checked = _song.disableSplashes;
+		// _song.needsVoices = check_voices.checked;
+		check_splashEnable.callback = function()
+		{
+			_song.disableSplashes = check_splashEnable.checked;
+			// trace('CHECKED!');
+		};
+
 		var saveButton:FlxButton = new FlxButton(110, 8, "Save", function()
 		{
 			saveLevel();
@@ -570,7 +589,7 @@ class ChartingState extends MusicBeatState
 		clear_notes.color = FlxColor.RED;
 		clear_notes.label.color = FlxColor.WHITE;
 
-		var stepperBPM:FlxUINumericStepper = new FlxUINumericStepper(10, 70, 1, 1, 1, 400, 3);
+		var stepperBPM:FlxUINumericStepper = new FlxUINumericStepper(10, 80, 1, 1, 1, 400, 3);
 		stepperBPM.value = Conductor.bpm;
 		stepperBPM.name = 'song_bpm';
 		blockPressWhileTypingOnStepper.push(stepperBPM);
@@ -726,6 +745,8 @@ class ChartingState extends MusicBeatState
 		tab_group_song.add(UI_songTitle);
 
 		tab_group_song.add(check_voices);
+		tab_group_song.add(check_rgbEnable);
+		tab_group_song.add(check_splashEnable);
 		tab_group_song.add(clear_events);
 		tab_group_song.add(clear_notes);
 		tab_group_song.add(saveButton);
@@ -740,7 +761,6 @@ class ChartingState extends MusicBeatState
 		tab_group_song.add(noteSkinInputText);
 		tab_group_song.add(noteSplashesInputText);
 		tab_group_song.add(new FlxText(stepperBPM.x, stepperBPM.y - 15, 0, 'Song BPM:'));
-		tab_group_song.add(new FlxText(stepperBPM.x + 100, stepperBPM.y - 15, 0, 'Song Offset:'));
 		tab_group_song.add(new FlxText(stepperSpeed.x, stepperSpeed.y - 15, 0, 'Song Speed:'));
 		tab_group_song.add(new FlxText(player2DropDown.x, player2DropDown.y - 15, 0, 'Opponent:'));
 		tab_group_song.add(new FlxText(gfVersionDropDown.x, gfVersionDropDown.y - 15, 0, 'Girlfriend:'));

source/editors/ChartingState.hx

@@ -3,8 +3,10 @@ import Paths;
 #if VIDEOS_ALLOWED 
 	#if (hxCodec <= "2.5.1") // hxcodec fix *yay sound effect*
 	import vlc.MP4Handler;
-	#else
+	#elseif (hxCodec <= "2.6.1")
 	import hxcodec.VideoHandler as MP4Handler;
+	#else
+	import hxcodec.FlxVideo as MP4Handler;
 	#end
 #end
 import flixel.FlxSprite;