Skip to content

Commit fb54e50

Browse files
authored
Add 'CLASSIC' ease to Camera Zoom event (#1053)
* free pr * this looks odd, i'm changing the position
1 parent 1c844ee commit fb54e50

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

source/funkin/backend/chart/EventsData.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class EventsData {
6868
{name: "Tween Time (Steps)", type: TFloat(0.25, 9999, 0.25, 2), defValue: 4},
6969
{
7070
name: "Tween Ease (ex: circ, quad, cube)",
71-
type: TDropDown(['linear', 'back', 'bounce', 'circ', 'cube', 'elastic', 'expo', 'quad', 'quart', 'quint', 'sine', 'smoothStep', 'smootherStep']),
71+
type: TDropDown(['CLASSIC', 'linear', 'back', 'bounce', 'circ', 'cube', 'elastic', 'expo', 'quad', 'quart', 'quint', 'sine', 'smoothStep', 'smootherStep']),
7272
defValue: "linear"
7373
},
7474
{

source/funkin/editors/charter/CharterEvent.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
309309
case "Camera Zoom":
310310
var shouldDoArrow:Bool = false;
311311
if (event.params != null)
312-
shouldDoArrow = event.params[0];
312+
shouldDoArrow = event.params[0] && event.params[4] != "CLASSIC";
313313

314314
if(event.params != null && shouldDoArrow && !inMenu) {
315315
var group = new EventIconGroup();

source/funkin/game/PlayState.hx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,6 +1664,9 @@ class PlayState extends MusicBeatState
16641664
cam.zoom = finalZoom;
16651665
if (cam == camHUD) defaultHudZoom = finalZoom;
16661666
else defaultCamZoom = finalZoom;
1667+
} else if (event.params[4] == "CLASSIC") {
1668+
if (cam == camHUD) defaultHudZoom = finalZoom;
1669+
else defaultCamZoom = finalZoom;
16671670
} else
16681671
eventsTween.set(name, FlxTween.tween(cam, {zoom: finalZoom}, (Conductor.stepCrochet / 1000) * event.params[3], {ease: CoolUtil.flxeaseFromString(event.params[4], event.params[5]), onUpdate: function(_) {
16691672
if (cam == camHUD) defaultHudZoom = cam.zoom;

0 commit comments

Comments
 (0)