From 0b9147db158844ab4a17602ddcedd2449e2badee Mon Sep 17 00:00:00 2001 From: BimDav Date: Wed, 15 May 2024 11:14:00 +0200 Subject: [PATCH] fix a bug in gardens navigation --- sources/gardens/gardens.gd | 6 ++++-- sources/look_and_learn/look_and_learn.gd | 2 +- sources/minigames/base/base_minigame.gd | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sources/gardens/gardens.gd b/sources/gardens/gardens.gd index 866493dd..96c64cbc 100644 --- a/sources/gardens/gardens.gd +++ b/sources/gardens/gardens.gd @@ -233,7 +233,7 @@ func set_up_lessons() -> void: if not lesson_ind in lessons: break garden_control.set_lesson_label(i, lessons[lesson_ind][0].grapheme) - garden_control.lesson_button_controls[i].pressed.connect(_on_garden_lesson_button_pressed.bind(garden_control.lesson_button_controls[i].global_position, lesson_ind, garden_ind)) + garden_control.lesson_button_controls[i].pressed.connect(_on_garden_lesson_button_pressed.bind(garden_control.lesson_button_controls[i], lesson_ind, garden_ind)) lesson_ind += 1 @@ -275,7 +275,9 @@ func set_up_path() -> void: locked_line.points = curve.get_baked_points() -func _on_garden_lesson_button_pressed(button_global_position: Vector2, lesson_ind: int, garden_ind: int, tween_duration: = 0.5) -> void: +func _on_garden_lesson_button_pressed(button: TextureButton, lesson_ind: int, garden_ind: int, button_global_position: = Vector2.ZERO, tween_duration: = 0.5) -> void: + if button: + button_global_position = button.global_position current_button_global_position = button_global_position current_lesson_number = lesson_ind current_garden = garden_ind diff --git a/sources/look_and_learn/look_and_learn.gd b/sources/look_and_learn/look_and_learn.gd index 4ef31ccb..f50146a8 100644 --- a/sources/look_and_learn/look_and_learn.gd +++ b/sources/look_and_learn/look_and_learn.gd @@ -146,5 +146,5 @@ static func _back_to_gardens_data(tree: SceneTree, data: Dictionary) -> void: await tree.create_timer(0).timeout var current_scene: = tree.current_scene current_scene.starting_garden = data.current_garden - current_scene._on_garden_lesson_button_pressed(data.current_button_global_position, data.current_lesson_number, data.current_garden) + current_scene._on_garden_lesson_button_pressed(null, data.current_lesson_number, data.current_garden, data.current_button_global_position) diff --git a/sources/minigames/base/base_minigame.gd b/sources/minigames/base/base_minigame.gd index 84d35e09..f2d5d34b 100644 --- a/sources/minigames/base/base_minigame.gd +++ b/sources/minigames/base/base_minigame.gd @@ -221,7 +221,7 @@ static func _back_to_gardens_data(tree: SceneTree, data: Dictionary) -> void: await tree.create_timer(0).timeout var current_scene: = tree.current_scene current_scene.starting_garden = data.current_garden - current_scene._on_garden_lesson_button_pressed(data.current_button_global_position, data.current_lesson_number, data.current_garden) + current_scene._on_garden_lesson_button_pressed(null, data.current_lesson_number, data.current_garden, data.current_button_global_position) func _play_stimulus() -> void: