From ff916f7b7a5fa4d545c198f22676dd40979eb8f5 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Sat, 25 Jan 2025 01:05:27 -0500 Subject: [PATCH] I may have been dumb this entire time --- source/PlayState.hx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index e393aea8f3d..12e7ecfdbe9 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4282,7 +4282,7 @@ class PlayState extends MusicBeatState camBopIntensity = _intensity; camBopInterval = _interval; - if (_intensity != 4) usingBopIntervalEvent = true; + if (_interval != 4) usingBopIntervalEvent = true; else usingBopIntervalEvent = false; case 'Camera Twist': @@ -6197,7 +6197,7 @@ class PlayState extends MusicBeatState var randomShit = FlxMath.roundDecimal(FlxG.random.float(minSpeed, maxSpeed), 2); lerpSongSpeed(randomShit, 1); } - if (camZooming && !endingSong && !startingSong && FlxG.camera.zoom < 1.35 && ClientPrefs.camZooms && (curBeat % camBopInterval == 0)) + if (camZooming && !endingSong && !startingSong && FlxG.camera.zoom < 1.35 && usingBopIntervalEvent && ClientPrefs.camZooms && (curBeat % camBopInterval == 0)) { FlxG.camera.zoom += 0.015 * camBopIntensity; camHUD.zoom += 0.03 * camBopIntensity; @@ -6274,7 +6274,11 @@ class PlayState extends MusicBeatState setOnLuas('mustHitSection', SONG.notes[curSection].mustHitSection); setOnLuas('altAnim', SONG.notes[curSection].altAnim); setOnLuas('gfSection', SONG.notes[curSection].gfSection); - if (!usingBopIntervalEvent) camBopInterval = getBeatsOnSection(); + if (camZooming && !endingSong && !startingSong && FlxG.camera.zoom < 1.35 && !usingBopIntervalEvent && ClientPrefs.camZooms) + { + FlxG.camera.zoom += 0.015 * camBopIntensity; + camHUD.zoom += 0.03 * camBopIntensity; + } } setOnLuas('curSection', curSection);