From 85e181bc809eac246212cf7f8eb99e8989abb482 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 24 Mar 2021 23:39:19 -0400 Subject: [PATCH] lerp tweaks and shit more --- source/PlayState.hx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 9790aceff..0c95bbf53 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1488,8 +1488,8 @@ class PlayState extends MusicBeatState // FlxG.watch.addQuick('VOL', vocals.amplitudeLeft); // FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight); - iconP1.setGraphicSize(Std.int(FlxMath.lerp(150, iconP1.width, 0.50))); - iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.width, 0.50))); + iconP1.setGraphicSize(Std.int(FlxMath.lerp(150, iconP1.width, 0.85))); + iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.width, 0.85))); iconP1.updateHitbox(); iconP2.updateHitbox(); @@ -1522,6 +1522,8 @@ class PlayState extends MusicBeatState if (generatedMusic && PlayState.SONG.notes[Std.int(curStep / 16)] != null) { + cameraRightSide = PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection; + cameraMovement(); } @@ -1944,9 +1946,11 @@ class PlayState extends MusicBeatState curSection += 1; } + var cameraRightSide:Bool = false; + function cameraMovement() { - if (camFollow.x != dad.getMidpoint().x + 150 && !PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection) + if (camFollow.x != dad.getMidpoint().x + 150 && !cameraRightSide) { camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100); // camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210); @@ -1972,7 +1976,7 @@ class PlayState extends MusicBeatState } } - if (PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection && camFollow.x != boyfriend.getMidpoint().x - 100) + if (cameraRightSide && camFollow.x != boyfriend.getMidpoint().x - 100) { camFollow.setPosition(boyfriend.getMidpoint().x - 100, boyfriend.getMidpoint().y - 100); @@ -2123,7 +2127,7 @@ class PlayState extends MusicBeatState } } - if ((up || right || down || left) && !boyfriend.stunned && generatedMusic) + if ((up || right || down || left) && /*!boyfriend.stunned && */ generatedMusic) { notes.forEachAlive(function(daNote:Note) {