From accc74f302d013a966c024c7856909ade9aed267 Mon Sep 17 00:00:00 2001 From: KadeDeveloper Date: Mon, 9 Aug 2021 00:38:47 -0700 Subject: [PATCH] fix zooming --- source/PlayState.hx | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 7615edf..6bf0b37 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2789,8 +2789,22 @@ class PlayState extends MusicBeatState if (FlxG.save.data.zoom > 1.2) FlxG.save.data.zoom = 1.2; - FlxG.camera.zoom = FlxMath.lerp(defaultCamZoom, FlxG.camera.zoom, 0.95); - camHUD.zoom = FlxMath.lerp(FlxG.save.data.zoom, camHUD.zoom, 0.95); + if (!executeModchart) + { + FlxG.camera.zoom = FlxMath.lerp(defaultCamZoom, FlxG.camera.zoom, 0.95); + camHUD.zoom = FlxMath.lerp(FlxG.save.data.zoom, camHUD.zoom, 0.95); + + camNotes.zoom = camHUD.zoom; + camSustains.zoom = camHUD.zoom; + } + else + { + FlxG.camera.zoom = FlxMath.lerp(defaultCamZoom, FlxG.camera.zoom, 0.95); + camHUD.zoom = FlxMath.lerp(1, camHUD.zoom, 0.95); + + camNotes.zoom = camHUD.zoom; + camSustains.zoom = camHUD.zoom; + } } FlxG.watch.addQuick("curBPM", Conductor.bpm); @@ -2906,11 +2920,17 @@ class PlayState extends MusicBeatState { var dunceNote:Note = unspawnNotes[0]; notes.add(dunceNote); - if (!dunceNote.isSustainNote) - dunceNote.cameras = [camNotes]; + if (executeModchart) + { + if (!dunceNote.isSustainNote) + dunceNote.cameras = [camNotes]; + else + dunceNote.cameras = [camSustains]; + } else - dunceNote.cameras = [camSustains]; - + { + dunceNote.cameras = [camHUD]; + } var index:Int = unspawnNotes.indexOf(dunceNote); unspawnNotes.splice(index, 1); }