cam movement keybind quanted & added a local keybind (#739)

* cam movement keybind quanted & local keybind

* Update Charter.hx

* changes that furo requested

* some edits

* opposite so its more consistent

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
This commit is contained in:
Kolze
2025-08-24 02:01:28 +02:00
committed by GitHub
co-authored by ⍚~Nex
parent be1657884e
commit f9402fe826
+20 -31
View File
@@ -1845,6 +1845,22 @@ class Charter extends UIState {
Conductor.songPosition = FlxG.sound.music.length; 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<Dynamic>, 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<ChartBookmark> { public function getBookmarkList():Array<ChartBookmark> {
var bookmarks:Array<ChartBookmark> = []; var bookmarks:Array<ChartBookmark> = [];
try { try {
@@ -1855,34 +1871,6 @@ class Charter extends UIState {
return bookmarks; 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(_) { function _bookmarks_add(_) {
var addBookmarkAt = function(name:String, color:FlxColor, daStep:Float) var addBookmarkAt = function(name:String, color:FlxColor, daStep:Float)
{ {
@@ -1904,6 +1892,7 @@ class Charter extends UIState {
})); }));
} }
} }
function _bookmarks_edit_list(_) function _bookmarks_edit_list(_)
FlxG.state.openSubState(new CharterBookmarkList()); //idk why its FlxG.state but it looks so off lmfao FlxG.state.openSubState(new CharterBookmarkList()); //idk why its FlxG.state but it looks so off lmfao
@@ -1995,12 +1984,12 @@ class Charter extends UIState {
null, null,
{ {
label: translate("song.addOpponentCamera"), label: translate("song.addOpponentCamera"),
keybind: [O], keybinds: [[O], [O, SHIFT], [O, ALT]],
onSelect: _opponent_camera_add onSelect: _opponent_camera_add
}, },
{ {
label: translate("song.addPlayerCamera"), label: translate("song.addPlayerCamera"),
keybind: [P], keybinds: [[P], [P, SHIFT], [P, ALT]],
onSelect: _player_camera_add onSelect: _player_camera_add
}, },
null, null,
@@ -2523,4 +2512,4 @@ typedef PlaytestInfo = {
var hitSounds:Array<Bool>; var hitSounds:Array<Bool>;
var mutedVocals:Array<Bool>; var mutedVocals:Array<Bool>;
var waveforms:Array<Int>; var waveforms:Array<Int>;
} }