From 47c6d08f53e09d7ee7528e50b7fe0d3f75a9d267 Mon Sep 17 00:00:00 2001
From: vaporvee <yannik@vaporvee.com>
Date: Sun, 12 Feb 2023 10:44:23 +0100
Subject: [PATCH] improved typewriter and cleaned dialogue code

---
 scenes/gui/dialog_bubble.tscn                 |   6 +-
 .../dialogue-system/dialog_bubble.cs          | 262 +++++++++---------
 2 files changed, 138 insertions(+), 130 deletions(-)

diff --git a/scenes/gui/dialog_bubble.tscn b/scenes/gui/dialog_bubble.tscn
index 3a51240..b7d45bb 100644
--- a/scenes/gui/dialog_bubble.tscn
+++ b/scenes/gui/dialog_bubble.tscn
@@ -11,9 +11,7 @@ script = ExtResource("1_xtj1q")
 metadata/_edit_use_anchors_ = true
 
 [node name="typewriter_timer" type="Timer" parent="."]
-wait_time = 0.04
-one_shot = true
-metadata/charsAtOnce = 60
+wait_time = 0.05
 
 [node name="box" type="ColorRect" parent="."]
 anchors_preset = -1
@@ -102,3 +100,5 @@ theme_override_constants/margin_top = 30
 theme_override_constants/margin_right = 60
 theme_override_constants/margin_bottom = 30
 metadata/_edit_lock_ = true
+
+[connection signal="timeout" from="typewriter_timer" to="." method="OnTypewriterTimerTimeout"]
diff --git a/src/scene-scripts/dialogue-system/dialog_bubble.cs b/src/scene-scripts/dialogue-system/dialog_bubble.cs
index 25948a1..bf51b29 100644
--- a/src/scene-scripts/dialogue-system/dialog_bubble.cs
+++ b/src/scene-scripts/dialogue-system/dialog_bubble.cs
@@ -1,146 +1,154 @@
 using Godot;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 public partial class dialog_bubble : CanvasLayer
 {
-    public Variant parsedDlg;
-    public Variant dlgLines;
-    public int dlgPointer = 0;
-    public RichTextLabel richText;
-    public string name;
-    public Area2D triggerArea;
+	public Variant parsedDlg;
+	public Variant dlgLines;
+	public int dlgPointer = 0;
+	public RichTextLabel richText;
+	public Timer typewriterTimer;
+	public string name;
+	public Area2D triggerArea;
 
-    /*TODO: 
+	/*TODO: 
     - Dont repeat the same randomized dialogue after you get asked do you need something "else"
     - add tree support (example: "story" key)
     - ability to add dialogue begin answers on the fly (special ones are colored)
     they will be in a dictionary with event IDs or Dictionary keys it also needs an array wich ones are active*/
-    public override void _Ready()
-    {
-        richText = GetNode<RichTextLabel>("box/rich_text_label");
-    }
-    public void GetDialog(string file, string title, Area2D actor, string playerName, bool introducedVillager)
-    {
-        triggerArea = actor;
-        name = title;
+	public override void _Ready()
+	{
+		richText = GetNode<RichTextLabel>("box/rich_text_label");
+		typewriterTimer = GetNode<Timer>("typewriter_timer");
+	}
+	public void GetDialog(string file, string title, Area2D actor, string playerName, bool introducedVillager)
+	{
+		triggerArea = actor;
+		name = title;
 
-        parsedDlg = Json.ParseString(FileAccess.Open(file, FileAccess.ModeFlags.Read).GetAsText()
-        .Replace("{player}", "[color=cyan]" + playerName + "[/color]").Replace("{title}", "[color=purple]" + title + "[/color]"));
+		parsedDlg = Json.ParseString(FileAccess.Open(file, FileAccess.ModeFlags.Read).GetAsText()
+		.Replace("{player}", "[color=cyan]" + playerName + "[/color]").Replace("{title}", "[color=purple]" + title + "[/color]"));
 
-        if (parsedDlg.AsGodotDictionary()["dialogType"].AsString() != "villager" || introducedVillager)
-            GetNode<Label>("box/name_label").Text = title;
-        if (GetParent().Name == "player") GetParent<player>().allowMovement = false;
+		if (parsedDlg.AsGodotDictionary()["dialogType"].AsString() != "villager" || introducedVillager)
+			GetNode<Label>("box/name_label").Text = title;
+		if (GetParent().Name == "player") GetParent<player>().allowMovement = false;
 
-        //Get first key
-        if (parsedDlg.AsGodotDictionary()["dialogType"].AsString() == "villager")
-            if (introducedVillager)
-                GatherDialog("welcome");
-            else
-                GatherDialog("intro");
+		//Get first key
+		if (parsedDlg.AsGodotDictionary()["dialogType"].AsString() == "villager")
+			if (introducedVillager)
+				GatherDialog("welcome");
+			else
+				GatherDialog("intro");
 
-        else if (parsedDlg.AsGodotDictionary()["dialogType"].AsString() == "message")
-            GatherDialog("message");
+		else if (parsedDlg.AsGodotDictionary()["dialogType"].AsString() == "message")
+			GatherDialog("message");
 
-        Visible = true;
-    }
+		Visible = true;
+	}
 
-    public void GatherDialog(string key)
-    {
-        dlgPointer = 0;
-        dlgLines = parsedDlg.AsGodotDictionary()[key].AsGodotArray();
-        dlgLines = dlgLines.AsGodotArray()[GD.RandRange(0, dlgLines.AsGodotArray().Count - 1)];
-        //TODO:copy a clean default array and remove already used indexes and copy from clean array when its empty
-    }
+	public void GatherDialog(string key)
+	{
+		dlgPointer = 0;
+		dlgLines = parsedDlg.AsGodotDictionary()[key].AsGodotArray();
+		dlgLines = dlgLines.AsGodotArray()[GD.RandRange(0, dlgLines.AsGodotArray().Count - 1)];
+		//TODO:copy a clean default array and remove already used indexes and copy from clean array when its empty
+	}
 
-    public void CloseDialog()
-    {
-        Visible = false;
-        dlgPointer = 0;
-        richText.VisibleCharacters = -1;
-        GetNode<Label>("box/name_label").Text = "???";
-        richText.Text = "";
-        if (GetParent().Name == "player") GetParent<player>().allowMovement = true;
-    }
-    public override void _Process(double delta)
-    {
-        if (Input.IsActionJustPressed("ui_cancel") && Visible) richText.VisibleCharacters = richText.Text.Length;
+	public override void _Process(double delta)
+	{
+		DialogControlls();
+		AnswerBoxControlls();
+	}
+	public void DialogControlls()
+	{
+		if (Input.IsActionJustPressed("ui_cancel") && Visible) richText.VisibleCharacters = richText.Text.Length;
 
-        if (Input.IsActionJustPressed("ui_accept") && Visible && GetNode<PanelContainer>("box/panel_container").Visible == false
-        && richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length <= richText.VisibleCharacters)
-        {
-            if (dlgPointer < dlgLines.AsGodotArray().Count)
-            {
-                //read and write the dialogue
-                if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.Float)
-                    InDialogEvents((int)dlgLines.AsGodotArray()[dlgPointer]);
-                else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.String && !dlgLines.AsGodotArray()[dlgPointer].AsString().StartsWith("<goto:>"))
-                    UpdateDialog();
-                else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.String && dlgLines.AsGodotArray()[dlgPointer].AsString().StartsWith("<goto:>"))
-                {
-                    GatherDialog(dlgLines.AsGodotArray()[dlgPointer].AsString().Replace("<goto:>", ""));
-                    UpdateDialog();
-                }
-                else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.Dictionary)
-                    MakeAnswerBox(Json.ParseString(dlgLines.AsGodotArray()[dlgPointer].AsGodotDictionary().Keys.ToString()).AsStringArray());
-            }
-            dlgPointer++;
-        }
-        //Typewrite effect
-        if (richText.VisibleCharacters < Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length && GetNode<Timer>("typewriter_timer").IsStopped())
-        {
-            richText.VisibleCharacters++;
-            GetNode<Timer>("typewriter_timer").Start();
-        }
-
-        if (dlgPointer > dlgLines.AsGodotArray().Count)
-            CloseDialog();
-
-        //AnswerBox answer "logic"
-        if (GetNode<PanelContainer>("box/panel_container").Visible == true
-        && GetNode("box/panel_container/margin_container").GetChild(0).GetChild<Button>(0).ButtonGroup.GetPressedButton() != null)
-        {
-            var answer = dlgLines.AsGodotArray()[dlgPointer - 1].AsGodotDictionary()[GetNode<Button>(GetNode("box/panel_container/margin_container")
-            .GetChild(0).GetChild<Button>(0).ButtonGroup.GetPressedButton().GetPath()).Text];
-            GetNode<PanelContainer>("box/panel_container").Visible = false;
-            if (answer.VariantType == Variant.Type.String && answer.AsString().StartsWith("<goto:>"))
-            {
-                GatherDialog(answer.AsString().Replace("<goto:>", ""));
-                UpdateDialog();
-            }
-            dlgPointer++;
-        }
-    }
-    public void UpdateDialog()
-    {
-        richText.Text = dlgLines.AsGodotArray()[dlgPointer].ToString();
-        richText.VisibleCharacters = 0;
-        GetNode<Timer>("typewriter_timer").Start();
-    }
-    public void MakeAnswerBox(string[] dialogOptions)
-    {
-        var parent = GetNode("box/panel_container/margin_container");
-        if (parent.GetChildCount() == 1) parent.GetChild(0).Free();
-        parent.AddChild(new VBoxContainer());
-        parent = parent.GetChild(0);
-        for (int i = 0; parent.GetChildCount() < dialogOptions.Length; i++)
-        {
-            parent.AddChild(GD.Load<PackedScene>("res://scenes/gui/dlg_answer_button.tscn").Instantiate());
-            if (dialogOptions[i].StartsWith("<!>")) parent.GetChild<Button>(i).Disabled = true;
-            parent.GetChild<Button>(i).Text = dialogOptions[i].Replace("<!>", "");
-        }
-        GetNode<PanelContainer>("box/panel_container").Visible = true;
-        parent.GetChild<Button>(0).GrabFocus();
-    }
-    public void InDialogEvents(int eventID) //maybe replaceable with jsonrpc?
-    {
-        switch (eventID)
-        {
-            case 0:
-                GetNode<Label>("box/name_label").Text = name;
-                triggerArea.Set("introducedVillager", true);
-                GatherDialog("begindialog");
-                UpdateDialog();
-                break;
-        }
-    }
+		if (Input.IsActionJustPressed("ui_accept") && Visible && GetNode<PanelContainer>("box/panel_container").Visible == false
+		&& richText.VisibleCharacters == -1 | Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length <= richText.VisibleCharacters)
+		{
+			if (dlgPointer < dlgLines.AsGodotArray().Count)
+			{
+				//read and write the dialogue
+				if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.Float)
+					InDialogEvents((int)dlgLines.AsGodotArray()[dlgPointer]);
+				else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.String && !dlgLines.AsGodotArray()[dlgPointer].AsString().StartsWith("<goto:>"))
+					UpdateDialog();
+				else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.String && dlgLines.AsGodotArray()[dlgPointer].AsString().StartsWith("<goto:>"))
+				{
+					GatherDialog(dlgLines.AsGodotArray()[dlgPointer].AsString().Replace("<goto:>", ""));
+					UpdateDialog();
+				}
+				else if (dlgLines.AsGodotArray()[dlgPointer].VariantType == Variant.Type.Dictionary)
+					MakeAnswerBox(Json.ParseString(dlgLines.AsGodotArray()[dlgPointer].AsGodotDictionary().Keys.ToString()).AsStringArray());
+			}
+			dlgPointer++;
+		}
+		if (dlgPointer > dlgLines.AsGodotArray().Count)
+			CloseDialog();
+	}
+	public void UpdateDialog()
+	{
+		richText.Text = dlgLines.AsGodotArray()[dlgPointer].ToString();
+		richText.VisibleCharacters = 0;
+		typewriterTimer.Start();
+	}
+	public void OnTypewriterTimerTimeout()
+	{
+		if (richText.VisibleCharacters < Regex.Replace(richText.Text, @"\[[^]]+\]", "").Length)
+			richText.VisibleCharacters++;
+		else typewriterTimer.Stop();
+	}
+	public void MakeAnswerBox(string[] dialogOptions)
+	{
+		var parent = GetNode("box/panel_container/margin_container");
+		if (parent.GetChildCount() == 1) parent.GetChild(0).Free();
+		parent.AddChild(new VBoxContainer());
+		parent = parent.GetChild(0);
+		for (int i = 0; parent.GetChildCount() < dialogOptions.Length; i++)
+		{
+			parent.AddChild(GD.Load<PackedScene>("res://scenes/gui/dlg_answer_button.tscn").Instantiate());
+			if (dialogOptions[i].StartsWith("<!>")) parent.GetChild<Button>(i).Disabled = true;
+			parent.GetChild<Button>(i).Text = dialogOptions[i].Replace("<!>", "");
+		}
+		GetNode<PanelContainer>("box/panel_container").Visible = true;
+		parent.GetChild<Button>(0).GrabFocus();
+	}
+	public void AnswerBoxControlls()
+	{
+		if (GetNode<PanelContainer>("box/panel_container").Visible == true
+		&& GetNode("box/panel_container/margin_container").GetChild(0).GetChild<Button>(0).ButtonGroup.GetPressedButton() != null)
+		{
+			var answer = dlgLines.AsGodotArray()[dlgPointer - 1].AsGodotDictionary()[GetNode<Button>(GetNode("box/panel_container/margin_container")
+			.GetChild(0).GetChild<Button>(0).ButtonGroup.GetPressedButton().GetPath()).Text];
+			GetNode<PanelContainer>("box/panel_container").Visible = false;
+			if (answer.VariantType == Variant.Type.String && answer.AsString().StartsWith("<goto:>"))
+			{
+				GatherDialog(answer.AsString().Replace("<goto:>", ""));
+				UpdateDialog();
+			}
+			dlgPointer++;
+		}
+	}
+	public void InDialogEvents(int eventID) //maybe replaceable with jsonrpc?
+	{
+		switch (eventID)
+		{
+			case 0:
+				GetNode<Label>("box/name_label").Text = name;
+				triggerArea.Set("introducedVillager", true);
+				GatherDialog("begindialog");
+				UpdateDialog();
+				break;
+		}
+	}
+	public void CloseDialog()
+	{
+		Visible = false;
+		dlgPointer = 0;
+		richText.VisibleCharacters = -1;
+		GetNode<Label>("box/name_label").Text = "???";
+		richText.Text = "";
+		if (GetParent().Name == "player") GetParent<player>().allowMovement = true;
+	}
 }
\ No newline at end of file