fix: fade in and fade out macros multiply each note's relative velocity

Co-Authored-By: BedrRedstone <[email protected]>

Author: Bentroen

scripts/macro_fadein/macro_fadein.gml

@@ -1,29 +1,29 @@
 function macro_fadein() {
 	// macro_fadein()
-	var str, total_vals, val, decr, inc, maxdecr, velval
+	var str, total_vals, val, decr, maxdecr
 	str = selection_code
 	if (selected = 0) return 0
 	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
-	// Check bottom-right note block's velocity value, calculate fade out from that.
-	velval = array_length(arr_data)
-	maxdecr = arr_data[velval-4]
-	decr = maxdecr/macro_column_count(arr_data)
-	show_debug_message(string(maxdecr))
-	inc = decr
+	maxdecr = 1.0
+	decr = maxdecr/(macro_column_count(arr_data) - 1)
+	var current_factor = 0.0
 	//show_debug_message(string_count("-1", str))
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
 	while (val < total_vals) {
 		val += 4
-		arr_data[val] = abs(0+decr)
+		arr_data[val] = ceil(arr_data[val] * current_factor)
+		arr_data[val] = max(1, min(arr_data[val], 100))
 		val += 3
 		while arr_data[val] != -1 {
 			val += 3
-			arr_data[val] = abs(0+decr)
+			arr_data[val] = ceil(arr_data[val] * current_factor)
+				arr_data[val] = max(1, min(arr_data[val], 100))
 			val += 3
 		}
-		decr = decr + inc
+		// Reached end of column; next column
+		current_factor += decr
 		val ++
 	}
 	selection_load_from_array(selection_x, selection_y, arr_data)

scripts/macro_fadeout/macro_fadeout.gml

@@ -1,27 +1,29 @@
 function macro_fadeout() {
 	// macro_fadeout()
-	var str, total_vals, val, decr, inc, maxdecr
+	var str, total_vals, val, decr, maxdecr
 	str = selection_code
 	if (selected = 0) return 0
 	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
-	// Check top-left note block's velocity value, calculate fade out from that.
-	maxdecr = arr_data[4]
-	decr = maxdecr/macro_column_count(arr_data)
-	inc = decr
+	maxdecr = 1.0
+	decr = maxdecr/(macro_column_count(arr_data) - 1)
+	var current_factor = 1.0
 	//show_debug_message(string_count("-1", str))
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
 	while (val < total_vals) {
 		val += 4
-		arr_data[val] = abs(maxdecr-decr)
+		arr_data[val] = ceil(arr_data[val] * current_factor)
+		arr_data[val] = max(1, min(arr_data[val], 100))
 		val += 3
 		while arr_data[val] != -1 {
 			val += 3
-			arr_data[val] = abs(maxdecr-decr)
+			arr_data[val] = ceil(arr_data[val] * current_factor)
+			arr_data[val] = max(1, min(arr_data[val], 100))
 			val += 3
 		}
-		decr = decr + inc
+		// Reached end of column; next column
+		current_factor -= decr
 		val ++
 	}
 	selection_load_from_array(selection_x, selection_y, arr_data)