From ac3e2ffd62e739f67c20e36c61d3e6734ae1603a Mon Sep 17 00:00:00 2001
From: Evgenij Titarenko <frundle@teasanctuary.ru>
Date: Sun, 25 Aug 2024 09:34:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=20=D0=98?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B2=20=D0=BF=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=B4=D0=B5=D0=BD=D1=8C,=20=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=87?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prefabs/Player.tscn         | 18 ++----------------
 project.godot               |  2 +-
 scenes/Day1.tscn            |  2 ++
 scripts/ChatLogContainer.cs |  1 -
 scripts/Player.cs           |  1 +
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/prefabs/Player.tscn b/prefabs/Player.tscn
index cebb758..5a2288c 100644
--- a/prefabs/Player.tscn
+++ b/prefabs/Player.tscn
@@ -125,7 +125,6 @@ offset_bottom = 75.0
 clip_contents = true
 layout_mode = 0
 offset_right = 100.0
-offset_bottom = 220.0
 theme_override_styles/panel = SubResource("StyleBoxFlat_5af0i")
 
 [node name="ChatLogContainer" type="VBoxContainer" parent="Camera2D/Control/Control/PanelContainer2"]
@@ -134,24 +133,11 @@ theme_override_constants/separation = 0
 script = ExtResource("4_tbl72")
 
 [node name="PlaceholderDialog" parent="Camera2D/Control/Control/PanelContainer2/ChatLogContainer" instance=ExtResource("4_owmws")]
+visible = false
 layout_mode = 2
 
 [node name="PlaceholderDialog2" parent="Camera2D/Control/Control/PanelContainer2/ChatLogContainer" instance=ExtResource("4_owmws")]
-layout_mode = 2
-Text = "Placeholder text 2"
-Author = "NPC name 2"
-
-[node name="PlaceholderDialog3" parent="Camera2D/Control/Control/PanelContainer2/ChatLogContainer" instance=ExtResource("4_owmws")]
-layout_mode = 2
-Text = "Placeholder text 2"
-Author = "NPC name 2"
-
-[node name="PlaceholderDialog4" parent="Camera2D/Control/Control/PanelContainer2/ChatLogContainer" instance=ExtResource("4_owmws")]
-layout_mode = 2
-Text = "Placeholder text 2"
-Author = "NPC name 2"
-
-[node name="PlaceholderDialog5" parent="Camera2D/Control/Control/PanelContainer2/ChatLogContainer" instance=ExtResource("4_owmws")]
+visible = false
 layout_mode = 2
 Text = "Placeholder text 2"
 Author = "NPC name 2"
diff --git a/project.godot b/project.godot
index 6f0dbe1..58c0ac5 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="chill-jam-10"
-run/main_scene="res://scenes/test.tscn"
+run/main_scene="res://scenes/Day1.tscn"
 config/features=PackedStringArray("4.3", "C#", "GL Compatibility")
 config/icon="res://icon.svg"
 
diff --git a/scenes/Day1.tscn b/scenes/Day1.tscn
index 62bcf73..28e78be 100644
--- a/scenes/Day1.tscn
+++ b/scenes/Day1.tscn
@@ -192,6 +192,8 @@ Frames = ExtResource("6_vd74o")
 position = Vector2(1307, 254)
 NPCName = "Ivan"
 Frames = ExtResource("7_j5wfn")
+DefaultDialogLine = "New day new joke"
+DialogLines = ["Do you want to hear a joke?", "Two inmates are sitting in the cell.", "And one asks another:", "\"How did you get here?\"", "\"I opened a window on a work\"", "\"BS they don't jail people for that!", "Where did you work?\"", "\"I work on the submarine\"", "HAHAHA HA", "Nevermind. Get to the sonar room.", "Eugene want to see you."]
 
 [node name="Eugene" parent="NPCs" instance=ExtResource("3_t4e54")]
 position = Vector2(1326, 14)
diff --git a/scripts/ChatLogContainer.cs b/scripts/ChatLogContainer.cs
index ee534b6..3d8b832 100644
--- a/scripts/ChatLogContainer.cs
+++ b/scripts/ChatLogContainer.cs
@@ -33,7 +33,6 @@ public partial class ChatLogContainer : VBoxContainer
 	}
 
 	private const float MaxChatLogContainerSize = 200;
-
 	private Vector2 _initialPosition;
 
 	// Called when the node enters the scene tree for the first time.
diff --git a/scripts/Player.cs b/scripts/Player.cs
index 65033a8..cc1fb83 100644
--- a/scripts/Player.cs
+++ b/scripts/Player.cs
@@ -214,6 +214,7 @@ public partial class Player : CharacterBody2D
 					msg.Text = npc.Message;
 					msg.Author = npc.NPCName;
 					_chatLogContainer.AddChild(msg);
+					_chatLogContainer.CurrentState = ChatLogContainer.ChatState.Default;
 					if (npc.IsDialogEnded) CurrentState = State.ReadChat;
 				}