diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index facf00351..5eb3deb43 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -1841,6 +1841,22 @@ class Charter extends UIState { Conductor.songPosition = FlxG.sound.music.length; } + function _opponent_camera_add(_) addEventAtCurrentStep("Camera Movement", [0], !FlxG.keys.pressed.ALT, !FlxG.keys.pressed.SHIFT); + function _player_camera_add(_) addEventAtCurrentStep("Camera Movement", [1], !FlxG.keys.pressed.ALT, !FlxG.keys.pressed.SHIFT); + + function addEventAtCurrentStep(name:String, params:Array, shouldGlobal:Bool = true, shouldQuant:Bool = false) { + var step:Float = (shouldQuant ? quantStep(curStepFloat) : curStepFloat); + var __event:CharterEvent = new CharterEvent(step, [{ + name: name, + params: params, + time: Conductor.getTimeForStep(step) + }], shouldGlobal); + + __event.refreshEventIcons(); + (__event.global ? rightEventsGroup : leftEventsGroup).add(__event); + undos.addToUndo(CEditEvent(__event, [], __event.events)); + } + public function getBookmarkList():Array { var bookmarks:Array = []; try { @@ -1851,34 +1867,6 @@ class Charter extends UIState { return bookmarks; } - function _opponent_camera_add(_) { - var __event:CharterEvent = null; - - __event = new CharterEvent(curStepFloat, [{ - name: "Camera Movement", - params:[0], - time: Conductor.getTimeForStep(curStepFloat) - }], true); - __event.refreshEventIcons(); - __event.global = true; - rightEventsGroup.add(__event); - undos.addToUndo(CEditEvent(__event, [], __event.events)); - - } - function _player_camera_add(_) { - var __event:CharterEvent = null; - - __event = new CharterEvent(curStepFloat, [{ - name: "Camera Movement", - params:[1], - time: Conductor.getTimeForStep(curStepFloat) - }], true); - __event.refreshEventIcons(); - rightEventsGroup.add(__event); - undos.addToUndo(CEditEvent(__event, [], __event.events)); - - } - function _bookmarks_add(_) { var addBookmarkAt = function(name:String, color:FlxColor, daStep:Float) { @@ -1900,6 +1888,7 @@ class Charter extends UIState { })); } } + function _bookmarks_edit_list(_) FlxG.state.openSubState(new CharterBookmarkList()); //idk why its FlxG.state but it looks so off lmfao @@ -1993,12 +1982,12 @@ class Charter extends UIState { null, { label: translate("song.addOpponentCamera"), - keybind: [O], + keybinds: [[O], [O, SHIFT], [O, ALT]], onSelect: _opponent_camera_add }, { label: translate("song.addPlayerCamera"), - keybind: [P], + keybinds: [[P], [P, SHIFT], [P, ALT]], onSelect: _player_camera_add }, null, @@ -2521,4 +2510,4 @@ typedef PlaytestInfo = { var hitSounds:Array; var mutedVocals:Array; var waveforms:Array; -} \ No newline at end of file +}