@@ -1845,6 +1845,22 @@ class Charter extends UIState {
18451845 Conductor .songPosition = FlxG .sound .music .length ;
18461846 }
18471847
1848+ function _opponent_camera_add (_ ) addEventAtCurrentStep (" Camera Movement" , [0 ], ! FlxG .keys .pressed .ALT , ! FlxG .keys .pressed .SHIFT );
1849+ function _player_camera_add (_ ) addEventAtCurrentStep (" Camera Movement" , [1 ], ! FlxG .keys .pressed .ALT , ! FlxG .keys .pressed .SHIFT );
1850+
1851+ function addEventAtCurrentStep (name : String , params : Array <Dynamic >, shouldGlobal : Bool = true , shouldQuant : Bool = false ) {
1852+ var step : Float = (shouldQuant ? quantStep (curStepFloat ) : curStepFloat );
1853+ var __event : CharterEvent = new CharterEvent (step , [{
1854+ name : name ,
1855+ params : params ,
1856+ time : Conductor .getTimeForStep (step )
1857+ }], shouldGlobal );
1858+
1859+ __event .refreshEventIcons ();
1860+ (__event .global ? rightEventsGroup : leftEventsGroup ).add (__event );
1861+ undos .addToUndo (CEditEvent (__event , [], __event .events ));
1862+ }
1863+
18481864 public function getBookmarkList (): Array <ChartBookmark > {
18491865 var bookmarks : Array <ChartBookmark > = [];
18501866 try {
@@ -1855,34 +1871,6 @@ class Charter extends UIState {
18551871 return bookmarks ;
18561872 }
18571873
1858- function _opponent_camera_add (_ ) {
1859- var __event : CharterEvent = null ;
1860-
1861- __event = new CharterEvent (curStepFloat , [{
1862- name : " Camera Movement" ,
1863- params :[0 ],
1864- time : Conductor .getTimeForStep (curStepFloat )
1865- }], true );
1866- __event .refreshEventIcons ();
1867- __event .global = true ;
1868- rightEventsGroup .add (__event );
1869- undos .addToUndo (CEditEvent (__event , [], __event .events ));
1870-
1871- }
1872- function _player_camera_add (_ ) {
1873- var __event : CharterEvent = null ;
1874-
1875- __event = new CharterEvent (curStepFloat , [{
1876- name : " Camera Movement" ,
1877- params :[1 ],
1878- time : Conductor .getTimeForStep (curStepFloat )
1879- }], true );
1880- __event .refreshEventIcons ();
1881- rightEventsGroup .add (__event );
1882- undos .addToUndo (CEditEvent (__event , [], __event .events ));
1883-
1884- }
1885-
18861874 function _bookmarks_add (_ ) {
18871875 var addBookmarkAt = function (name : String , color : FlxColor , daStep : Float )
18881876 {
@@ -1904,6 +1892,7 @@ class Charter extends UIState {
19041892 }));
19051893 }
19061894 }
1895+
19071896 function _bookmarks_edit_list (_ )
19081897 FlxG .state .openSubState (new CharterBookmarkList ()); // idk why its FlxG.state but it looks so off lmfao
19091898
@@ -1995,12 +1984,12 @@ class Charter extends UIState {
19951984 null ,
19961985 {
19971986 label : translate (" song.addOpponentCamera" ),
1998- keybind : [O ],
1987+ keybinds : [[ O ], [ O , SHIFT ], [ O , ALT ] ],
19991988 onSelect : _opponent_camera_add
20001989 },
20011990 {
20021991 label : translate (" song.addPlayerCamera" ),
2003- keybind : [P ],
1992+ keybinds : [[ P ], [ P , SHIFT ], [ P , ALT ] ],
20041993 onSelect : _player_camera_add
20051994 },
20061995 null ,
@@ -2523,4 +2512,4 @@ typedef PlaytestInfo = {
25232512 var hitSounds : Array <Bool >;
25242513 var mutedVocals : Array <Bool >;
25252514 var waveforms : Array <Int >;
2526- }
2515+ }
0 commit comments