Added curtain to some missing spots and wired look and learn back button

This commit is contained in:
Laurent Tourte
2024-05-14 15:44:43 +02:00
parent fc595c0676
commit f7f9e8dcc5
5 changed files with 35 additions and 33 deletions
File diff suppressed because one or more lines are too long
+13 -12
View File
@@ -209,18 +209,6 @@ func _fill_minigame_choice(exercise_type: String, is_completed: bool, minigame_n
button.pressed.connect(_on_minigame_button_pressed.bind(exercise_scenes[i], minigame_number))
func _on_minigame_button_pressed(minigame_scene: PackedScene, minigame_number: int) -> void:
await OpeningCurtain.close()
var minigame: Minigame = minigame_scene.instantiate()
minigame.lesson_nb = current_lesson_number
minigame.minigame_number = minigame_number
get_tree().root.add_child(minigame)
get_tree().current_scene = minigame
queue_free()
func set_up_lessons() -> void:
var lesson_ind: = 1
for garden_ind in garden_parent.get_child_count():
@@ -327,6 +315,18 @@ func _on_exercise_button_3_pressed() -> void:
minigame_choice_container.visible = true
func _on_minigame_button_pressed(minigame_scene: PackedScene, minigame_number: int) -> void:
await OpeningCurtain.close()
var minigame: Minigame = minigame_scene.instantiate()
minigame.lesson_nb = current_lesson_number
minigame.minigame_number = minigame_number
get_tree().root.add_child(minigame)
get_tree().current_scene = minigame
queue_free()
func _on_progression_unlocks_changed() -> void:
if not garden_parent:
return
@@ -450,6 +450,7 @@ func _on_back_button_pressed() -> void:
minigame_selection.visible = false
back_button.disabled = false
else:
await OpeningCurtain.close()
get_tree().change_scene_to_file("res://sources/menus/brain/brain.tscn")
+8 -8
View File
@@ -1,8 +1,5 @@
extends Control
const MinigameSelection: = preload("res://sources/lesson_screen/minigame_selection.gd")
const minigame_selection_scene: = preload("res://sources/lesson_screen/minigame_selection.tscn")
@export var lesson_nb: = 1
@export var current_button_pressed: = 0
@@ -128,9 +125,12 @@ func _on_tracing_manager_finished() -> void:
animation_player.play("end_tracing")
await animation_player.animation_finished
var minigame_selection: MinigameSelection = minigame_selection_scene.instantiate()
minigame_selection.lesson_number = lesson_nb
await OpeningCurtain.close()
get_tree().root.add_child(minigame_selection)
get_tree().current_scene = minigame_selection
queue_free()
get_tree().change_scene_to_file("res://sources/gardens/gardens.tscn")
func _on_garden_button_pressed() -> void:
await OpeningCurtain.close()
get_tree().change_scene_to_file("res://sources/gardens/gardens.tscn")
@@ -950,6 +950,7 @@ lifetime = 0.5
[connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_player_animation_finished"]
[connection signal="finished" from="AudioStreamPlayer" to="." method="_on_audio_stream_player_finished"]
[connection signal="pressed" from="LeftContainer/MarginContainer/GardenButton" to="." method="_on_garden_button_pressed"]
[connection signal="finished" from="Frame/Mask/ColorRect/TracingManager" to="." method="_on_tracing_manager_finished"]
[connection signal="finished" from="Frame/Mask/VideoStreamPlayer" to="." method="_on_video_stream_player_finished"]
[connection signal="pressed" from="GraphemeButton" to="." method="_on_grapheme_button_pressed"]
+1 -1
View File
@@ -85,7 +85,7 @@ func _ready() -> void:
func _on_garden_button_pressed(button_number: int) -> void:
OpeningCurtain.close()
await OpeningCurtain.close()
var gardens: = gardens_scene.instantiate()
gardens.starting_garden = button_number