cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-26 14:16:00 +00:00
Code Issues Releases Wiki Activity

Update Weekend 1 cutscenes to use the instanced Conductor

Browse source
This commit is contained in:
EliteMasterEric 2024-04-20 02:11:04 -04:00
parent a9dd85c865
commit 84c3fd452b
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 77a7f44a89349d40a41b94c1d65381386759359b Subproject commit 7ec8282b5358302f3d862f4670d9c60102aa1cf7

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

@ -813,6 +813,7 @@ class PlayState extends MusicBeatSubState
super.update(elapsed); super.update(elapsed);
var list = FlxG.sound.list;
updateHealthBar(); updateHealthBar();
updateScoreText(); updateScoreText();
@ -969,7 +970,7 @@ class PlayState extends MusicBeatSubState
if (health < Constants.HEALTH_MIN) health = Constants.HEALTH_MIN; if (health < Constants.HEALTH_MIN) health = Constants.HEALTH_MIN;
// Apply camera zoom + multipliers. // Apply camera zoom + multipliers.
if (subState == null && cameraZoomRate > 0.0 && !isInCutscene) if (subState == null && cameraZoomRate > 0.0) // && !isInCutscene)
{ {
cameraBopMultiplier = FlxMath.lerp(1.0, cameraBopMultiplier, 0.95); // Lerp bop multiplier back to 1.0x cameraBopMultiplier = FlxMath.lerp(1.0, cameraBopMultiplier, 0.95); // Lerp bop multiplier back to 1.0x
var zoomPlusBop = currentCameraZoom * cameraBopMultiplier; // Apply camera bop multiplier. var zoomPlusBop = currentCameraZoom * cameraBopMultiplier; // Apply camera bop multiplier.
@ -1869,6 +1870,8 @@ class PlayState extends MusicBeatSubState
isInCutscene = false; isInCutscene = false;
camCutscene.visible = false; camCutscene.visible = false;
// TODO: Maybe tween in the camera after any cutscenes.
camHUD.visible = true; camHUD.visible = true;
} }

2
source/funkin/play/event/FocusCameraSongEvent.hx
View file

@ -127,7 +127,7 @@ class FocusCameraSongEvent extends SongEvent
switch (ease) switch (ease)
{ {
case 'CLASSIC': // Old-school. No ease. Just set follow point. case 'CLASSIC': // Old-school. No ease. Just set follow point.
PlayState.instance.cancelCameraFollowTween(); PlayState.instance.resetCamera();
PlayState.instance.cameraFollowPoint.setPosition(targetX, targetY); PlayState.instance.cameraFollowPoint.setPosition(targetX, targetY);
case 'INSTANT': // Instant ease. Duration is automatically 0. case 'INSTANT': // Instant ease. Duration is automatically 0.
PlayState.instance.tweenCameraToPosition(targetX, targetY, 0); PlayState.instance.tweenCameraToPosition(targetX, targetY, 0);