cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-28 23:35:54 +00:00
Code Issues Releases Wiki Activity

Fix scaleY not parsing

Browse source
This commit is contained in:
CheemsAndFriends 2024-09-09 17:41:25 +02:00
parent 6961e6cc63
commit 35af057f88
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/funkin/ui/charSelect/CharSelectSubState.hx
View file

@ -110,8 +110,6 @@ class CharSelectSubState extends MusicBeatSubState
var playerData = player.getCharSelectData(); var playerData = player.getCharSelectData();
if (playerData == null) continue; if (playerData == null) continue;
trace(player.isUnlocked());
var targetPosition:Int = playerData.position ?? 0; var targetPosition:Int = playerData.position ?? 0;
while (availableChars.exists(targetPosition)) while (availableChars.exists(targetPosition))
{ {
@ -487,7 +485,10 @@ class CharSelectSubState extends MusicBeatSubState
if (nonLocks.length == 0) if (nonLocks.length == 0)
{ {
playerChillOut.onAnimationComplete.addOnce((_) -> playerChillOut.switchChar(char)); playerChillOut.onAnimationComplete.addOnce((_) -> {
playerChillOut.visible = false;
playerChillOut.switchChar(char);
});
@:bypassAccessor curChar = char; @:bypassAccessor curChar = char;
Save.instance.addCharacterSeen(char); Save.instance.addCharacterSeen(char);
FunkinSound.playMusic('stayFunky', FunkinSound.playMusic('stayFunky',
@ -796,8 +797,6 @@ class CharSelectSubState extends MusicBeatSubState
var refFrame = bopInfo.frames[bopInfo.frames.length - 1]; var refFrame = bopInfo.frames[bopInfo.frames.length - 1];
var curFrame = bopInfo.frames[bopFr]; 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 scaleXDiff:Float = curFrame.scaleX - refFrame.scaleX;
var scaleYDiff:Float = curFrame.scaleY - refFrame.scaleY; var scaleYDiff:Float = curFrame.scaleY - refFrame.scaleY;

2
source/funkin/util/FramesJSFLParser.hx
View file

@ -31,7 +31,7 @@ class FramesJSFLParser
var scaleY:Float = 1; var scaleY:Float = 1;
if (frameInfo[3] != null) scaleX = Std.parseFloat(frameInfo[4]); 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 = var shit:FramesJSFLFrame =
{ {