From f62183d9b0b2fff614e3a0ab7041adc079fdf669 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Tue, 22 Aug 2023 17:56:56 -0700
Subject: [PATCH] adds songs/ for global scripts and add warning for
 data/charts

---
 source/funkin/game/PlayState.hx | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index 22b77e1b..2629e7ca 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -558,13 +558,21 @@ class PlayState extends MusicBeatState
 		if (!chartingMode || Options.charterEnablePlaytestScripts) {
 			switch(SONG.meta.name) {
 				// case "":
-					// ADD YOUR HARDCODED SCRIPTS HERE!
+					// ADD YOUR HARDCODED SCRIPTSa HERE!
 				default:
-					for(content in [Paths.getFolderContent('songs/${SONG.meta.name.toLowerCase()}/scripts', true, fromMods ? MODS : BOTH), Paths.getFolderContent('data/charts/', true, fromMods ? MODS : BOTH)])
-						for(file in content) addScript(file);
+					var scriptsFolders:Array<String> = ['songs/${SONG.meta.name.toLowerCase()}/scripts', 'data/charts/', 'songs/'];
+
+					for(folder in scriptsFolders) {
+						for(file in Paths.getFolderContent(folder, true, fromMods ? MODS : BOTH)) {
+							if (folder == 'data/charts/')
+								Logs.trace('data/charts/ is deprecrated and will be removed in the future. Please move script $file.hx to songs/', WARNING, DARKYELLOW);
+							
+							addScript(file);
+						}
+					}
+
 					var songEvents:Array<String> = [];
-					for (event in SONG.events)
-						if (!songEvents.contains(event.name)) songEvents.push(event.name);
+					for (event in SONG.events) if (!songEvents.contains(event.name)) songEvents.push(event.name);
 
 					for (file in Paths.getFolderContent('data/events/', true, fromMods ? MODS : BOTH)) {
 						var fileName:String = Path.withoutExtension(Path.withoutDirectory(file));