From 30bc16bf6b65217072e75ceeba761297984a4848 Mon Sep 17 00:00:00 2001 From: cmod31 Date: Sat, 4 Feb 2023 22:21:59 +0100 Subject: [PATCH] added dialogue skip functionality --- src/scene-scripts/dialogue-system/dialog_bubble.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/scene-scripts/dialogue-system/dialog_bubble.cs b/src/scene-scripts/dialogue-system/dialog_bubble.cs index a70cd15..44a8f41 100644 --- a/src/scene-scripts/dialogue-system/dialog_bubble.cs +++ b/src/scene-scripts/dialogue-system/dialog_bubble.cs @@ -50,7 +50,8 @@ public partial class dialog_bubble : CanvasLayer richText.VisibleCharacters++; GetNode("typewriter_timer").Start(); } - if (Input.IsActionJustPressed("ui_accept") && Visible == true && richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length == richText.VisibleCharacters) + if (Input.IsActionJustPressed("ui_cancel") && Visible) richText.VisibleCharacters = richText.Text.Length; + if (Input.IsActionJustPressed("ui_accept") && Visible && richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length <= richText.VisibleCharacters) { if (dlgPointer < dlgLines.Count && dlgLines[dlgPointer] is string) { @@ -64,7 +65,7 @@ public partial class dialog_bubble : CanvasLayer CloseDialog(); //AnswerBox wait for typewrite effect to finish (garbage code) - GetNode("box/panel_container").Visible = richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length == richText.VisibleCharacters && GetNode("box/panel_container/margin_container/v_box_container").GetChildCount() == dialogOptionsLength; + GetNode("box/panel_container").Visible = richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length <= richText.VisibleCharacters && GetNode("box/panel_container/margin_container/v_box_container").GetChildCount() == dialogOptionsLength; } public void MakeAnswerBox(string[] dialogOptions) {