fuck

AstroEngineDevs · Mar 20, 2024 · 1d4ea8e · 1d4ea8e
1 parent df6ac34
commit 1d4ea8e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/source/game/editors/EditorPlayState.hx b/source/game/editors/EditorPlayState.hx
@@ -1026,10 +1026,12 @@ class EditorPlayState extends MusicBeatState
 
 	function spawnNoteSplash(x:Float, y:Float, data:Int, ?note:Note = null) {
 		var skin:String = 'normal';
-		if(ClientPrefs.data.noteSplashesType != 'normal')
+		if(PlayState.SONG.splashSkin == 'normal' || ClientPrefs.data.forceNoteSplashes)
 			skin = ClientPrefs.data.noteSplashesType;
 		else 
 			skin = PlayState.SONG.splashSkin;
+		if(PlayState.SONG.splashSkin == null)
+			skin = 'normal';
 
 		var hue:Float = backend.utils.ClientPrefs.data.arrowHSV[data % 4][0] / 360;
 		var sat:Float = backend.utils.ClientPrefs.data.arrowHSV[data % 4][1] / 100;

diff --git a/source/game/objects/NoteSplash.hx b/source/game/objects/NoteSplash.hx
@@ -16,10 +16,12 @@ class NoteSplash extends FlxSprite
 		super(x, y);
 
 		var skin:String = 'normal';
-		if(ClientPrefs.data.noteSplashesType != 'normal')
+		if(PlayState.SONG.splashSkin == 'normal' || ClientPrefs.data.forceNoteSplashes)
 			skin = ClientPrefs.data.noteSplashesType;
 		else 
 			skin = PlayState.SONG.splashSkin;
+		if(PlayState.SONG.splashSkin == null)
+			skin = 'normal';
 
 		trace(skin);
 
@@ -36,11 +38,9 @@ class NoteSplash extends FlxSprite
 		setPosition(x - Note.swagWidth * 0.95, y - Note.swagWidth);
 		alpha = 0.6;
 
-		trace(texture);
-
 		if(texture == null) {
 			texture = 'normal';
-			if(ClientPrefs.data.noteSplashesType != 'normal')
+			if(ClientPrefs.data.noteSplashesType != 'normal' || ClientPrefs.data.forceNoteSplashes)
 				texture = ClientPrefs.data.noteSplashesType;
 			else 
 				texture = PlayState.SONG.splashSkin;

diff --git a/source/game/states/PlayState.hx b/source/game/states/PlayState.hx
@@ -5031,10 +5031,12 @@ class PlayState extends MusicBeatState
 
 	public function spawnNoteSplash(x:Float, y:Float, data:Int, ?note:Note = null) {
 		var skin:String = 'normal';
-		if(ClientPrefs.data.noteSplashesType != 'normal')
+		if(PlayState.SONG.splashSkin == 'normal' || ClientPrefs.data.forceNoteSplashes)
 			skin = ClientPrefs.data.noteSplashesType;
 		else 
-			skin = SONG.splashSkin;
+			skin = PlayState.SONG.splashSkin;
+		if(PlayState.SONG.splashSkin == null)
+			skin = 'normal';
 		trace(skin);
 		var hue:Float = 0;
 		var sat:Float = 0;