From 8132530da37744064cfee5dad5b3e107cdb0731e Mon Sep 17 00:00:00 2001
From: cmod31 <yannik@vaporvee.com>
Date: Fri, 24 Feb 2023 14:50:57 +0100
Subject: [PATCH] fixed buggy dialogue on visible console

---
 src/scene-scripts/console/console.cs               | 6 +++---
 src/scene-scripts/dialogue-system/dialog_bubble.cs | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/scene-scripts/console/console.cs b/src/scene-scripts/console/console.cs
index dd75376..b63eb41 100644
--- a/src/scene-scripts/console/console.cs
+++ b/src/scene-scripts/console/console.cs
@@ -6,7 +6,7 @@ public partial class console : PopupPanel
     private static RichTextLabel textblock;
     private LineEdit line;
     private Dictionary commandDict;
-    private string error = "Not found! :(\n";
+    private string error = "Not found! :(";
 
     //functions with capital letters can't be used inside the console
     public override void _Ready()
@@ -21,13 +21,13 @@ public partial class console : PopupPanel
         if (Input.IsActionJustPressed("console"))
         {
             Visible = !Visible;
-            line.GrabFocus();
             player.allowMovement = !Visible;
+            line.GrabFocus();
         }
         /*if (OS.ReadStringFromStdIn() != "") //not tested yet
             OnLineEditTextSubmitted(OS.ReadStringFromStdIn());*/
     }
-    private void OnPopupHide() => player.allowMovement = true;
+    private void OnPopupHide() { if (dialog_bubble.isTalking == false) player.allowMovement = true; }
     private void OnLineEditTextSubmitted(string command)
     {
         line.Clear();
diff --git a/src/scene-scripts/dialogue-system/dialog_bubble.cs b/src/scene-scripts/dialogue-system/dialog_bubble.cs
index 9425c86..f855168 100644
--- a/src/scene-scripts/dialogue-system/dialog_bubble.cs
+++ b/src/scene-scripts/dialogue-system/dialog_bubble.cs
@@ -11,6 +11,7 @@ public partial class dialog_bubble : CanvasLayer
     public string title;
     public Area2D triggerArea;
     public static bool forceClose;
+    public static bool isTalking;
     /*TODO: 
     - Dont repeat the same randomized dialogue after you get asked do you need something "else"
     - add tree support (example: "story" key)
@@ -48,6 +49,7 @@ public partial class dialog_bubble : CanvasLayer
             GatherDialog("message");
 
         Visible = true;
+        isTalking = true;
     }
     public void GatherDialog(string key)
     {
@@ -162,6 +164,7 @@ public partial class dialog_bubble : CanvasLayer
         GetNode<Label>("box/name_label").Text = "???";
         richText.Text = "";
         if (GetParent().Name == "player") player.allowMovement = true;
+        isTalking = false;
         forceClose = false;
     }
 }
\ No newline at end of file