From 7afb990ef47d56bd005ed52b964717ec82526e5b Mon Sep 17 00:00:00 2001 From: Wizard <77557487+WizardMantis441@users.noreply.github.com> Date: Sat, 22 Apr 2023 03:59:10 -0500 Subject: [PATCH 1/4] huzzah! small shit lol --- source/funkin/game/PlayState.hx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index c14a2f7a..6a2ba67c 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1606,17 +1606,16 @@ class PlayState extends MusicBeatState super.beatHit(curBeat); if (camZoomingInterval < 1) camZoomingInterval = 1; - if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && curBeat % camZoomingInterval == 0) + if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && camZoomingInterval != null && curBeat % camZoomingInterval == 0) { FlxG.camera.zoom += 0.015 * camZoomingStrength; camHUD.zoom += 0.03 * camZoomingStrength; } - - iconP1.scale.set(1.2, 1.2); - iconP2.scale.set(1.2, 1.2); - - iconP1.updateHitbox(); - iconP2.updateHitbox(); + + for (i in [iconP1, iconP2] { + i.scale.set(1.2, 1.2); + i.updateHitbox(); + } scripts.call("beatHit", [curBeat]); } @@ -1744,4 +1743,4 @@ typedef PlayStateTransitionData = { var camFollowX:Float; var camFollowY:Float; var camZoom:Float; -} \ No newline at end of file +} From e593605f60285d6c699b76b2bcea009d01ab1ee9 Mon Sep 17 00:00:00 2001 From: Wizard <77557487+WizardMantis441@users.noreply.github.com> Date: Sat, 22 Apr 2023 04:01:00 -0500 Subject: [PATCH 2/4] forgot this lol thanks neo --- source/funkin/game/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 6a2ba67c..405680ed 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1605,7 +1605,7 @@ class PlayState extends MusicBeatState { super.beatHit(curBeat); - if (camZoomingInterval < 1) camZoomingInterval = 1; + if (camZoomingInterval != null && camZoomingInterval < 1) camZoomingInterval = 1; if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && camZoomingInterval != null && curBeat % camZoomingInterval == 0) { FlxG.camera.zoom += 0.015 * camZoomingStrength; From bf961cd098867c45aa72fe22848f7afdd156f366 Mon Sep 17 00:00:00 2001 From: WizardMantis441 <77557487+WizardMantis441@users.noreply.github.com> Date: Sat, 22 Apr 2023 04:14:57 -0500 Subject: [PATCH 3/4] Revert "forgot this lol" This reverts commit e593605f60285d6c699b76b2bcea009d01ab1ee9. --- source/funkin/game/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 405680ed..6a2ba67c 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1605,7 +1605,7 @@ class PlayState extends MusicBeatState { super.beatHit(curBeat); - if (camZoomingInterval != null && camZoomingInterval < 1) camZoomingInterval = 1; + if (camZoomingInterval < 1) camZoomingInterval = 1; if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && camZoomingInterval != null && curBeat % camZoomingInterval == 0) { FlxG.camera.zoom += 0.015 * camZoomingStrength; From fa30362c0b5c20c0fb84d3545bf1fb743cc079b6 Mon Sep 17 00:00:00 2001 From: WizardMantis441 <77557487+WizardMantis441@users.noreply.github.com> Date: Sat, 22 Apr 2023 04:15:01 -0500 Subject: [PATCH 4/4] Revert "huzzah!" This reverts commit 7afb990ef47d56bd005ed52b964717ec82526e5b. --- source/funkin/game/PlayState.hx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 6a2ba67c..c14a2f7a 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1606,16 +1606,17 @@ class PlayState extends MusicBeatState super.beatHit(curBeat); if (camZoomingInterval < 1) camZoomingInterval = 1; - if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && camZoomingInterval != null && curBeat % camZoomingInterval == 0) + if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && curBeat % camZoomingInterval == 0) { FlxG.camera.zoom += 0.015 * camZoomingStrength; camHUD.zoom += 0.03 * camZoomingStrength; } - - for (i in [iconP1, iconP2] { - i.scale.set(1.2, 1.2); - i.updateHitbox(); - } + + iconP1.scale.set(1.2, 1.2); + iconP2.scale.set(1.2, 1.2); + + iconP1.updateHitbox(); + iconP2.updateHitbox(); scripts.call("beatHit", [curBeat]); } @@ -1743,4 +1744,4 @@ typedef PlayStateTransitionData = { var camFollowX:Float; var camFollowY:Float; var camZoom:Float; -} +} \ No newline at end of file