From 71cbf9661812894c7388f38f65e2ab51a139bf5b Mon Sep 17 00:00:00 2001
From: Exobyt <exobyt@nexobyt.de>
Date: Tue, 20 Aug 2024 14:53:58 +0200
Subject: [PATCH] Move Time Label

---
 scenes/Grid/camera_2d.gd |  4 ++--
 scenes/Grid/grid.gd      |  2 +-
 scenes/Grid/grid.tscn    | 42 +++++++++++++++-------------------------
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/scenes/Grid/camera_2d.gd b/scenes/Grid/camera_2d.gd
index 1b84783..657391d 100644
--- a/scenes/Grid/camera_2d.gd
+++ b/scenes/Grid/camera_2d.gd
@@ -1,7 +1,7 @@
 extends Camera2D
 
-@onready var scoreLabel = $CanvasLayer/Control/HBoxContainer/ScoreValue
-@onready var timeLabel = $CanvasLayer/Control/HBoxContainer2/TimeValue
+@onready var scoreLabel = $CanvasLayer/Control/VBoxContainer/HBoxContainer/ScoreValue
+@onready var timeLabel = $CanvasLayer/Control/VBoxContainer/HBoxContainer2/TimeValue
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
diff --git a/scenes/Grid/grid.gd b/scenes/Grid/grid.gd
index 5f8438b..410da87 100644
--- a/scenes/Grid/grid.gd
+++ b/scenes/Grid/grid.gd
@@ -155,7 +155,7 @@ func PlacePattern():
 	patternsArray.pop_at(0)
 	for child in patterns.get_children():
 		child.queue_free()
-	if patternsArray.size() <= 1:
+	if patternsArray.size() <= 2:
 		getNewPatterns()
 	currentPattern = patternsArray[0]
 	patterns.add_child(currentPattern)
diff --git a/scenes/Grid/grid.tscn b/scenes/Grid/grid.tscn
index 3dfa540..0f5ea6e 100644
--- a/scenes/Grid/grid.tscn
+++ b/scenes/Grid/grid.tscn
@@ -154,54 +154,44 @@ script = ExtResource("6_mbeib")
 
 [node name="Control" type="Control" parent="Camera2D/CanvasLayer"]
 layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
+anchors_preset = 0
 theme = ExtResource("7_38u5s")
 script = ExtResource("8_4bfjb")
 
-[node name="HBoxContainer" type="HBoxContainer" parent="Camera2D/CanvasLayer/Control"]
+[node name="VBoxContainer" type="VBoxContainer" parent="Camera2D/CanvasLayer/Control"]
 layout_mode = 1
-offset_left = 56.0
+offset_left = 64.0
 offset_top = 64.0
-offset_right = 320.0
-offset_bottom = 152.0
+offset_right = 274.0
+offset_bottom = 244.0
 
-[node name="Score" type="Label" parent="Camera2D/CanvasLayer/Control/HBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="Camera2D/CanvasLayer/Control/VBoxContainer"]
+layout_mode = 2
+
+[node name="Score" type="Label" parent="Camera2D/CanvasLayer/Control/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 text = "Score: "
 label_settings = ExtResource("9_i2h5u")
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="ScoreValue" type="Label" parent="Camera2D/CanvasLayer/Control/HBoxContainer"]
+[node name="ScoreValue" type="Label" parent="Camera2D/CanvasLayer/Control/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 label_settings = ExtResource("9_i2h5u")
 horizontal_alignment = 1
 
-[node name="HBoxContainer2" type="HBoxContainer" parent="Camera2D/CanvasLayer/Control"]
-layout_mode = 1
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -312.0
-offset_top = 64.0
-offset_right = -56.0
-offset_bottom = 152.0
-grow_horizontal = 0
-alignment = 2
-
-[node name="TimeValue" type="Label" parent="Camera2D/CanvasLayer/Control/HBoxContainer2"]
+[node name="HBoxContainer2" type="HBoxContainer" parent="Camera2D/CanvasLayer/Control/VBoxContainer"]
 layout_mode = 2
+
+[node name="Time" type="Label" parent="Camera2D/CanvasLayer/Control/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+text = "Time:"
 label_settings = ExtResource("9_i2h5u")
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="Time" type="Label" parent="Camera2D/CanvasLayer/Control/HBoxContainer2"]
+[node name="TimeValue" type="Label" parent="Camera2D/CanvasLayer/Control/VBoxContainer/HBoxContainer2"]
 layout_mode = 2
-text = " :Time"
 label_settings = ExtResource("9_i2h5u")
 horizontal_alignment = 1
 vertical_alignment = 1