Update the gardens screen to adapt to the number of lessons. Adds a help label to the login screen for the settings.

This commit is contained in:
Dylan Sarrazyn
2024-10-30 16:39:21 +01:00
parent 824b4696eb
commit 0a8a591dd4
10 changed files with 308 additions and 94 deletions
+223 -58
View File
@@ -1,10 +1,10 @@
[gd_resource type="Resource" script_class="GardensLayout" load_steps=19 format=3]
[gd_resource type="Resource" script_class="GardensLayout" load_steps=23 format=3 uid="uid://c1xe204vu7asa"]
[ext_resource type="Script" path="res://resources/gardens/garden_layout.gd" id="1_gyv0f"]
[ext_resource type="Script" path="res://resources/gardens/gardens_layout.gd" id="2_w74ow"]
[ext_resource type="Script" path="res://resources/gardens/garden_layout.gd" id="1_wyhh0"]
[ext_resource type="Script" path="res://resources/gardens/gardens_layout.gd" id="2_0vfv5"]
[sub_resource type="Resource" id="Resource_sb4fa"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_fr4uw"]
script = ExtResource("1_wyhh0")
color = 0
flowers_export = Array[Dictionary]([{
"color": 0,
@@ -42,8 +42,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_vavwh"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_613ra"]
script = ExtResource("1_wyhh0")
color = 1
flowers_export = Array[Dictionary]([{
"color": 1,
@@ -81,8 +81,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_rabgc"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_hx083"]
script = ExtResource("1_wyhh0")
color = 2
flowers_export = Array[Dictionary]([{
"color": 13,
@@ -120,24 +120,24 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_b5yea"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_kpsso"]
script = ExtResource("1_wyhh0")
color = 3
flowers_export = Array[Dictionary]([{
"color": 3,
"position": Vector2i(456, 988),
"position": Vector2i(504, 1216),
"type": 0
}, {
"color": 3,
"position": Vector2i(1152, 820),
"position": Vector2i(800, 436),
"type": 1
}, {
"color": 3,
"position": Vector2i(788, 1476),
"position": Vector2i(920, 1248),
"type": 2
}, {
"color": 3,
"position": Vector2i(1752, 1240),
"position": Vector2i(1780, 1184),
"type": 3
}, {
"color": 3,
@@ -146,10 +146,10 @@ flowers_export = Array[Dictionary]([{
}])
lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(463, 3),
"position": Vector2i(182, 125)
"position": Vector2i(358, 336)
}, {
"path_out_position": Vector2i(-113, 883),
"position": Vector2i(702, 265)
"path_out_position": Vector2i(-94, 576),
"position": Vector2i(994, 164)
}, {
"path_out_position": Vector2i(787, 47),
"position": Vector2i(1129, 1217)
@@ -159,8 +159,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_fa44t"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_wpces"]
script = ExtResource("1_wyhh0")
color = 4
flowers_export = Array[Dictionary]([{
"color": 8,
@@ -190,7 +190,7 @@ lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(248, -256),
"position": Vector2i(862, 165)
}, {
"path_out_position": Vector2i(210, 459),
"path_out_position": Vector2i(-798, 619),
"position": Vector2i(1858, 197)
}, {
"path_out_position": Vector2i(218, -52),
@@ -198,8 +198,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_5h4pi"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_k0mq8"]
script = ExtResource("1_wyhh0")
color = 5
flowers_export = Array[Dictionary]([{
"color": 5,
@@ -237,8 +237,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_0s64a"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_ikqrb"]
script = ExtResource("1_wyhh0")
color = 6
flowers_export = Array[Dictionary]([{
"color": 6,
@@ -262,7 +262,7 @@ flowers_export = Array[Dictionary]([{
"type": 4
}])
lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(459, -69),
"path_out_position": Vector2i(448, -41),
"position": Vector2i(596, 1249)
}, {
"path_out_position": Vector2i(-461, -237),
@@ -276,8 +276,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_s4fet"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_3fweq"]
script = ExtResource("1_wyhh0")
color = 7
flowers_export = Array[Dictionary]([{
"color": 1,
@@ -315,8 +315,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_r4707"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_cafmm"]
script = ExtResource("1_wyhh0")
color = 8
flowers_export = Array[Dictionary]([{
"color": 14,
@@ -328,11 +328,11 @@ flowers_export = Array[Dictionary]([{
"type": 1
}, {
"color": 14,
"position": Vector2i(488, 956),
"position": Vector2i(468, 1032),
"type": 2
}, {
"color": 14,
"position": Vector2i(1604, 484),
"position": Vector2i(1804, 536),
"type": 3
}, {
"color": 14,
@@ -354,8 +354,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_tpy30"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_4s0ts"]
script = ExtResource("1_wyhh0")
color = 9
flowers_export = Array[Dictionary]([{
"color": 9,
@@ -375,7 +375,7 @@ flowers_export = Array[Dictionary]([{
"type": 3
}, {
"color": 9,
"position": Vector2i(1816, 996),
"position": Vector2i(1816, 924),
"type": 4
}])
lesson_buttons_export = Array[Dictionary]([{
@@ -393,8 +393,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_pp244"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_kseol"]
script = ExtResource("1_wyhh0")
color = 10
flowers_export = Array[Dictionary]([{
"color": 10,
@@ -432,8 +432,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_ydxer"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_hrrh3"]
script = ExtResource("1_wyhh0")
color = 11
flowers_export = Array[Dictionary]([{
"color": 18,
@@ -471,8 +471,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_vifpe"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_qrofo"]
script = ExtResource("1_wyhh0")
color = 12
flowers_export = Array[Dictionary]([{
"color": 12,
@@ -510,8 +510,8 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_blfde"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_4w17v"]
script = ExtResource("1_wyhh0")
color = 13
flowers_export = Array[Dictionary]([{
"color": 2,
@@ -531,7 +531,7 @@ flowers_export = Array[Dictionary]([{
"type": 3
}, {
"color": 2,
"position": Vector2i(1508, 1420),
"position": Vector2i(1356, 1500),
"type": 4
}])
lesson_buttons_export = Array[Dictionary]([{
@@ -549,12 +549,12 @@ lesson_buttons_export = Array[Dictionary]([{
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_ar07c"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_34a7r"]
script = ExtResource("1_wyhh0")
color = 14
flowers_export = Array[Dictionary]([{
"color": 5,
"position": Vector2i(364, 696),
"position": Vector2i(376, 716),
"type": 0
}, {
"color": 5,
@@ -562,7 +562,7 @@ flowers_export = Array[Dictionary]([{
"type": 1
}, {
"color": 5,
"position": Vector2i(1332, 1552),
"position": Vector2i(1404, 1536),
"type": 2
}, {
"color": 5,
@@ -583,17 +583,17 @@ lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(79, 475),
"position": Vector2i(166, 817)
}, {
"path_out_position": Vector2i(2608, -837),
"path_out_position": Vector2i(2078, -724),
"position": Vector2i(558, 1324)
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_hkny7"]
script = ExtResource("1_gyv0f")
[sub_resource type="Resource" id="Resource_on6xc"]
script = ExtResource("1_wyhh0")
color = 15
flowers_export = Array[Dictionary]([{
"color": 17,
"position": Vector2i(372, 672),
"position": Vector2i(424, 792),
"type": 0
}, {
"color": 17,
@@ -601,23 +601,188 @@ flowers_export = Array[Dictionary]([{
"type": 1
}, {
"color": 17,
"position": Vector2i(1928, 1380),
"position": Vector2i(1800, 1096),
"type": 2
}, {
"color": 17,
"position": Vector2i(1064, 492),
"position": Vector2i(1124, 512),
"type": 3
}, {
"color": 17,
"position": Vector2i(1588, 552),
"position": Vector2i(1644, 644),
"type": 4
}])
lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(-164, -592),
"position": Vector2i(1062, 1000)
}, {
"path_out_position": Vector2i(802, 20),
"position": Vector2i(450, 36)
}, {
"path_out_position": Vector2i(201, 556),
"position": Vector2i(1214, 508)
}, {
"path_out_position": Vector2i(470, -344),
"position": Vector2i(1698, 1256)
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_jvuuw"]
script = ExtResource("1_wyhh0")
color = 16
flowers_export = Array[Dictionary]([{
"color": 16,
"position": Vector2i(364, 960),
"type": 0
}, {
"color": 16,
"position": Vector2i(1700, 776),
"type": 1
}, {
"color": 16,
"position": Vector2i(1116, 1552),
"type": 2
}, {
"color": 16,
"position": Vector2i(856, 1436),
"type": 1
}, {
"color": 16,
"position": Vector2i(1144, 532),
"type": 4
}])
lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(286, -388),
"position": Vector2i(290, 1172)
}, {
"path_out_position": Vector2i(786, 300),
"position": Vector2i(510, 300)
}, {
"path_out_position": Vector2i(278, -332),
"position": Vector2i(1722, 1356)
}, {
"path_out_position": Vector2i(362, 40),
"position": Vector2i(1962, 572)
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_x50x8"]
script = ExtResource("1_wyhh0")
color = 17
flowers_export = Array[Dictionary]([{
"color": 17,
"position": Vector2i(632, 532),
"type": 0
}, {
"color": 17,
"position": Vector2i(716, 1152),
"type": 1
}, {
"color": 17,
"position": Vector2i(1444, 1472),
"type": 1
}, {
"color": 17,
"position": Vector2i(1364, 1024),
"type": 0
}, {
"color": 17,
"position": Vector2i(1916, 648),
"type": 3
}])
lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(454, -92),
"position": Vector2i(214, 588)
}, {
"path_out_position": Vector2i(246, 72),
"position": Vector2i(1134, 104)
}, {
"path_out_position": Vector2i(430, -24),
"position": Vector2i(790, 1156)
}, {
"path_out_position": Vector2i(970, -508),
"position": Vector2i(1622, 1304)
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_xuyep"]
script = ExtResource("1_wyhh0")
color = 18
flowers_export = Array[Dictionary]([{
"color": 18,
"position": Vector2i(252, 844),
"type": 1
}, {
"color": 18,
"position": Vector2i(1180, 1400),
"type": 3
}, {
"color": 18,
"position": Vector2i(1008, 876),
"type": 2
}, {
"color": 18,
"position": Vector2i(1692, 1160),
"type": 3
}, {
"color": 18,
"position": Vector2i(1692, 504),
"type": 4
}])
lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(114, -284),
"position": Vector2i(382, 544)
}, {
"path_out_position": Vector2i(482, -116),
"position": Vector2i(1162, 116)
}, {
"path_out_position": Vector2i(42, 368),
"position": Vector2i(1938, 156)
}, {
"path_out_position": Vector2i(314, 224),
"position": Vector2i(534, 1296)
}])
is_first_or_last = 1
[sub_resource type="Resource" id="Resource_ectbt"]
script = ExtResource("1_wyhh0")
color = 19
flowers_export = Array[Dictionary]([{
"color": 19,
"position": Vector2i(772, 1568),
"type": 0
}, {
"color": 19,
"position": Vector2i(468, 980),
"type": 1
}, {
"color": 19,
"position": Vector2i(1184, 428),
"type": 2
}, {
"color": 19,
"position": Vector2i(2136, 1152),
"type": 3
}, {
"color": 19,
"position": Vector2i(1192, 952),
"type": 4
}])
lesson_buttons_export = Array[Dictionary]([{
"path_out_position": Vector2i(486, -84),
"position": Vector2i(146, 1080)
}, {
"path_out_position": Vector2i(-790, -664),
"position": Vector2i(1206, 1208)
}, {
"path_out_position": Vector2i(558, -140),
"position": Vector2i(622, 128)
}, {
"path_out_position": Vector2i(0, 0),
"position": Vector2i(1369, 753)
"position": Vector2i(1638, 840)
}])
is_first_or_last = 1
[resource]
script = ExtResource("2_w74ow")
gardens = Array[ExtResource("1_gyv0f")]([SubResource("Resource_sb4fa"), SubResource("Resource_vavwh"), SubResource("Resource_rabgc"), SubResource("Resource_b5yea"), SubResource("Resource_fa44t"), SubResource("Resource_5h4pi"), SubResource("Resource_0s64a"), SubResource("Resource_s4fet"), SubResource("Resource_r4707"), SubResource("Resource_tpy30"), SubResource("Resource_pp244"), SubResource("Resource_ydxer"), SubResource("Resource_vifpe"), SubResource("Resource_blfde"), SubResource("Resource_ar07c"), SubResource("Resource_hkny7")])
script = ExtResource("2_0vfv5")
gardens = Array[ExtResource("1_wyhh0")]([SubResource("Resource_fr4uw"), SubResource("Resource_613ra"), SubResource("Resource_hx083"), SubResource("Resource_kpsso"), SubResource("Resource_wpces"), SubResource("Resource_k0mq8"), SubResource("Resource_ikqrb"), SubResource("Resource_3fweq"), SubResource("Resource_cafmm"), SubResource("Resource_4s0ts"), SubResource("Resource_kseol"), SubResource("Resource_hrrh3"), SubResource("Resource_qrofo"), SubResource("Resource_4w17v"), SubResource("Resource_34a7r"), SubResource("Resource_on6xc"), SubResource("Resource_jvuuw"), SubResource("Resource_x50x8"), SubResource("Resource_xuyep"), SubResource("Resource_ectbt")])
File diff suppressed because one or more lines are too long
+30 -7
View File
@@ -65,11 +65,11 @@ static var transition_data: Dictionary
func _ready() -> void:
get_gardens_db_data()
if not gardens_layout:
gardens_layout = load("res://resources/gardens/gardens_layout.tres")
else:
set_gardens_layout(gardens_layout)
get_gardens_db_data()
set_up_lessons()
await get_tree().process_frame
@@ -171,11 +171,11 @@ func _unlock_new_lesson() -> void:
await last_lesson_button.right()
# Fill in the path towards the next lesson
var curve: = Curve2D.new()
var c: = Curve2D.new()
for i in range(max_lesson-1, max_lesson + 1):
curve.add_point(points[i][0] as Vector2, points[i][1] as Vector2, points[i][2] as Vector2)
c.add_point(points[i][0] as Vector2, points[i][1] as Vector2, points[i][2] as Vector2)
var baked_points: = curve.get_baked_points()
var baked_points: = c.get_baked_points()
# Check if we need to scroll to the next garden
if is_last_lesson_of_garden:
@@ -369,8 +369,11 @@ func _close_minigames_layout() -> void:
func set_up_lessons() -> void:
var lesson_ind: = 1
for garden_ind in garden_parent.get_child_count():
var garden_control: Garden = garden_parent.get_child(garden_ind)
for i in garden_control.lesson_button_controls.size():
if not lesson_ind in lessons:
break
@@ -390,20 +393,40 @@ func set_gardens_layout(p_gardens_layout: GardensLayout) -> void:
func add_gardens() -> void:
if not garden_parent:
return
# Removes old gardens
for child in garden_parent.get_children():
child.free()
# Adds the gardens needed from the layout configuration
var current_lesson_count: int = 0
for garden_layout in gardens_layout.gardens:
var garden: Garden = garden_scene.instantiate()
garden_parent.add_child(garden)
for i in garden_layout.lesson_buttons.size():
if current_lesson_count >= lessons.size():
garden_layout.lesson_buttons.resize(i)
break
current_lesson_count += 1
garden.garden_layout = garden_layout
# Don't add empty gardens
if current_lesson_count >= lessons.size():
break
func set_up_path() -> void:
if not garden_parent:
return
points = []
curve = Curve2D.new()
for i in gardens_layout.gardens.size():
if i >= garden_parent.get_child_count():
break
var garden_layout: GardenLayout = gardens_layout.gardens[i]
var garden_control: Garden = garden_parent.get_child(i)
for b in garden_layout.lesson_buttons:
@@ -478,14 +501,14 @@ func _set_progression() -> void:
garden_control.update_flowers()
# Handles the path
var curve: = Curve2D.new()
var c: = Curve2D.new()
var max_lesson: = UserDataManager.student_progression.get_max_unlocked_lesson()
if not new_lesson_unlocked:
max_lesson += 1
for i in range(max_lesson):
curve.add_point(points[i][0] as Vector2, points[i][1] as Vector2, points[i][2] as Vector2)
unlocked_line.points = curve.get_baked_points()
c.add_point(points[i][0] as Vector2, points[i][1] as Vector2, points[i][2] as Vector2)
unlocked_line.points = c.get_baked_points()
line_particles.position = unlocked_line.points[unlocked_line.points.size()-1]
+4 -4
View File
@@ -1,5 +1,6 @@
extends "res://sources/gardens/gardens.gd"
const max_lesson_number: int = 80
const garden_textures_nb: int = 20
const flower_types_nb: int = 5
const gardens_layout_resource_path: String = "res://resources/gardens/gardens_layout.tres"
@@ -14,7 +15,8 @@ func _ready() -> void:
line_particles.hide()
back_button.hide()
get_gardens_db_data()
for i in max_lesson_number:
lessons[i] = i
# Checks if a configuration exists
if not ResourceLoader.exists(gardens_layout_resource_path):
@@ -23,8 +25,6 @@ func _ready() -> void:
_init_gardens_layout()
gardens_layout = load(gardens_layout_resource_path)
set_up_lessons()
set_up_click_detection()
@@ -32,7 +32,7 @@ func _init_gardens_layout() -> void:
# Empty the gardens configuration
gardens_layout.gardens.clear()
for i in lessons.size():
for i in max_lesson_number:
var garden_layout: GardenLayout
+2
View File
@@ -55,6 +55,8 @@ layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 8.0
offset_top = 8.0
grow_horizontal = 2
grow_vertical = 2
theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
+4 -3
View File
@@ -947,8 +947,8 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2
theme_override_constants/margin_left = 5
theme_override_constants/margin_top = 5
theme_override_constants/margin_left = 15
theme_override_constants/margin_top = 20
theme_override_constants/margin_right = 5
theme_override_constants/margin_bottom = 5
@@ -958,9 +958,10 @@ layout_mode = 2
size_flags_vertical = 1
theme_override_constants/outline_size = 10
theme_override_font_sizes/font_size = 175
text = "f"
text = "o"
horizontal_alignment = 1
vertical_alignment = 1
uppercase = true
[node name="GraphemeParticles" type="GPUParticles2D" parent="."]
position = Vector2(1280, 1558)
+4 -3
View File
@@ -1,6 +1,7 @@
@tool
extends Control
const Gardens: = preload("res://sources/gardens/gardens.gd")
const gardens_scene: = preload("res://sources/gardens/gardens.tscn")
@export var locked_color: Color
@@ -73,11 +74,11 @@ func _ready() -> void:
garden_buttons[i].self_modulate = locked_color
can_emit = false
var emitting = false
var emitting: = false
for _j in range(gardens_layout.gardens[i].lesson_buttons.size()):
if can_emit and not emitting:
emitting = false
for game in UserDataManager.student_progression.unlocks[lesson_ind]["games"]:
for game: UserProgression.Status in UserDataManager.student_progression.unlocks[lesson_ind]["games"]:
if game == UserProgression.Status.Unlocked or game == UserProgression.Status.Locked:
emitting = true
break
@@ -90,7 +91,7 @@ func _on_garden_button_pressed(button_number: int) -> void:
audio_stream_player.play()
await OpeningCurtain.close()
var gardens: = gardens_scene.instantiate()
var gardens: Gardens = gardens_scene.instantiate()
gardens.starting_garden = button_number
get_tree().root.add_child(gardens)
get_tree().current_scene = gardens
+1 -1
View File
@@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://sources/menus/brain/brain.gd" id="1_1rwi2"]
[ext_resource type="Texture2D" uid="uid://jlwblk7lj7vi" path="res://assets/vfx/fx_10.png" id="1_poeho"]
[ext_resource type="Texture2D" uid="uid://dqjvrit8c3m6s" path="res://assets/brain_screen/blue_palm.png" id="2_6qag6"]
[ext_resource type="Resource" uid="uid://ccn0a731o07jn" path="res://resources/gardens/gardens_layout.tres" id="2_eooqa"]
[ext_resource type="Resource" uid="uid://c1xe204vu7asa" path="res://resources/gardens/gardens_layout.tres" id="2_eooqa"]
[ext_resource type="Texture2D" uid="uid://crba20yq2ljox" path="res://assets/brain_screen/head.png" id="2_w21ae"]
[ext_resource type="Texture2D" uid="uid://bjop68a8t82p3" path="res://assets/brain_screen/bush.png" id="3_bpmau"]
[ext_resource type="AudioStream" uid="uid://bwjerrgyy6dnj" path="res://assets/sfx/ui_garden_button.mp3" id="3_f5uh7"]
+4 -1
View File
@@ -12,7 +12,8 @@ const Kalulu: = preload("res://sources/minigames/base/kalulu.gd")
@onready var music_player : AudioStreamPlayer = $MusicStreamPlayer
@onready var device_number_label: Label = $DeviceNumber
@onready var keyboard : CodeKeyboard = $CodeKeyboard
@onready var teacher_timer : Timer = $InterfaceRight/TeacherButton/TeacherTimer
@onready var teacher_timer : Timer = %TeacherTimer
@onready var teacher_help_label: Label = %TeacherHelpLabel
var help_speech: AudioStream
var wrong_password_speech: AudioStream
@@ -62,9 +63,11 @@ func _on_teacher_button_button_down() -> void:
func _on_teacher_button_button_up() -> void:
teacher_help_label.show()
teacher_timer.stop()
func _on_teacher_timer_timeout() -> void:
teacher_help_label.hide()
await OpeningCurtain.close()
get_tree().change_scene_to_file(teacher_scene_path)
+24 -5
View File
@@ -41,6 +41,8 @@ offset_right = 158.5
offset_bottom = 176.0
grow_horizontal = 2
theme_override_font_sizes/font_size = 70
horizontal_alignment = 1
vertical_alignment = 1
[node name="CodeKeyboard" parent="." instance=ExtResource("5_xwrca")]
layout_mode = 1
@@ -91,13 +93,30 @@ theme_override_constants/margin_top = 50
theme_override_constants/margin_right = 50
theme_override_constants/margin_bottom = 50
[node name="TeacherButton" type="Button" parent="InterfaceRight"]
[node name="VBoxContainer" type="VBoxContainer" parent="InterfaceRight"]
layout_mode = 2
theme_override_constants/separation = 50
alignment = 2
[node name="TeacherHelpLabel" type="Label" parent="InterfaceRight/VBoxContainer"]
unique_name_in_owner = true
visible = false
custom_minimum_size = Vector2(350, 0)
layout_mode = 2
size_flags_vertical = 8
text = "TEACHER_SETTINGS_HELP"
horizontal_alignment = 1
vertical_alignment = 1
autowrap_mode = 2
[node name="TeacherButton" type="Button" parent="InterfaceRight/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 8
theme_override_font_sizes/font_size = 70
text = "SETTINGS"
[node name="TeacherTimer" type="Timer" parent="InterfaceRight/TeacherButton"]
[node name="TeacherTimer" type="Timer" parent="InterfaceRight/VBoxContainer/TeacherButton"]
unique_name_in_owner = true
wait_time = 5.0
[node name="Kalulu" parent="." instance=ExtResource("3_5b1v0")]
@@ -110,6 +129,6 @@ stream = ExtResource("24_4xfja")
[connection signal="password_entered" from="CodeKeyboard" to="." method="_on_code_keyboard_password_entered"]
[connection signal="pressed" from="InterfaceLeft/Container/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="pressed" from="InterfaceLeft/Container/KaluluButton" to="." method="_on_kalulu_button_pressed"]
[connection signal="button_down" from="InterfaceRight/TeacherButton" to="." method="_on_teacher_button_button_down"]
[connection signal="button_up" from="InterfaceRight/TeacherButton" to="." method="_on_teacher_button_button_up"]
[connection signal="timeout" from="InterfaceRight/TeacherButton/TeacherTimer" to="." method="_on_teacher_timer_timeout"]
[connection signal="button_down" from="InterfaceRight/VBoxContainer/TeacherButton" to="." method="_on_teacher_button_button_down"]
[connection signal="button_up" from="InterfaceRight/VBoxContainer/TeacherButton" to="." method="_on_teacher_button_button_up"]
[connection signal="timeout" from="InterfaceRight/VBoxContainer/TeacherButton/TeacherTimer" to="." method="_on_teacher_timer_timeout"]