diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index bd489e617..5e7f4ffbd 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -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; @@ -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]); @@ -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"]; @@ -262,7 +262,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, ?Force:Null = 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); @@ -270,7 +270,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset 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); diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 76752ac43..10a30e85e 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -627,7 +627,7 @@ class PlayState extends MusicBeatState public inline function callOnCharacters(func:String, ?parameters:Array) { 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); }); }