Merge remote-tracking branch 'origin/main' into mobile

JordanSantiagoYT · Sep 26, 2024 · 85df703 · 85df703
2 parents 7610752 + 74bca19
commit 85df703
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 8 deletions.
diff --git a/assets/shared/images/NMCW/combo.png b/assets/shared/images/NMCW/combo.png
diff --git a/assets/shared/images/combo.png b/assets/shared/images/combo.png
diff --git a/assets/shared/images/dokistuff/combo-pixel.png b/assets/shared/images/dokistuff/combo-pixel.png
diff --git a/assets/shared/images/dokistuff/combo.png b/assets/shared/images/dokistuff/combo.png
diff --git a/assets/shared/images/fireinthehole/combo.png b/assets/shared/images/fireinthehole/combo.png
diff --git a/assets/shared/images/goldstuff/combo.png b/assets/shared/images/goldstuff/combo.png
diff --git a/assets/shared/images/impostorratings/combo-pixel.png b/assets/shared/images/impostorratings/combo-pixel.png
diff --git a/assets/shared/images/kadethings/combo-pixel.png b/assets/shared/images/kadethings/combo-pixel.png
diff --git a/assets/shared/images/kadethings/combo.png b/assets/shared/images/kadethings/combo.png
diff --git a/assets/shared/images/pixelUI/combo-pixel.png b/assets/shared/images/pixelUI/combo-pixel.png
diff --git a/source/Paths.hx b/source/Paths.hx
@@ -339,8 +339,20 @@ class Paths
 		currentLevel = name.toLowerCase();
 	}
 
-	public static function getPath(file:String, type:AssetType, ?library:Null<String> = null)
+	public static function getPath(file:String, ?type:AssetType = TEXT, ?library:Null<String> = null, ?modsAllowed:Bool = false):String
 	{
+		#if MODS_ALLOWED
+		if(modsAllowed)
+		{
+			var customFile:String = file;
+			if (library != null)
+				customFile = '$library/$file';
+
+			var modded:String = modFolders(customFile);
+			if(FileSystem.exists(modded)) return modded;
+		}
+		#end
+
 		if (library != null)
 			return getLibraryPath(file, library);
 

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -3371,7 +3371,8 @@ class PlayState extends MusicBeatState
 
 	override public function onFocus():Void
 	{
-		if (health > 0 && !paused) resetRPC(Conductor.songPosition > 0.0);
+		try {if (health > 0 && !paused) resetRPC(Conductor.songPosition > 0.0);}
+		catch(e) {};
 		super.onFocus();
 	}
 
@@ -4712,7 +4713,7 @@ class PlayState extends MusicBeatState
 					for (note in notes){
 						if (note == null)
 							continue;
-						note.updateRGBColors();
+						if (ClientPrefs.enableColorShader) note.updateRGBColors();
 					}
 				}
 			}

diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx
@@ -2369,6 +2369,18 @@ class ChartingState extends MusicBeatState
 			if(sender == noteSplashesInputText) {
 				_song.splashSkin = noteSplashesInputText.text;
 			}
+			else if(sender == gameOverCharacterInputText) {
+				_song.gameOverChar = gameOverCharacterInputText.text;
+			}
+			else if(sender == gameOverSoundInputText) {
+				_song.gameOverSound = gameOverSoundInputText.text;
+			}
+			else if(sender == gameOverLoopInputText) {
+				_song.gameOverLoop = gameOverLoopInputText.text;
+			}
+			else if(sender == gameOverEndInputText) {
+				_song.gameOverEnd = gameOverEndInputText.text;
+			}
 			else if(curSelectedNote != null)
 			{
 				if(sender == value1InputText) {

diff --git a/source/editors/EditorPlayState.hx b/source/editors/EditorPlayState.hx
@@ -431,16 +431,16 @@ class EditorPlayState extends MusicBeatState
 
 	override public function onFocus():Void
 	{
-		vocals.play();
-		opponentVocals.play();
+		for (i in [vocals, opponentVocals])
+			if (i != null) i.play();
 
 		super.onFocus();
 	}
 
 	override public function onFocusLost():Void
 	{
-		vocals.pause();
-		opponentVocals.pause();
+		for (i in [vocals, opponentVocals])
+			if (i != null) i.pause();
 
 		super.onFocusLost();
 	}

diff --git a/source/editors/NoteSplashDebugState.hx b/source/editors/NoteSplashDebugState.hx
@@ -367,9 +367,10 @@ class NoteSplashDebugState extends MusicBeatState
 		for (offGroup in config.offsets)
 			strToSave += '\n' + offGroup[0] + ' ' + offGroup[1];
 
-		var pathSplit:Array<String> = (Paths.getPath('images/$texturePath.png', IMAGE).split('.png')[0] + '.txt').split(':');
+		var pathSplit:Array<String> = (Paths.getPath('images/$texturePath.png', IMAGE, null, true).split('.png')[0] + '.txt').split(':');
 		var path:String = pathSplit[pathSplit.length-1];
 		savedText.text = 'Saved to: $path';
+		trace ('$path');
 		File.saveContent(path, strToSave);
 
 		//trace(strToSave);