finalized event files shits

assets/songs/thorns/events.json

@@ -0,0 +1 @@
+{"events":[{"params":[1],"time":5052.63157894737,"name":"Camera Movement"},{"params":[0],"time":10105.2631578947,"name":"Camera Movement"},{"params":[1],"time":15157.8947368421,"name":"Camera Movement"},{"params":[0],"time":20210.5263157895,"name":"Camera Movement"},{"params":["aberrationCoolThing",""],"time":20210.5263157895,"name":"HScript Call"},{"params":[1],"time":25263.1578947368,"name":"Camera Movement"},{"params":[0],"time":30315.7894736842,"name":"Camera Movement"},{"params":["aberrationCoolThing",""],"time":30315.7894736842,"name":"HScript Call"},{"params":[1],"time":35368.4210526316,"name":"Camera Movement"},{"params":[0],"time":40421.0526315789,"name":"Camera Movement"},{"params":[1],"time":45473.6842105263,"name":"Camera Movement"},{"params":[0],"time":50526.3157894737,"name":"Camera Movement"},{"params":["aberrationCoolThing",""],"time":50526.3157894737,"name":"HScript Call"},{"params":[1],"time":55578.947368421,"name":"Camera Movement"},{"params":[0],"time":60631.5789473684,"name":"Camera Movement"},{"params":["aberrationCoolThing",""],"time":60631.5789473684,"name":"HScript Call"},{"params":[1],"time":65684.2105263157,"name":"Camera Movement"},{"params":[0],"time":70736.8421052631,"name":"Camera Movement"},{"params":[1],"time":75789.4736842105,"name":"Camera Movement"},{"params":[0],"time":80842.1052631578,"name":"Camera Movement"},{"params":["aberrationCoolThing",""],"time":80842.1052631578,"name":"HScript Call"},{"params":[1],"time":85894.7368421052,"name":"Camera Movement"},{"params":[0],"time":90947.3684210525,"name":"Camera Movement"},{"params":["aberrationCoolThing",""],"time":90947.3684210525,"name":"HScript Call"},{"params":[1],"time":95999.9999999999,"name":"Camera Movement"}]}

source/funkin/backend/chart/Chart.hx

@@ -18,19 +18,14 @@ class Chart {
 	 */
 	public inline static var defaultColor:FlxColor = 0xFF9271FD;
 
-	public static function loadEventsJson(songName:String, difficulty:String = "normal") {
-		var eventsPath = Paths.file('songs/${songName.toLowerCase()}/events.json');
-		var eventsDiffPath = Paths.file('songs/${songName.toLowerCase()}/events-${difficulty.toLowerCase()}.json');
-	
+	public static function loadEventsJson(songName:String) {
+		var path = Paths.file('songs/${songName.toLowerCase()}/events.json');
 		var data:Array<ChartEvent> = null;
-		for(path in [eventsDiffPath, eventsPath]) {
-			if (Assets.exists(path)) {
-				try {
-					data = Json.parse(Assets.getText(path)).events;
-				} catch(e) {
-					Logs.trace('Failed to load song event data for ${songName} ($path): ${Std.string(e)}', ERROR);
-				}
-				if (data != null) break;
+		if (Assets.exists(path)) {
+			try {
+				data = Json.parse(Assets.getText(path)).events;
+			} catch(e) {
+				Logs.trace('Failed to load song event data for ${songName} ($path): ${Std.string(e)}', ERROR);
 			}
 		}
 		return data;
@@ -135,6 +130,7 @@ class Chart {
 					3 => "Alt Animation Toggle",
 				];
 
+				if (data.events == null) data.events = [];
 				for (event in cast(data.events, Array<Dynamic>)) {
 					if (Reflect.hasField(event, "type")) {
 						if(event.type != null)
@@ -165,10 +161,10 @@ class Chart {
 		}
 
 		/**
-		 * events.json + events-diff.json LOADING
+		 * events.json LOADING
 		 */
 		#if REGION
-		var extraEvents:Array<ChartEvent> = loadEventsJson(songName, difficulty);
+		var extraEvents:Array<ChartEvent> = loadEventsJson(songName);
 		if (extraEvents != null)
 			base.events = base.events.concat(extraEvents);
 		#end
@@ -200,7 +196,7 @@ class Chart {
 	public static function save(songFolderPath:String, chart:ChartData, difficulty:String = "normal", ?saveSettings:ChartSaveSettings):ChartData {
 		if (saveSettings == null) saveSettings = {};
 
-		var filteredChart = filterChartForSaving(chart, saveSettings.saveMetaInChart);
+		var filteredChart = filterChartForSaving(chart, saveSettings.saveMetaInChart, saveSettings.saveEventsInChart);
 		var meta = filteredChart.meta;
 
 		#if sys
@@ -219,15 +215,16 @@ class Chart {
 		return filteredChart;
 	}
 
-	public static function filterChartForSaving(chart:ChartData, ?saveMetaInChart:Null<Bool>):ChartData {
+	public static function filterChartForSaving(chart:ChartData, ?saveMetaInChart:Null<Bool>, ?saveEventsInChart:Null<Bool>):ChartData {
 		var data = Reflect.copy(chart); // make a copy of the chart to leave the OG intact
 		if (saveMetaInChart != true) {
 			data.meta = null;
 		} else {
 			data.meta = Reflect.copy(chart.meta); // also make a copy of the metadata to leave the OG intact.
-			if (data.meta != null) data.meta.parsedColor = null;
+			if(data.meta != null && Reflect.hasField(data.meta, "parsedColor")) Reflect.deleteField(data.meta, "parsedColor");
 		}
 
+		data.events = saveEventsInChart != true ? null : Reflect.copy(chart.events);  // same here once again
 		data.fromMods = null;
 
 		var sortedData:Dynamic = {};
@@ -243,5 +240,6 @@ class Chart {
 typedef ChartSaveSettings = {
 	var ?overrideExistingMeta:Bool;
 	var ?saveMetaInChart:Bool;
+	var ?saveEventsInChart:Bool;
 	var ?prettyPrint:Bool;
 }

source/funkin/editors/charter/Charter.hx

@@ -127,6 +127,27 @@ class Charter extends UIState {
 						onSelect: _file_saveas,
 					},
 					null,
+					{
+						label: "Save Without Events",
+						keybind: [CONTROL, ALT, TAB, S],
+						onSelect: _file_save_no_events,
+					},
+					{
+						label: "Save Without Events As...",
+						keybind: [CONTROL, SHIFT, ALT, TAB, S],
+						onSelect: _file_saveas_no_events,
+					},
+					{
+						label: "Save Events Separately",
+						keybind: [CONTROL, TAB, S],
+						onSelect: _file_events_save,
+					},
+					{
+						label: "Save Events Separately As...",
+						keybind: [CONTROL, SHIFT, TAB, S],
+						onSelect: _file_events_saveas,
+					},
+					null,
 					{
 						label: "Save Meta",
 						keybind: [CONTROL, ALT, S],
@@ -137,11 +158,6 @@ class Charter extends UIState {
 						keybind: [CONTROL, ALT ,SHIFT, S],
 						onSelect: _file_meta_saveas,
 					},
-					{
-						label: "Save Events",
-						keybind: [CONTROL, TAB, S],
-						onSelect: _file_events_save,
-					},
 					null,
 					{
 						label: "Exit",
@@ -1121,6 +1137,22 @@ class Charter extends UIState {
 		undos.save();
 	}
 
+	function _file_save_no_events(_) {
+		#if sys
+		saveTo('${Paths.getAssetsRoot()}/songs/${__song.toLowerCase()}', true);
+		undos.save();
+		return;
+		#end
+		_file_saveas(_);
+	}
+
+	function _file_saveas_no_events(_) {
+		openSubState(new SaveSubstate(Json.stringify(Chart.filterChartForSaving(PlayState.SONG, false, false)), {
+			defaultSaveFile: '${__diff.toLowerCase()}.json'
+		}));
+		undos.save();
+	}
+
 	function _file_meta_save(_) {
 		#if sys
 		sys.io.File.saveContent(
@@ -1140,16 +1172,27 @@ class Charter extends UIState {
 
 	function _file_events_save(_) {
 		#if sys
-		openSubState(new SaveSubstate(Json.stringify({events: PlayState.SONG.events}), {
-			defaultSaveFile: 'events-${__diff.toLowerCase()}.json'
+		sys.io.File.saveContent(
+			'${Paths.getAssetsRoot()}/songs/${__song.toLowerCase()}/events.json',
+			Json.stringify({events: PlayState.SONG.events == null ? [] : PlayState.SONG.events})
+		);
+		return;
+		#end
+		_file_events_saveas(_);
+	}
+
+	function _file_events_saveas(_) {
+		#if sys
+		openSubState(new SaveSubstate(Json.stringify({events: PlayState.SONG.events == null ? [] : PlayState.SONG.events}), {
+			defaultSaveFile: 'events.json'
 		}));
 		#end
 	}
 
 	#if sys
-	function saveTo(path:String) {
+	function saveTo(path:String, separateEvents:Bool = false) {
 		buildChart();
-		Chart.save(path, PlayState.SONG, __diff.toLowerCase(), {saveMetaInChart: false});
+		Chart.save(path, PlayState.SONG, __diff.toLowerCase(), {saveMetaInChart: false, saveEventsInChart: !separateEvents});
 	}
 	#end