From 9da35a4ffd312eeac5a3077199c4e8896e6fc4a6 Mon Sep 17 00:00:00 2001 From: Laurent Tourte <77699054+Harpokhrat@users.noreply.github.com> Date: Tue, 14 May 2024 17:36:48 +0200 Subject: [PATCH] Fixed look and learn with additional GPs --- sources/look_and_learn/look_and_learn.gd | 4 ++-- sources/look_and_learn/look_and_learn.tscn | 2 ++ sources/look_and_learn/tracing_manager.gd | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources/look_and_learn/look_and_learn.gd b/sources/look_and_learn/look_and_learn.gd index e9d82078..d12e0f9d 100644 --- a/sources/look_and_learn/look_and_learn.gd +++ b/sources/look_and_learn/look_and_learn.gd @@ -90,7 +90,7 @@ func play_images_and_sounds() -> void: func load_tracing() -> void: - tracing_manager.setup(gp_list[current_tracing]["Grapheme"]) + await tracing_manager.setup(gp_list[current_tracing]["Grapheme"]) current_tracing += 1 @@ -121,7 +121,7 @@ func _on_audio_stream_player_finished() -> void: func _on_tracing_manager_finished() -> void: if current_tracing < gp_list.size(): - tracing_manager.setup(gp_list[current_tracing]["Grapheme"]) + await tracing_manager.setup(gp_list[current_tracing]["Grapheme"]) tracing_manager.start() current_tracing += 1 else: diff --git a/sources/look_and_learn/look_and_learn.tscn b/sources/look_and_learn/look_and_learn.tscn index b7fc13f2..3b90c610 100644 --- a/sources/look_and_learn/look_and_learn.tscn +++ b/sources/look_and_learn/look_and_learn.tscn @@ -783,6 +783,8 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_12st1") +lesson_nb = 11 +current_button_pressed = 2 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { diff --git a/sources/look_and_learn/tracing_manager.gd b/sources/look_and_learn/tracing_manager.gd index 39a21816..fca5a54d 100644 --- a/sources/look_and_learn/tracing_manager.gd +++ b/sources/look_and_learn/tracing_manager.gd @@ -34,12 +34,13 @@ func reset() -> void: lower_labels.visible = true upper_labels.visible = false + await get_tree().process_frame # --- Setup --- func setup(grapheme: String) -> void: - reset() + await reset() if not _is_grapheme_valid(grapheme): finished.emit()