Merge branch 'main' into translations-system

source/funkin/menus/FreeplayState.hx

@@ -6,15 +6,16 @@ import funkin.backend.chart.Chart;
 import funkin.backend.chart.ChartData.ChartMetaData;
 import funkin.backend.scripting.events.menu.MenuChangeEvent;
 import funkin.backend.scripting.events.menu.freeplay.*;
+import funkin.backend.system.Conductor;
 import funkin.game.HealthIcon;
-import funkin.backend.utils.FunkinSave;
+import funkin.savedata.FunkinSave;
 
 using StringTools;
 
 class FreeplayState extends MusicBeatState
 {
 	/**
-	 * Array containing all of the songs metadatas
+	 * Array containing all of the songs' metadata.
 	 */
 	public var songs:Array<ChartMetaData> = [];
 
@@ -144,7 +145,7 @@ class FreeplayState extends MusicBeatState
 			add(icon);
 
 			// songText.x += 40;
-			// DONT PUT X IN THE FIRST PARAMETER OF new ALPHABET() !!
+			// DON'T PUT X IN THE FIRST PARAMETER OF new ALPHABET() !!
 			// songText.screenCenter(X);
 		}
 
@@ -251,10 +252,12 @@ class FreeplayState extends MusicBeatState
 					else
 						FlxG.log.error('Could not find a Sound asset with an ID of \'$soundPath\'.');
 
-					if (sound != null && autoplayShouldPlay)
+					if (sound != null && autoplayShouldPlay) {
 						FlxG.sound.playMusic(sound, 0);
+						Conductor.changeBPM(songs[curSelected].bpm, songs[curSelected].beatsPerMeasure, songs[curSelected].stepsPerBeat);
+					}
 				}
-				if(!disableAsyncLoading) Main.execAsync(huh);
+				if (!disableAsyncLoading) Main.execAsync(huh);
 				else huh();
 			}
 			songInstPlaying = true;

source/funkin/menus/MainMenuState.hx

@@ -167,7 +167,7 @@ class MainMenuState extends MusicBeatState
 			{
 				case 'story mode': FlxG.switchState(new StoryMenuState());
 				case 'freeplay': FlxG.switchState(new FreeplayState());
-				case 'donate', 'credits': FlxG.switchState(new CreditsMain());  // kept donate for not breaking scripts, if you dont want donate to bring you to the credits menu, thats easy softcodable  - Nex
+				case 'donate', 'credits': FlxG.switchState(new CreditsMain());  // kept donate for not breaking scripts, if you don't want donate to bring you to the credits menu, thats easy softcodable  - Nex
 				case 'options': FlxG.switchState(new OptionsMenu());
 			}
 		});

source/funkin/menus/PauseSubState.hx

@@ -18,7 +18,7 @@ import funkin.options.TreeMenu;
 
 class PauseSubState extends MusicBeatSubstate
 {
-	public static var script:String = "";
+	public static var script:String = Flags.DEFAULT_PAUSE_SCRIPT;
 
 	var grpMenuShit:FlxTypedGroup<Alphabet>;
 

source/funkin/menus/StoryMenuState.hx

@@ -9,7 +9,7 @@ import funkin.backend.FunkinText;
 import funkin.backend.scripting.events.menu.MenuChangeEvent;
 import funkin.backend.scripting.events.menu.storymenu.*;
 import funkin.backend.scripting.events.CancellableEvent;
-import funkin.backend.utils.FunkinSave;
+import funkin.savedata.FunkinSave;
 import haxe.io.Path;
 import haxe.xml.Access;
 

source/funkin/menus/credits/CreditsCodename.hx

@@ -3,6 +3,7 @@ package funkin.menus.credits;
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
 import funkin.backend.system.github.GitHub;
+import funkin.backend.system.github.GitHubContributor.CreditsGitHubContributor;
 import funkin.options.PlayerSettings;
 import funkin.options.type.GithubIconOption;
 
@@ -80,7 +81,17 @@ class CreditsCodename extends funkin.options.OptionsScreen {
 			funkin.backend.utils.NativeAPI.showMessageBox("Codename Engine Warning", errMsg, MSG_WARNING);
 		});
 		if(error) return false;
-		Options.contributors = idk;
+		if((idk is Array)) {
+			var contributors:Array<CreditsGitHubContributor> = [];
+			for(e in idk) contributors.push({
+				login: e.login,
+				avatar_url: e.avatar_url,
+				html_url: e.html_url,
+				id: e.id,
+				contributions: e.contributions
+			});
+			Options.contributors = contributors;
+		}
 		Logs.trace('[CreditsCodename] Contributors list Updated!', VERBOSE);
 
 		var errorOnMain:Bool = false;

source/funkin/menus/credits/CreditsMain.hx

@@ -3,6 +3,7 @@ package funkin.menus.credits;
 import funkin.backend.assets.AssetSource;
 import funkin.options.OptionsScreen;
 import funkin.options.TreeMenu;
+import funkin.backend.system.github.GitHubContributor.CreditsGitHubContributor;
 import funkin.options.type.*;
 import haxe.xml.Access;
 import flixel.util.FlxColor;
@@ -66,13 +67,14 @@ class CreditsMain extends TreeMenu {
 				}
 
 				var username = node.getAtt("user");
-				var user = {  // Kind of forcing
+				var user:CreditsGitHubContributor = {  // Kind of forcing
 					login: username,
 					html_url: 'https://github.com/$username',
 					avatar_url: 'https://github.com/$username.png'
 				};
 				var opt:GithubIconOption = new GithubIconOption(user, desc, null,
-					node.has.customName ? node.att.customName : null, node.has.size ? Std.parseInt(node.att.size) : 96,
+					node.has.customName ? node.att.customName : null,
+					node.has.size ? Std.parseInt(node.att.size) : 96,
 					node.has.portrait ? node.att.portrait.toLowerCase() == "false" ? false : true : true
 				);
 				if (node.has.color)

source/funkin/menus/ui/FunkinSoundTray.hx

@@ -10,7 +10,7 @@ class FunkinSoundTray extends FlxSoundTray
 {
 	public var script:Script;
 
-	// Neeo wanted them since it would reduce lags for some people if activated  - Nex
+	// Ne_Eo wanted them since it would reduce lags for some people if activated  - Nex
 	public var callsUpdate:Bool = true;
 	public var callsPostUpdate:Bool = true;