Skip to content

Character script, references fix. #871

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

Character script, references fix. #871

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions source/funkin/game/Character.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset

public function tryDance() {
var event = new CancellableEvent();
script.call("onTryDance", [event]);
scripts.call("onTryDance", [event]);
if (event.cancelled)
return;

Expand Down Expand Up @@ -188,7 +188,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
}

public override function measureHit(curMeasure:Int)
script.call("measureHit", [curMeasure]);
scripts.call("measureHit", [curMeasure]);

public override function stepHit(curStep:Int)
scripts.call("stepHit", [curStep]);
Expand Down Expand Up @@ -243,13 +243,13 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
public var ghostDraw:Bool = false;
public override function draw() {
var e = EventManager.get(DrawEvent).recycle();
script.call("draw", [e]);
scripts.call("draw", [e]);

preDraw();
super.draw();
postDraw();

script.call("postDraw", [e]);
scripts.call("postDraw", [e]);
}

public var singAnims = ["singLEFT", "singDOWN", "singUP", "singRIGHT"];
Expand All @@ -262,15 +262,15 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, ?Force:Null<Bool> = null, Reversed:Bool = false, Frame:Int = 0)
{
var event = EventManager.get(DirectionAnimEvent).recycle(getSingAnim(direction, suffix), direction, suffix, Context, Reversed, Frame, Force);
script.call("onPlaySingAnim", [event]);
scripts.call("onPlaySingAnim", [event]);
if (event.cancelled) return;

playSingAnimUnsafe(event.direction, hasAnimation(event.animName) ? event.suffix : "", event.context, event.force, event.reversed, event.frame);
}

public function playSingAnimUnsafe(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, Force:Bool = true, Reversed:Bool = false, Frame:Int = 0) {
var event = EventManager.get(DirectionAnimEvent).recycle(getSingAnim(direction, suffix), direction, suffix, Context, Reversed, Frame, Force);
script.call("playSingAnimUnsafe", [event]);
scripts.call("playSingAnimUnsafe", [event]);
if (event.cancelled) return;

playAnim(event.animName, event.force, event.context, event.reversed, event.frame);
Expand Down
2 changes: 1 addition & 1 deletion source/funkin/game/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ class PlayState extends MusicBeatState
public inline function callOnCharacters(func:String, ?parameters:Array<Dynamic>) {
if(strumLines != null) strumLines.forEachAlive(function (strLine:StrumLine) {
if (strLine.characters != null) for (character in strLine.characters)
if (character != null) character.script.call(func, parameters);
if (character != null) character.scripts.call(func, parameters);
});
}

Expand Down