@@ -3,7 +3,7 @@ package funkin.game.cutscenes;
33import funkin .backend .utils .FunkinParentDisabler ;
44import funkin .backend .scripting .events .dialogue .* ;
55import funkin .backend .scripting .events .CancellableEvent ;
6- import funkin .backend .scripting .events .DynamicEvent ;
6+ import funkin .backend .scripting .events .dialogue . DialogueNextLineEvent ;
77import funkin .backend .scripting .Script ;
88import flixel .sound .FlxSound ;
99import funkin .game .cutscenes .dialogue .* ;
@@ -138,8 +138,8 @@ class DialogueCutscene extends Cutscene {
138138 public var canProceed : Bool = true ;
139139
140140 public function next (playFirst : Bool = false ) {
141- var event = EventManager .get (DynamicEvent ).recycle (playFirst );
142- dialogueScript .call (" next" , [playFirst ]);
141+ var event = EventManager .get (DialogueNextLineEvent ).recycle (playFirst );
142+ dialogueScript .call (" next" , [event ]);
143143 if (event .cancelled || ! canProceed ) return ;
144144
145145 if ((curLine = dialogueLines .shift ()) == null ) {
@@ -154,7 +154,7 @@ class DialogueCutscene extends Cutscene {
154154 }
155155
156156 if (curLine .callback != null )
157- dialogueScript .call (curLine .callback , [playFirst ]);
157+ dialogueScript .call (curLine .callback , [event . playFirst ]);
158158
159159 for (k => c in charMap )
160160 if (k != curLine .char )
@@ -167,8 +167,8 @@ class DialogueCutscene extends Cutscene {
167167 dialogueBox .popupChar (char , force );
168168 }
169169
170- var finalSuffix : String = playFirst && dialogueBox .hasAnimation (curLine .bubble + " -firstOpen" ) ? " -firstOpen" : dialogueBox .hasAnimation (curLine .bubble + " -open" ) ? " -open" : " " ;
171- dialogueBox .playBubbleAnim (curLine .bubble , finalSuffix , curLine .text , curLine .format , curLine .speed , curLine .nextSound , curLine .textSound != null ? [curLine .textSound ] : null , finalSuffix == " -firstOpen" || finalSuffix == " -open" , ! playFirst );
170+ var finalSuffix : String = event . playFirst && dialogueBox .hasAnimation (curLine .bubble + " -firstOpen" ) ? " -firstOpen" : dialogueBox .hasAnimation (curLine .bubble + " -open" ) ? " -open" : " " ;
171+ dialogueBox .playBubbleAnim (curLine .bubble , finalSuffix , curLine .text , curLine .format , curLine .speed , curLine .nextSound , curLine .textSound != null ? [curLine .textSound ] : null , finalSuffix == " -firstOpen" || finalSuffix == " -open" , ! event . playFirst );
172172
173173 if (curLine .playSound != null ) curLine .playSound .play ();
174174 if (curLine .changeMusic != null ) {
@@ -178,7 +178,7 @@ class DialogueCutscene extends Cutscene {
178178 curMusic .fadeIn (1 , 0 , curMusic .volume );
179179 } else if (curLine .musicVolume != null && curMusic != null ) curMusic .volume = curLine .musicVolume ;
180180
181- dialogueScript .call (" postNext" , [playFirst ]);
181+ dialogueScript .call (" postNext" , [event ]);
182182 }
183183
184184 public override function close () {
0 commit comments