Skip to content

fix: ok button in tutorial #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XanatosX merged 1 commit into from
Feb 28, 2026
Merged

fix: ok button in tutorial #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions entities/game/tutorial_window/scenes/TutorialWindow.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[ext_resource type="Script" uid="uid://brlkkuu3xnw88" path="res://entities/game/tutorial_window/scripts/TutorialWindow.gd" id="1_rm1ic"]
[ext_resource type="StyleBox" uid="uid://d1rhal5rp1608" path="res://assets/styles/panel/MetalBox.tres" id="2_a5yjs"]
[ext_resource type="PackedScene" uid="uid://bi2oaoxrcmttm" path="res://entities/game/animated_rich_text/scenes/AnimatedRichText.tscn" id="3_pqrdi"]
[ext_resource type="Script" uid="uid://detl5lffpj6ry" path="res://shared/entities/clickable_toggle/scripts/ClickableToggle.gd" id="4_kdust"]
[ext_resource type="Texture2D" uid="uid://dqv4i4y66gem" path="res://assets/icons/OkIcon.tres" id="7_ky4hq"]
[ext_resource type="Script" uid="uid://chfatpxf8ucxr" path="res://shared/entities/clickable_button/ClickableButton.gd" id="7_scsgn"]

Expand Down Expand Up @@ -52,6 +53,7 @@ layout_mode = 2
size_flags_horizontal = 2
tooltip_text = "COMPLETE_TUTORIAL_TOOLTIP"
text = "COMPLETE_TUTORIAL"
script = ExtResource("4_kdust")

[node name="Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer/Controls" unique_id=2097027986]
layout_mode = 2
Expand All @@ -62,5 +64,7 @@ script = ExtResource("7_scsgn")

[connection signal="append_text" from="." to="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/AnimatedRichText" method="add_new_text"]
[connection signal="title_changed" from="." to="PanelContainer/MarginContainer/VBoxContainer/Title" method="set_text"]
[connection signal="animation_done" from="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/AnimatedRichText" to="PanelContainer/MarginContainer/VBoxContainer/Controls/Button" method="enable_button"]
[connection signal="animation_playing" from="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/AnimatedRichText" to="PanelContainer/MarginContainer/VBoxContainer/Controls/Button" method="disable_button"]
[connection signal="toggled" from="PanelContainer/MarginContainer/VBoxContainer/Controls/CompleteTutorial" to="." method="toggle_abort_tutorial"]
[connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/Controls/Button" to="." method="close"]
7 changes: 6 additions & 1 deletion shared/entities/clickable_toggle/scripts/ClickableToggle.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ class_name ClickableToggle extends CheckButton

@export var starts_ready: bool = false

var _initialized: bool = false

func _ready() -> void:
mouse_entered.connect(GlobalSoundBridge.play_button_hover)
focus_entered.connect(GlobalSoundBridge.play_button_hover)
if not starts_ready:
await get_tree().physics_frame
_initialized = true


func _toggled(_toggled_on: bool) -> void:
if !starts_ready:
if not _initialized and !starts_ready:
return
GlobalSoundBridge.play_toggle_sound()