Merge remote-tracking branch 'master/main'

source/funkin/editors/charter/Charter.hx

@@ -499,7 +499,10 @@ class Charter extends UIState {
 		noteTypes = PlayState.SONG.noteTypes;
 
 		FlxG.sound.setMusic(FlxG.sound.load(Paths.inst(__song, __diff)));
-		vocals = FlxG.sound.load(Paths.voices(__song, __diff));
+		if (PlayState.SONG.meta.needsVoices != false) // null or true
+			vocals = FlxG.sound.load(Paths.voices(__song, __diff));
+		else
+			vocals = new FlxSound();
 		vocals.group = FlxG.sound.defaultMusicGroup;
 
 		gridBackdrops.createGrids(PlayState.SONG.strumLines.length);

source/funkin/editors/charter/CharterStrumline.hx

@@ -38,7 +38,7 @@ class CharterStrumline extends UISprite {
 		healthIcons = new FlxSpriteGroup(x, y);
 
 		for (i=>icon in icons) {
-			var healthIcon = new HealthIcon(icon);
+			var healthIcon = new HealthIcon(Character.getIconFromCharName(icon));
 			healthIcon.scale.x = healthIcon.scale.y = 0.6 - (icons.length / 20);
 			healthIcon.updateHitbox();
 			healthIcon.x = FlxMath.lerp(0, icons.length * 20, (icons.length-1 != 0 ? i / (icons.length-1) : 0));
@@ -93,7 +93,7 @@ class CharterStrumline extends UISprite {
 		healthIcons.clear();
 
 		for (i=>icon in icons) {
-			var healthIcon = new HealthIcon(icon);
+			var healthIcon = new HealthIcon(Character.getIconFromCharName(icon));
 			healthIcon.scale.x = healthIcon.scale.y = 0.6 - (icons.length / 20);
 			healthIcon.updateHitbox();
 			healthIcon.x = FlxMath.lerp(0, icons.length * 20, (icons.length-1 != 0 ? i / (icons.length-1) : 0));

source/funkin/game/PlayState.hx

@@ -520,7 +520,7 @@ class PlayState extends MusicBeatState
 	@:dox(hide) override public function create()
 	{
 		Note.__customNoteTypeExists = [];
-		// SCRIPTING & DATA INITIALISATION
+		// SCRIPTING & DATA INITIALIZATION
 		#if REGION
 		instance = this;
 		if (FlxG.sound.music != null) FlxG.sound.music.stop();
@@ -557,13 +557,13 @@ class PlayState extends MusicBeatState
 		detailsPausedText = "Paused - " + detailsText;
 		#end
 
-		// CHARACTER INITIALISATION
+		// CHARACTER INITIALIZATION
 		#if REGION
 		comboGroup = new RotatingSpriteGroup(FlxG.width * 0.55, (FlxG.height * 0.5) - 60);
 		comboGroup.maxSize = 25;
 		#end
 
-		// CAMERA, SCRIPTS & STAGE INITIALISATION
+		// CAMERA FOLLOW, SCRIPTS & STAGE INITIALIZATION
 		#if REGION
 		camFollow = new FlxObject(0, 0, 2, 2);
 		add(camFollow);
@@ -571,10 +571,6 @@ class PlayState extends MusicBeatState
 		if (SONG.stage == null || SONG.stage.trim() == "") SONG.stage = "stage";
 		add(stage = new Stage(SONG.stage));
 
-		FlxG.camera.follow(camFollow, LOCKON, 0.04);
-		FlxG.camera.zoom = defaultCamZoom;
-		// camHUD.zoom = defaultHudZoom;
-
 		if (!chartingMode || Options.charterEnablePlaytestScripts) {
 			switch(SONG.meta.name) {
 				// case "":
@@ -616,7 +612,7 @@ class PlayState extends MusicBeatState
 		}
 		#end
 
-		// STRUMS & NOTES INITIALISATION
+		// STRUMS & NOTES INITIALIZATION
 		#if REGION
 		strumLine = new FlxObject(0, 50, FlxG.width, 10);
 		strumLine.scrollFactor.set();
@@ -678,7 +674,7 @@ class PlayState extends MusicBeatState
 		scripts.call("create");
 		#end
 
-		// HUD INITIALISATION & CAMERA FINALISATION
+		// HUD INITIALIZATION & CAMERA INITIALIZATION
 		#if REGION
 		var event = EventManager.get(AmountEvent).recycle(4);
 		if (!scripts.event("onPreGenerateStrums", event).cancelled) {
@@ -689,7 +685,10 @@ class PlayState extends MusicBeatState
 		for(str in strumLines)
 			str.generate(str.data, (chartingMode && Charter.startHere) ? Charter.startTime : null);
 
-		// Its after all of that code for scripts stuff  - Nex
+		FlxG.camera.follow(camFollow, LOCKON, 0.04);
+		FlxG.camera.zoom = defaultCamZoom;
+		// camHUD.zoom = defaultHudZoom;
+
 		if (smoothTransitionData != null && smoothTransitionData.stage == curStage) {
 			FlxG.camera.scroll.set(smoothTransitionData.camX, smoothTransitionData.camY);
 			FlxG.camera.zoom = smoothTransitionData.camZoom;
@@ -1387,12 +1386,13 @@ class PlayState extends MusicBeatState
 	 * @param retrySFX SFX played whenever the player retries. Defaults to `retrySFX` (`gameOverEnd`)
 	 */
 	public function gameOver(?character:Character, ?deathCharID:String, ?gameOverSong:String, ?lossSFX:String, ?retrySFX:String) {
+		var charToUse:Character = character.getDefault(opponentMode ? dad : boyfriend);  // Imma still make it check null later just in case dad or bf are also null for some weird scripts  - Nex
 		var event:GameOverEvent = scripts.event("onGameOver", EventManager.get(GameOverEvent).recycle(
-			character == null ? 0 : character.x,
-			character == null ? 0 : character.y,
-			character.getDefault(opponentMode ? dad : boyfriend),
-			deathCharID.getDefault(character != null ? character.gameOverCharacter : "bf-dead"),
-			character != null ? character.isPlayer : true,
+			charToUse == null ? 0 : charToUse.x,
+			charToUse == null ? 0 : charToUse.y,
+			charToUse,
+			deathCharID.getDefault(charToUse != null ? charToUse.gameOverCharacter : "bf-dead"),
+			charToUse != null ? charToUse.isPlayer : true,
 			gameOverSong.getDefault(this.gameOverSong),
 			lossSFX.getDefault(this.lossSFX),
 			retrySFX.getDefault(this.retrySFX)

source/funkin/options/TreeMenu.hx

@@ -17,9 +17,10 @@ class TreeMenu extends UIState {
 	public var pathDesc:FunkinText;
 	public var pathBG:FlxSprite;
 
-	public var lastState:Class<FlxState> = Type.getClass(FlxG.state);
+	public static var lastState:Class<FlxState> = null;  // Static for fixing the softlock bugs when resetting the state  - Nex
 
 	public function new() {
+		if(lastState == null) lastState = Type.getClass(FlxG.state);
 		super();
 	}
 
@@ -88,6 +89,7 @@ class TreeMenu extends UIState {
 
 	public function exit() {
 		FlxG.switchState((lastState != null) ? Type.createInstance(lastState, []) : new MainMenuState());
+		lastState = null;
 	}
 
 	public function onMenuClose(m:OptionsScreen) {