From af89443188a73cc56b33487a4efd149cdf366700 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Sat, 18 Mar 2023 02:53:08 +0100 Subject: [PATCH] fixes --- assets/data/scripts/pixel.hx | 4 ++-- source/funkin/game/PlayState.hx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/assets/data/scripts/pixel.hx b/assets/data/scripts/pixel.hx index 66530b0a..dc2054d3 100644 --- a/assets/data/scripts/pixel.hx +++ b/assets/data/scripts/pixel.hx @@ -106,7 +106,7 @@ function onStartCountdown() { var pixelSwagWidth = Note.swagWidth + (daPixelZoom - (Note.swagWidth % daPixelZoom)); - for(p in players) { + for(p in strumLines) { var i = 0; for(str in p.members) { str.x = (FlxG.width * strumOffset) + (pixelSwagWidth * (i - 2)); @@ -151,7 +151,7 @@ function postUpdate(elapsed) { e.downscroll = camHUD.downscroll; } if (enableCameraHacks) { - for(p in players) + for(p in strumLines) p.notes.forEach(function(n) { n.y -= n.y % daPixelZoom; n.x -= n.x % daPixelZoom; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 4405e5c6..d26e9df3 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1305,7 +1305,8 @@ class PlayState extends MusicBeatState if (__pressed.contains(true)) { for(c in p.characters) - c.__lockAnimThisFrame = true; + if (c.lastAnimContext != DANCE) + c.__lockAnimThisFrame = true; __funcsToExec.push(function(note:Note) { if (__pressed[note.strumID] && note.isSustainNote && note.canBeHit && !note.wasGoodHit) {