Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-22 23:57:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Replace the zoom with a fade (for now)

Browse source
This commit is contained in:
EliteMasterEric 2024-04-24 23:50:19 -04:00
parent 7c6bf7ef45
commit dd90d430ee
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
source/funkin/play/PlayState.hx
View file

@ -3020,23 +3020,30 @@ class PlayState extends MusicBeatSubState
if (targetBF) if (targetBF)
{ {
FlxG.camera.follow(currentStage.getBoyfriend(), null, 0.05); FlxG.camera.follow(currentStage.getBoyfriend(), null, 0.05);
FlxG.camera.targetOffset.y -= 350;
FlxG.camera.targetOffset.x += 20;
} }
else if (targetDad) else if (targetDad)
{ {
FlxG.camera.follow(currentStage.getDad(), null, 0.05); FlxG.camera.follow(currentStage.getDad(), null, 0.05);
FlxG.camera.targetOffset.y -= 350;
FlxG.camera.targetOffset.x += 20;
} }
else else
{ {
FlxG.camera.follow(currentStage.getGirlfriend(), null, 0.05); FlxG.camera.follow(currentStage.getGirlfriend(), null, 0.05);
FlxG.camera.targetOffset.y -= 350;
FlxG.camera.targetOffset.x += 20;
} }
FlxTween.tween(camHUD, {alpha: 0}, 0.6); // TODO: Make target offset configurable.
// In the meantime, we have to replace the zoom animation with a fade out.
FlxG.camera.targetOffset.y -= 350;
FlxG.camera.targetOffset.x += 20;
// Replace zoom animation with a fade out for now.
camGame.fade(FlxColor.BLACK, 0.6);
FlxTween.tween(camHUD, {alpha: 0}, 0.6,
{
onComplete: function(_) {
moveToResultsScreen(isNewHighscore);
}
});
// Zoom in on Girlfriend (or BF if no GF) // Zoom in on Girlfriend (or BF if no GF)
new FlxTimer().start(0.8, function(_) { new FlxTimer().start(0.8, function(_) {
@ -3054,13 +3061,13 @@ class PlayState extends MusicBeatSubState
} }
// Zoom over to the Results screen. // Zoom over to the Results screen.
FlxTween.tween(FlxG.camera, {zoom: 1200}, 1.1, // TODO: Re-enable this.
{ /*
ease: FlxEase.expoIn, FlxTween.tween(FlxG.camera, {zoom: 1200}, 1.1,
onComplete: function(_) { {
moveToResultsScreen(isNewHighscore); ease: FlxEase.expoIn,
} });
}); */
}); });
} }
@ -3247,7 +3254,7 @@ class PlayState extends MusicBeatSubState
SongEventRegistry.handleSkippedEvents(songEvents, Conductor.instance.songPosition); SongEventRegistry.handleSkippedEvents(songEvents, Conductor.instance.songPosition);
// regenNoteData(FlxG.sound.music.time); // regenNoteData(FlxG.sound.music.time);
Conductor.instance.update(FlxG.sound.music.time); Conductor.instance.update(FlxG.sound?.music?.time ?? 0.0);
resyncVocals(); resyncVocals();
} }