cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-19 21:33:06 +00:00
Code Issues Releases Wiki Activity

Fix SetCameraBopSongEvent to be additive

Browse source
This commit is contained in:
EliteMasterEric 2024-04-05 02:44:44 -04:00
parent e2851818b3
commit 08e8530ad4
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
art

@ -1 +1 @@
Subproject commit 03e7c2a2353b184e45955c96d763b7cdf1acbc34 Subproject commit 00463685fa570f0c853d08e250b46ef80f30bc48

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

@ -866,7 +866,7 @@ class PlayState extends MusicBeatSubState
// Reset camera zooming // Reset camera zooming
cameraBopIntensity = Constants.DEFAULT_BOP_INTENSITY; cameraBopIntensity = Constants.DEFAULT_BOP_INTENSITY;
hudCameraZoomIntensity = 0.015 * 2.0; hudCameraZoomIntensity = (cameraBopIntensity - 1.0) * 2.0;
cameraZoomRate = Constants.DEFAULT_ZOOM_RATE; cameraZoomRate = Constants.DEFAULT_ZOOM_RATE;
health = Constants.HEALTH_STARTING; health = Constants.HEALTH_STARTING;
@ -976,6 +976,7 @@ class PlayState extends MusicBeatSubState
FlxG.watch.addQuick('bfAnim', currentStage.getBoyfriend().getCurrentAnimation()); FlxG.watch.addQuick('bfAnim', currentStage.getBoyfriend().getCurrentAnimation());
} }
FlxG.watch.addQuick('health', health); FlxG.watch.addQuick('health', health);
FlxG.watch.addQuick('cameraBopIntensity', cameraBopIntensity);
// TODO: Add a song event for Handle GF dance speed. // TODO: Add a song event for Handle GF dance speed.

4
source/funkin/play/event/SetCameraBopSongEvent.hx
View file

@ -50,8 +50,8 @@ class SetCameraBopSongEvent extends SongEvent
var intensity:Null<Float> = data.getFloat('intensity'); var intensity:Null<Float> = data.getFloat('intensity');
if (intensity == null) intensity = 1.0; if (intensity == null) intensity = 1.0;
PlayState.instance.cameraBopIntensity = Constants.DEFAULT_BOP_INTENSITY * intensity; PlayState.instance.cameraBopIntensity = (Constants.DEFAULT_BOP_INTENSITY - 1.0) * intensity + 1.0;
PlayState.instance.hudCameraZoomIntensity = 1.015 * intensity * 2.0; PlayState.instance.hudCameraZoomIntensity = (Constants.DEFAULT_BOP_INTENSITY - 1.0) * intensity * 2.0;
PlayState.instance.cameraZoomRate = rate; PlayState.instance.cameraZoomRate = rate;
trace('Set camera zoom rate to ${PlayState.instance.cameraZoomRate}'); trace('Set camera zoom rate to ${PlayState.instance.cameraZoomRate}');
} }