diff --git a/source/funkin/backend/chart/EventsData.hx b/source/funkin/backend/chart/EventsData.hx index 38b49201..11bf0673 100644 --- a/source/funkin/backend/chart/EventsData.hx +++ b/source/funkin/backend/chart/EventsData.hx @@ -52,8 +52,8 @@ class EventsData { type: TDropDown(['In', 'Out', 'InOut']), defValue: "In" }, - {name: "Multiplicative?", type: TBool, defValue: true}, - {name: "Mode", type: TDropDown(['stage', 'direct']), defValue: "stage"} + {name: "Mode", type: TDropDown(['stage', 'direct']), defValue: "stage"}, + {name: "Multiplicative?", type: TBool, defValue: true} ], "Camera Modulo Change" => [ {name: "Modulo Interval (Beats)", type: TInt(1, 9999999, 1), defValue: 4}, diff --git a/source/funkin/backend/chart/VSliceParser.hx b/source/funkin/backend/chart/VSliceParser.hx index c0bcf5bb..90f7fcef 100644 --- a/source/funkin/backend/chart/VSliceParser.hx +++ b/source/funkin/backend/chart/VSliceParser.hx @@ -152,7 +152,7 @@ class VSliceParser { result.events.push({ time: event.t, name: "Camera Zoom", // we dont support the direct mode since welp, its kind of useless here - Nex - params: [values.ease != "INSTANT", values.zoom == null ? 1 : values.zoom, "camGame", values.duration == null ? 4 : values.duration, cneEase[0], cneEase[1], false, values.mode] + params: [values.ease != "INSTANT", values.zoom == null ? 1 : values.zoom, "camGame", values.duration == null ? 4 : values.duration, cneEase[0], cneEase[1], values.mode, false] }); } } diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index b2e27a10..202c2677 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1489,10 +1489,10 @@ class PlayState extends MusicBeatState var tween = eventsTween.get(name); if (tween != null) tween.cancel(); var ease = CoolUtil.flxeaseFromString(event.params[4], event.params[5]); - var direct = event.params[7] == 'direct'; + var direct = event.params[6] == 'direct'; var finalZoom:Float = event.params[1] * (direct ? FlxCamera.defaultZoom : stage.defaultZoom); - if (event.params[6] == true) finalZoom *= cam.zoom; + if (event.params[7] == true) finalZoom *= cam.zoom; if (event.params[0] == false) { cam.zoom = finalZoom;