cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

lerp tweaks and shit more

This commit is contained in:
Cameron Taylor 2021-03-24 23:39:19 -04:00
parent 399da03591
commit 7cb1954718
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/PlayState.hx
View File

@ -1488,8 +1488,8 @@ class PlayState extends MusicBeatState
// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft); // FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
// FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight); // FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight);
iconP1.setGraphicSize(Std.int(FlxMath.lerp(150, iconP1.width, 0.50))); iconP1.setGraphicSize(Std.int(FlxMath.lerp(150, iconP1.width, 0.85)));
iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.width, 0.50))); iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.width, 0.85)));
iconP1.updateHitbox(); iconP1.updateHitbox();
iconP2.updateHitbox(); iconP2.updateHitbox();
@ -1522,6 +1522,8 @@ class PlayState extends MusicBeatState
if (generatedMusic && PlayState.SONG.notes[Std.int(curStep / 16)] != null) if (generatedMusic && PlayState.SONG.notes[Std.int(curStep / 16)] != null)
{ {
cameraRightSide = PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection;
cameraMovement(); cameraMovement();
} }
@ -1944,9 +1946,11 @@ class PlayState extends MusicBeatState
curSection += 1; curSection += 1;
} }
var cameraRightSide:Bool = false;
function cameraMovement() 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(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100);
// camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210); // 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); 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) notes.forEachAlive(function(daNote:Note)
{ {