Skip to content

Chart Editor: Event UI Additions #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Chart Editor: Event UI Additions #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8fbd95
Update CharterEvent.hx
rodney528 Aug 12, 2025
3220db1
:P
rodney528 Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/funkin/backend/chart/EventsData.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class EventsData {
{name: "Tween Time (Steps)", type: TFloat(0.25, 9999, 0.25, 2), defValue: 4},
{
name: "Tween Ease (ex: circ, quad, cube)",
type: TDropDown(['linear', 'back', 'bounce', 'circ', 'cube', 'elastic', 'expo', 'quad', 'quart', 'quint', 'sine', 'smoothStep', 'smootherStep']),
type: TDropDown(['SET', 'linear', 'back', 'bounce', 'circ', 'cube', 'elastic', 'expo', 'quad', 'quart', 'quint', 'sine', 'smoothStep', 'smootherStep']),
defValue: "linear"
},
{
Expand Down
140 changes: 115 additions & 25 deletions source/funkin/editors/charter/CharterEvent.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,23 +222,113 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
}

switch(event.name) {
case "Time Signature Change":
if(event.params != null && (event.params[0] >= 0 || event.params[1] >= 0)) {
case "Camera Movement":
// camera movement, use health icon
if(event.params != null) {
if (inMenu) {
var icon = getIconFromStrumline(event.params[0]);
if (icon != null) return icon;
} else {
var group = new EventIconGroup();
var icon = getIconFromStrumline(event.params[0]);
if (icon != null) { // had to do this, otherwise the icon is offsetd down right for some reason :sob:
icon.x -= 8;
icon.y -= 8;
group.add(icon);
}
if (event.params[1] && event.params[3] != 'CLASSIC')
generateEventIconDurationArrow(group, event.params[2]);
return group;
}
}

case "Camera Position":
if(event.params != null) {
if (!inMenu) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
if (event.params[2] && event.params[4] != 'CLASSIC')
generateEventIconDurationArrow(group, event.params[3]);
return group;
}
}

case "Add Camera Zoom":
if(event.params != null) {
if (!inMenu) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
group.members[0].y -= 2;
generateEventIconNumbers(group, event.params[0]);
return group;
}
}

case "Camera Bop":
if(event.params != null) {
if (!inMenu) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
group.members[0].y -= 2;
generateEventIconNumbers(group, event.params[0]);
return group;
}
}

case "Camera Zoom":
if(event.params != null) {
if (!inMenu) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
if (event.params[0] && event.params[4] != 'SET')
generateEventIconDurationArrow(group, event.params[3]);
group.members[0].y -= 2;
generateEventIconNumbers(group, event.params[1]);
return group;
}
}

case "Camera Modulo Change":
if(event.params != null) {
if (!inMenu) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
group.add({ // top
var num = new EventNumber(14, -1, event.params[0], EventNumber.ALIGN_CENTER);
num.active = false;
num;
});
group.add({ // bottom
var num = new EventNumber(14, 10, event.params[1], EventNumber.ALIGN_CENTER);
num.active = false;
num;
});
return group;
}
}

case "Camera Flash":
if(event.params != null) {
if (!inMenu) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
generateEventIconDurationArrow(group, event.params[2]);
return group;
}
}

case "BPM Change":
if(event.params != null && event.params[0] != null) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
group.add({ // top
var num = new EventNumber(9, -1, event.params[0], EventNumber.ALIGN_CENTER);
num.active = false;
num;
});
group.add({ // bottom
var num = new EventNumber(9, 10, event.params[1], EventNumber.ALIGN_CENTER);
num.active = false;
num;
});
if (!inMenu) {
group.members[0].y -= 2;
generateEventIconNumbers(group, event.params[0], 3);
}
if (Conductor.invalidEvents.contains(event)) generateEventIconWarning(group);
return group;
}

case "Continuous BPM Change":
if(event.params != null && event.params[1] != null) {
var group = new EventIconGroup();
Expand All @@ -253,14 +343,21 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
} else {
return generateDefaultIcon("BPM Change Start");
}
case "BPM Change":
if(event.params != null && event.params[0] != null) {

case "Time Signature Change":
if(event.params != null && (event.params[0] >= 0 || event.params[1] >= 0)) {
var group = new EventIconGroup();
group.add(generateDefaultIcon(event.name));
if (!inMenu) {
group.members[0].y -= 2;
generateEventIconNumbers(group, event.params[0], 3);
}
group.add({ // top
var num = new EventNumber(9, -1, event.params[0], EventNumber.ALIGN_CENTER);
num.active = false;
num;
});
group.add({ // bottom
var num = new EventNumber(9, 10, event.params[1], EventNumber.ALIGN_CENTER);
num.active = false;
num;
});
if (Conductor.invalidEvents.contains(event)) generateEventIconWarning(group);
return group;
}
Expand All @@ -274,13 +371,6 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
generateEventIconNumbers(group, event.params[1]);
return group;
}

case "Camera Movement":
// camera movement, use health icon
if(event.params != null) {
var icon = getIconFromStrumline(event.params[0]);
if(icon != null) return icon;
}
}
return generateDefaultIcon(event.name);
}
Expand Down
5 changes: 3 additions & 2 deletions source/funkin/game/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,10 +1590,11 @@ class PlayState extends MusicBeatState
if (event.params[7] == true) finalZoom *= cam.zoom;

if (event.params[0] == false) {
cam.zoom = finalZoom;
if (event.params[4] != "SET")
cam.zoom = finalZoom;
if (cam == camHUD) defaultHudZoom = finalZoom;
else defaultCamZoom = finalZoom;
} else
} else if (event.params[4] != null && event.params[4] != "SET")
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(_) {
if (cam == camHUD) defaultHudZoom = cam.zoom;
else defaultCamZoom = cam.zoom;
Expand Down