diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx index 818b68c1c..db8844288 100644 --- a/source/funkin/ui/charSelect/CharSelectSubState.hx +++ b/source/funkin/ui/charSelect/CharSelectSubState.hx @@ -110,8 +110,6 @@ class CharSelectSubState extends MusicBeatSubState var playerData = player.getCharSelectData(); if (playerData == null) continue; - trace(player.isUnlocked()); - var targetPosition:Int = playerData.position ?? 0; while (availableChars.exists(targetPosition)) { @@ -487,7 +485,10 @@ class CharSelectSubState extends MusicBeatSubState if (nonLocks.length == 0) { - playerChillOut.onAnimationComplete.addOnce((_) -> playerChillOut.switchChar(char)); + playerChillOut.onAnimationComplete.addOnce((_) -> { + playerChillOut.visible = false; + playerChillOut.switchChar(char); + }); @:bypassAccessor curChar = char; Save.instance.addCharacterSeen(char); FunkinSound.playMusic('stayFunky', @@ -796,8 +797,6 @@ class CharSelectSubState extends MusicBeatSubState var refFrame = bopInfo.frames[bopInfo.frames.length - 1]; var curFrame = bopInfo.frames[bopFr]; - var xDiff:Float = curFrame.x - refFrame.x; - var yDiff:Float = curFrame.y - refFrame.y; var scaleXDiff:Float = curFrame.scaleX - refFrame.scaleX; var scaleYDiff:Float = curFrame.scaleY - refFrame.scaleY; diff --git a/source/funkin/util/FramesJSFLParser.hx b/source/funkin/util/FramesJSFLParser.hx index fa01a2c87..3a9ff8d0a 100644 --- a/source/funkin/util/FramesJSFLParser.hx +++ b/source/funkin/util/FramesJSFLParser.hx @@ -31,7 +31,7 @@ class FramesJSFLParser var scaleY:Float = 1; if (frameInfo[3] != null) scaleX = Std.parseFloat(frameInfo[4]); - if (frameInfo[4] != null) scaleX = Std.parseFloat(frameInfo[4]); + if (frameInfo[4] != null) scaleY = Std.parseFloat(frameInfo[4]); var shit:FramesJSFLFrame = {