fix some reported bugs

Snirozu · Snirozu · commit 8eb0ac0a8b60 · 2026-03-02T01:05:43.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Create Version Tag
         run: echo "${{github.run_id}}" > VERSION
       - name: Compile
-        run: haxelib run lime build Project.xml linux"
+        run: haxelib run lime build Project.xml linux
       - name: Publish Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -89,7 +89,7 @@ jobs:
       - name: Create Version Tag
         run: echo "${{github.run_id}}" > VERSION
       - name: Compile
-        run: haxelib run lime build windows"
+        run: haxelib run lime build windows
       - name: Publish Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -125,7 +125,7 @@ jobs:
       - name: Create Version Tag
         run: echo "${{github.run_id}}" > VERSION
       - name: Compile
-        run: arch -x86_64 haxelib run lime build mac"
+        run: arch -x86_64 haxelib run lime build mac
       - name: Publish Artifact
         uses: actions/upload-artifact@v4
         with:
diff --git a/Project.xml b/Project.xml
@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin': Psych Online" file="PsychOnline" main="Main" packageName="boo.sniro.psychonline" package="boo.sniro.psychonline" company="Snirozu" version="0.14.2" />
+	<app title="Friday Night Funkin': Psych Online" file="PsychOnline" main="Main" packageName="boo.sniro.psychonline" package="boo.sniro.psychonline" company="Snirozu" version="0.14.3" />
 	<app if="mobile" title='Psych Online' />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
diff --git a/assets/preload/characters/pico-holding-nene-dead.json b/assets/preload/characters/pico-holding-nene-dead.json
@@ -49,7 +49,7 @@
 	],
 	"camera_position": [
 		0,
-		0
+		100
 	],
 	"sing_duration": 4,
 	"scale": 1
diff --git a/assets/preload/characters/pico-retry-button.json b/assets/preload/characters/pico-retry-button.json
@@ -26,8 +26,8 @@
 	"no_antialiasing": false,
 	"image": "characters/Pico_Death_Retry",
 	"position": [
-		0,
-		300
+		450,
+		240
 	],
 	"healthicon": "pico",
 	"flip_x": true,
diff --git a/source/backend/Paths.hx b/source/backend/Paths.hx
@@ -86,7 +86,12 @@ class Paths
 			if (obj != null && !currentTrackedAssets.exists(key) && !dumpExclusions.contains(key)) {
 				openfl.Assets.cache.removeBitmapData(key);
 				FlxG.bitmap._cache.remove(key);
-				obj.destroy();
+				// pointer not found?
+				try {
+					obj.destroy();
+				} catch (exc) {
+					trace(exc);
+				}
 			}
 		}
 
diff --git a/source/objects/Character.hx b/source/objects/Character.hx
@@ -140,7 +140,7 @@ class Character extends FlxSprite {
 	}
 	public static var DEFAULT_CHARACTER:String = 'bf'; // In case a character is missing, it will use BF on its place
 
-	public static function getCharacterFile(character:String, ?instance:Character):CharacterFile {
+	public static function getCharacterFile(character:String, ?instance:Character, ?nullOnFail:Bool = false):CharacterFile {
 		var characterPath:String = 'characters/' + character + '.json';
 
 		#if MODS_ALLOWED
@@ -157,6 +157,8 @@ class Character extends FlxSprite {
 		{
 			if (instance != null)
 				instance.loadFailed = true;
+			if (nullOnFail)
+				return null;
 			path = Paths.getPreloadPath('characters/' + DEFAULT_CHARACTER + '.json'); // If a character couldn't be found, change him to BF just to prevent a crash
 		}
 
@@ -316,8 +318,10 @@ class Character extends FlxSprite {
 							// no flipX in flxanimate bcs not supported bye
 							if(animIndices != null && animIndices.length > 0)
 								atlas.anim.addBySymbolIndices(animAnim, animName, animIndices, animFps, animLoop);
-							else
+							else if (atlas.anim.symbolDictionary.exists(animName))
 								atlas.anim.addBySymbol(animAnim, animName, animFps, animLoop);
+							else
+								atlas.anim.addByFrameLabel(animAnim, animName, animFps, animLoop);
 						}
 						#end
 
@@ -733,8 +737,10 @@ class Character extends FlxSprite {
 		if(!isAnimateAtlas)
 			animation.addByPrefix(name, anim, 24, false);
 		#if flxanimate
-		else
+		else if (atlas.anim.symbolDictionary.exists(anim))
 			atlas.anim.addBySymbol(name, anim, 24, false);
+		else
+			atlas.anim.addByFrameLabel(name, anim, 24, false);
 		#end
 	}
 
diff --git a/source/online/gui/sidebar/tabs/HostServerTab.hx b/source/online/gui/sidebar/tabs/HostServerTab.hx
@@ -29,7 +29,8 @@ class HostServerTab extends TabSprite {
 		addChild(startAndStop);
 
 		updateServer = new TabButton('update', () -> {
-			FileUtils.removeFiles('_server/');
+			if (FileSystem.exists('_server/'))
+				FileUtils.removeFiles('_server/');
 			prepareServer();
 		});
 		updateServer.x = startAndStop.x;
diff --git a/source/online/states/SkinsState.hx b/source/online/states/SkinsState.hx
@@ -16,8 +16,8 @@ import objects.Character;
 #end
 class SkinsState extends MusicBeatState {
 	static var BLACKLISTED_CHARACTERS = ['default'];
-	static var LEFT_SUFFIX = ['-opponent', '-left'];
-	static var RIGHT_SUFFIX = ['-player', '-playable', '-right'];
+	public static var LEFT_SUFFIX = ['-opponent', '-left'];
+	public static var RIGHT_SUFFIX = ['-player', '-playable', '-right'];
 	static var SKIP_SUFFICES = ['-pixel', '-christmas', '-blazin'];
 
 	var charactersWithWeeks:Array<Int> = [];
diff --git a/source/options/VisualsUISubState.hx b/source/options/VisualsUISubState.hx
@@ -300,6 +300,7 @@ class VisualsUISubState extends BaseOptionsMenu
 		for (i in 0...Note.colArray.length)
 		{
 			var note:StrumNote = notes.members[i];
+			if (note == null) continue;
 			if(notesTween[i] != null) notesTween[i].cancel();
 			if(curSelected == noteOptionID)
 				notesTween[i] = FlxTween.tween(note, {y: noteY}, Math.abs(note.y / (200 + noteY)) / 3, {ease: FlxEase.quadInOut});
diff --git a/source/states/MainMenuState.hx b/source/states/MainMenuState.hx
@@ -441,6 +441,9 @@ class MainMenuState extends MusicBeatState
 			}
 			spr.centerOffsets();
 
+			if (spr.animation.curAnim == null)
+				return;
+
 			final animationOffset = animationOffsets.get(optionShit[curSelected] + ':' + spr.animation.curAnim.name);
 			if (animationOffset != null) {
 				spr.offset.x += animationOffset[0]; 
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -961,29 +961,44 @@ class PlayState extends MusicBeatState
 
 			oldModDir = Mods.currentModDirectory;
 
+			final songPlayer = (isRight ? SONG.player1 : SONG.player2) ?? '';
+
+			function songPlayerMatchesSkin(skin:String) {
+				return songPlayer.startsWith(skin);
+			}
+
 			// if online player is defined
 			if (player != null) {
-				if (player.skin.length > 0 && !(isRight ? SONG.player1 : SONG.player2).startsWith(player.skin.items[0])) {
+				if (player.skin.length > 0 && !songPlayerMatchesSkin(player.skin.items[0])) {
 					Mods.currentModDirectory = player.skin.items[3];
 					char = new Character(0, 0, player.skin.items[0] + skinsSuffix + player.skin.items[isRight ? 2 : 1], playsAsBF() == isRight, true, isRight ? 'bf' : 'dad');
 				}
 			}
 			// if skin is present for the playable character while offline
-			else if (playsAsBF() == isRight && ClientPrefs.data.currentSkin != null && !(isRight ? SONG.player1 : SONG.player2).startsWith(ClientPrefs.data.currentSkin[0])) {
+			else if (playsAsBF() == isRight && ClientPrefs.data.currentSkin != null && !songPlayerMatchesSkin(ClientPrefs.data.currentSkin[0])) {
 				Mods.currentModDirectory = ClientPrefs.data.currentSkin[3];
 				char = new Character(0, 0, ClientPrefs.data.currentSkin[0] + skinsSuffix + ClientPrefs.data.currentSkin[isRight ? 2 : 1], playsAsBF() == isRight, true, isRight ? 'bf' : 'dad');
 			}
 
 			// refuse non-blazin characters for blazin
-			if (char != null && ((isRight ? SONG.player1 : SONG.player2) ?? '').endsWith('-blazin') && !char.curCharacter.endsWith('-blazin')) {
+			if (char != null && songPlayer.endsWith('-blazin') && !char.curCharacter.endsWith('-blazin')) {
 				char.destroy();
 				char = null;
 			}
 
 			// when the character has failed to load
 			if (char == null || char.loadFailed) {
 				Mods.currentModDirectory = oldModDir;
-				char = new Character(0, 0, (isRight ? SONG.player1 : SONG.player2), playsAsBF() == isRight, false, 'bf');
+				char = new Character(0, 0, songPlayer, playsAsBF() == isRight, false, 'bf');
+
+				// another fallback, if SONG.player1/2 didn't specify the suffix then it is searched and appended
+				if (char.loadFailed) {
+					for (suffix in (isRight ? online.states.SkinsState.RIGHT_SUFFIX : online.states.SkinsState.LEFT_SUFFIX)) {
+						final charExists = Character.getCharacterFile(songPlayer + suffix, null, true) != null;
+						if (charExists)
+							char = new Character(0, 0, songPlayer + suffix, playsAsBF() == isRight, false, 'bf');
+					}
+				}
 			}
 			
 			char.ox = player?.ox ?? 0;
diff --git a/source/states/StoryMenuState.hx b/source/states/StoryMenuState.hx
@@ -399,9 +399,9 @@ class StoryMenuState extends MusicBeatState
 		txtWeekTitle.x = FlxG.width - (txtWeekTitle.width + 10);
 
 		var unlocked:Bool = !weekIsLocked(leWeek.fileName);
-		for (item in grpWeekText.members)
+		for (num => item in grpWeekText.members)
 		{
-			if (item.targetY == Std.int(0) && unlocked)
+			if (num == curWeek && unlocked)
 				item.alpha = 1;
 			else
 				item.alpha = 0.6;
diff --git a/source/states/stages/PhillyStreets.hx b/source/states/stages/PhillyStreets.hx
@@ -184,7 +184,7 @@ class PhillyStreets extends BaseStage
 		add(spraycanPile);
 		darkenable.push(spraycanPile);
 
-		if(gf != null)
+		if(gf != null && gf.curCharacter.startsWith('nene'))
 		{
 			gf.animation.callback = function(name:String, frameNumber:Int, frameIndex:Int)
 			{
@@ -343,9 +343,11 @@ class PhillyStreets extends BaseStage
 		// nene spits and laughs
 		cutsceneHandler.timer(cutsceneDelay + 6.2, function()
 		{
-			gf.animation.finishCallback = null;
-			gf.playAnim('laughCutscene', true);
-			neneLaugh.play(true);
+			if (gf.curCharacter.startsWith('nene')) {
+				gf.animation.finishCallback = null;
+				gf.playAnim('laughCutscene', true);
+				neneLaugh.play(true);
+			}
 		});
 
 		// cutscene ended, camera returns to normal, cutscene flags set and countdown starts.
@@ -384,7 +386,8 @@ class PhillyStreets extends BaseStage
 
 	override function startSong()
 	{
-		gf.animation.finishCallback = onNeneAnimationFinished;
+		if (gf.curCharacter.startsWith('nene'))
+			gf.animation.finishCallback = onNeneAnimationFinished;
 	}
 	
 	function onNeneAnimationFinished(name:String)
@@ -523,6 +526,9 @@ class PhillyStreets extends BaseStage
 
 	function transitionState()
 	{
+		if (!gf.curCharacter.startsWith('nene'))
+			return;
+
 		switch (currentNeneState)
 		{
 			case STATE_DEFAULT:
@@ -582,18 +588,19 @@ class PhillyStreets extends BaseStage
 	override function beatHit()
 	{
 		//if(curBeat % 2 == 0) abot.beatHit();
-		switch(currentNeneState) {
-			case STATE_READY:
-				if (blinkCountdown == 0)
-				{
-					gf.playAnim('idleKnife', false);
-					blinkCountdown = FlxG.random.int(MIN_BLINK_DELAY, MAX_BLINK_DELAY);
-				}
-				else blinkCountdown--;
+		if (gf.curCharacter.startsWith('nene'))
+			switch(currentNeneState) {
+				case STATE_READY:
+					if (blinkCountdown == 0)
+					{
+						gf.playAnim('idleKnife', false);
+						blinkCountdown = FlxG.random.int(MIN_BLINK_DELAY, MAX_BLINK_DELAY);
+					}
+					else blinkCountdown--;
 
-			default:
-				// In other states, don't interrupt the existing animation.
-		}
+				default:
+					// In other states, don't interrupt the existing animation.
+			}
 
 		if(ClientPrefs.data.lowQuality) return;
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,12 @@ class Paths`
`86`	`86`	`if (obj != null && !currentTrackedAssets.exists(key) && !dumpExclusions.contains(key)) {`
`87`	`87`	`openfl.Assets.cache.removeBitmapData(key);`
`88`	`88`	`FlxG.bitmap._cache.remove(key);`
`89`		`- obj.destroy();`
	`89`	`+ // pointer not found?`
	`90`	`+ try {`
	`91`	`+ obj.destroy();`
	`92`	`+ } catch (exc) {`
	`93`	`+ trace(exc);`
	`94`	`+ }`
`90`	`95`	`}`
`91`	`96`	`}`
`92`	`97`
Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,7 @@ class VisualsUISubState extends BaseOptionsMenu`
`300`	`300`	`for (i in 0...Note.colArray.length)`
`301`	`301`	`{`
`302`	`302`	`var note:StrumNote = notes.members[i];`
	`303`	`+ if (note == null) continue;`
`303`	`304`	`if(notesTween[i] != null) notesTween[i].cancel();`
`304`	`305`	`if(curSelected == noteOptionID)`
`305`	`306`	`notesTween[i] = FlxTween.tween(note, {y: noteY}, Math.abs(note.y / (200 + noteY)) / 3, {ease: FlxEase.quadInOut});`
Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,9 @@ class MainMenuState extends MusicBeatState`
`441`	`441`	`}`
`442`	`442`	`spr.centerOffsets();`
`443`	`443`
	`444`	`+ if (spr.animation.curAnim == null)`
	`445`	`+ return;`
	`446`	`+`
`444`	`447`	`final animationOffset = animationOffsets.get(optionShit[curSelected] + ':' + spr.animation.curAnim.name);`
`445`	`448`	`if (animationOffset != null) {`
`446`	`449`	`spr.offset.x += animationOffset[0];`