From 9616c1f0d1aca6ae4313c57cd66f008156fce7cd Mon Sep 17 00:00:00 2001
From: vaporvee <yannik@vaporvee.com>
Date: Sat, 17 Dec 2022 22:26:18 +0100
Subject: [PATCH] added multiline text support and more code changes

---
 dialog/npcs/villager_normal.json         | 23 +++++++++----
 scenes/tiles/dialogdebug_cupcake.tscn    |  1 -
 src/scene-scripts/dialog_trigger_area.cs |  4 +--
 src/scene-scripts/gui/dialog_bubble.cs   | 42 ++++++++++++++----------
 4 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/dialog/npcs/villager_normal.json b/dialog/npcs/villager_normal.json
index a144481..ea116b2 100644
--- a/dialog/npcs/villager_normal.json
+++ b/dialog/npcs/villager_normal.json
@@ -1,4 +1,6 @@
 {
+	"dialogTitle": "Debug Character",
+	"dialogType": "villager",
 	"randomWelcomeText":[
 		"Oh hello, {0}... You look great! What do you want from me?",
 		"Hey, {0}! Hope you have fun today!",
@@ -8,14 +10,12 @@
 		"Was nice talking to you goodbye!",
 		"Have a great day, {0}!"
 	],
-	"multiDebugTipp00":[
+	"multiTipp0":[
 		"You can walk arround with WASD on PC.",
-		"You can also use your joystick and D-Pad, if",
-		"you have a controller.",
-		"You can interact with cupcakes and",
-		"use the buggy placeholder clouds as a football."
+		"You can also use your joystick and D-Pad, if you have a controller.",
+		"You can interact with cupcakes and use the buggy placeholder clouds as a football."
 	],
-	"multiDebugTipp01":[
+	"multiTipp1":[
 		"Lorem ipsum dolor sit amet, consetetur sadipscing elitr,",
 		"sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,",
 		"sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.",
@@ -25,5 +25,16 @@
 				"Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
 				]
 		}
+	],
+	"multiDebugTipp2":[
+		"test1test1test1test1test1test1test1test1test1test1test1test1test1test1test1",
+		"test2test2test2test2test2test2test2test2test2test2test2test2test2test2test2",
+		"test3test3test3test3test3test3test3test3test3test3test3test3test3test3test3",
+		"So do you want to do xy for me?",
+		{
+			"Okay I'm doing that":[
+				"Good nice thank you!"
+				]
+		}
 	]
 }
\ No newline at end of file
diff --git a/scenes/tiles/dialogdebug_cupcake.tscn b/scenes/tiles/dialogdebug_cupcake.tscn
index 1d898c2..b34713b 100644
--- a/scenes/tiles/dialogdebug_cupcake.tscn
+++ b/scenes/tiles/dialogdebug_cupcake.tscn
@@ -19,7 +19,6 @@ shape = SubResource("RectangleShape2D_pchpi")
 
 [node name="dialog_trigger_area" parent="." instance=ExtResource("2_blpmd")]
 dialogFile = "res://dialog/npcs/villager_normal.json"
-dialogTitle = "Talking Cupcake"
 
 [node name="collision_shape_2d" parent="dialog_trigger_area" index="0"]
 shape = SubResource("RectangleShape2D_d78tr")
diff --git a/src/scene-scripts/dialog_trigger_area.cs b/src/scene-scripts/dialog_trigger_area.cs
index fc81323..c00e815 100644
--- a/src/scene-scripts/dialog_trigger_area.cs
+++ b/src/scene-scripts/dialog_trigger_area.cs
@@ -5,10 +5,8 @@ public partial class dialog_trigger_area : Area2D
 {
     [Export(PropertyHint.File, "*json")]
     string dialogFile;
-    [Export]
-    string dialogTitle;
     public void OnInteraction(string playerName)
     {
-        GetNode("/root/main/dialog_bubble").Call("ImportString",dialogTitle,dialogFile,playerName);
+        GetNode("/root/main/dialog_bubble").Call("ImportString",dialogFile,playerName);
     }
 }
diff --git a/src/scene-scripts/gui/dialog_bubble.cs b/src/scene-scripts/gui/dialog_bubble.cs
index 30a3517..41e7e19 100644
--- a/src/scene-scripts/gui/dialog_bubble.cs
+++ b/src/scene-scripts/gui/dialog_bubble.cs
@@ -6,32 +6,26 @@ using System.Collections.Generic;
 
 public partial class dialog_bubble : CanvasLayer
 {
+    public Dictionary allDialog;
     public List<string> currentDialogList = new List<string>();
+    public string currentKey;
     public string currentDialogLine;
     public int dialogCounter;
     public string userName;
-    public void ImportString(string dialogTitle, string dialogFile, string playerName)
+    public void ImportString(string dialogFile, string playerName)
     {
         userName = playerName;
-        GetNode<Label>("NameLabel").Text = dialogTitle;
-        GD.Print("test");
-        GetNode("/root/main/player").Call("ChangeProcess",false);
-        string currentKey = "randomWelcomeText";
+        GetNode("/root/main/player").Call("ChangeProcess", false);
+        currentKey = "multiTipp0";//2 is a selection menu needs to be planned before coding
         using var file = FileAccess.Open(dialogFile, FileAccess.ModeFlags.Read);
         string text = file.GetAsText();
-        var jsonFile = JSON.ParseString(text);
-        Dictionary allDialog = (Dictionary)jsonFile;
+        allDialog = (Dictionary)JSON.ParseString(text);
+        GetNode<Label>("NameLabel").Text = allDialog["dialogTitle"].ToString();
+        addText();
+
 
         //Todo: add multiline text and actual running dialog. And go through string for other dictionaries wich always will be playeranswers
 
-        if (currentKey.StartsWith("random"))
-        {
-            string[] dialogRand = allDialog[currentKey].AsStringArray();
-            currentDialogList.Add(dialogRand[GD.Randi() % dialogRand.Length]);
-            currentDialogList.Add("Test!");
-        }
-        else currentDialogList.Add(allDialog[currentKey].AsString());
-
     }
     public void EndDialog()
     {
@@ -40,6 +34,19 @@ public partial class dialog_bubble : CanvasLayer
         Visible = false;
         GetNode("/root/main/player").Call("ChangeProcess", true);
     }
+    public void addText()
+    {
+        if (currentKey.StartsWith("random"))
+        {
+            string[] dialogRand = allDialog[currentKey].AsStringArray();
+            currentDialogList.Add(dialogRand[GD.Randi() % dialogRand.Length]);
+        }
+        if (currentKey.StartsWith("multi"))
+        {
+            string[] dialogMulti = allDialog[currentKey].AsStringArray();
+            currentDialogList.AddRange(dialogMulti);
+        }
+    }
     public override void _Process(double delta)
     {
         if (Input.IsActionJustPressed("ui_accept"))
@@ -52,9 +59,8 @@ public partial class dialog_bubble : CanvasLayer
                 currentDialogLine = String.Format(currentDialogLine, userName);
                 GetNode<Label>("TextLabel").Text = currentDialogLine;
             }
-            else GD.Print("No valid dialog available");
+            if (dialogCounter > currentDialogList.Count)
+                EndDialog();
         }
-        if(dialogCounter > currentDialogList.Count) 
-            EndDialog();
     }
 }