Skip to content

Fix Event UI Script for .pack files #906

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
Bitto1070 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Event UI Script for .pack files #906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions source/funkin/editors/charter/CharterEvent.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
var packData = getPackData(event.name);
if(packData != null) {
var scriptFile = packData[4];
if(scriptFile != null) {
script = Script.fromString(scriptFile, uiScript);
}
if (scriptFile != null)
script = Script.fromString(scriptFile, uiScript+'.hx');
}
}

Expand Down Expand Up @@ -282,9 +281,9 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
shouldDoArrow = event.params[1] && event.params[3] != "CLASSIC"; // is Tweened and isnt Lerped
icon = getIconFromStrumline(event.params[0]); // camera movement, use health icon
}

if (icon == null) icon = generateDefaultIcon(event.name);

if(event.params != null && shouldDoArrow && !inMenu) {
var group = new EventIconGroup();
group.add(icon);
Expand Down