diff --git a/sources/look_and_learn/look_and_learn.gd b/sources/look_and_learn/look_and_learn.gd index 8a8bd19e..de39b0bc 100644 --- a/sources/look_and_learn/look_and_learn.gd +++ b/sources/look_and_learn/look_and_learn.gd @@ -26,7 +26,6 @@ var current_tracing: int = 0 func _ready() -> void: MusicManager.stop() - gardens_data = transition_data transition_data = {} Log.trace("LookAndLearn: Transition data received = %s" % str(gardens_data)) @@ -87,7 +86,6 @@ func play_videos() -> void: else: video_player.stream = videos[current_video] video_player.play() - current_video += 1 @@ -98,7 +96,6 @@ func play_images_and_sounds() -> void: image.texture = images[current_image_and_sound] audio_player.stream = sounds[current_image_and_sound] audio_player.play() - current_image_and_sound += 1 @@ -161,7 +158,6 @@ func _on_tracing_manager_finished() -> void: func _back_to_gardens() -> void: Log.info("LookAndLearn: Returning to gardens for lesson %d" % lesson_nb) await OpeningCurtain.close() - Gardens.transition_data = gardens_data get_tree().change_scene_to_file("res://sources/gardens/gardens.tscn") diff --git a/sources/menus/adult_block/adult_boss_block.gd b/sources/menus/adult_block/adult_block.gd similarity index 98% rename from sources/menus/adult_block/adult_boss_block.gd rename to sources/menus/adult_block/adult_block.gd index 1eb54760..2cac9116 100644 --- a/sources/menus/adult_block/adult_boss_block.gd +++ b/sources/menus/adult_block/adult_block.gd @@ -1,3 +1,4 @@ +class_name AdultBlock extends Control signal unlocked() diff --git a/sources/menus/adult_block/adult_boss_block.gd.uid b/sources/menus/adult_block/adult_block.gd.uid similarity index 100% rename from sources/menus/adult_block/adult_boss_block.gd.uid rename to sources/menus/adult_block/adult_block.gd.uid diff --git a/sources/menus/adult_block/adult_boss_block.tscn b/sources/menus/adult_block/adult_block.tscn similarity index 96% rename from sources/menus/adult_block/adult_boss_block.tscn rename to sources/menus/adult_block/adult_block.tscn index 3f400b7c..4d3a72b9 100644 --- a/sources/menus/adult_block/adult_boss_block.tscn +++ b/sources/menus/adult_block/adult_block.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=5 format=3 uid="uid://b7rx6esglyd6c"] [ext_resource type="PackedScene" uid="uid://djduptonofbh4" path="res://sources/menus/components/code_keyboard.tscn" id="1_6q05s"] -[ext_resource type="Script" uid="uid://dxs13x1x36ukn" path="res://sources/menus/adult_block/adult_boss_block.gd" id="1_jf7p7"] +[ext_resource type="Script" uid="uid://dxs13x1x36ukn" path="res://sources/menus/adult_block/adult_block.gd" id="1_jf7p7"] [ext_resource type="PackedScene" uid="uid://wdjp1sv55q4f" path="res://sources/menus/components/night_sky/night_sky.tscn" id="2_cdfx1"] [ext_resource type="PackedScene" uid="uid://dxc82xcl7jncd" path="res://sources/menus/main/plants/palm.tscn" id="3_0u8tq"] -[node name="AdultBossBlock" type="Control"] +[node name="AdultBlock" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 diff --git a/sources/minigames/fish/fish_minigame.gd b/sources/minigames/fish/fish_minigame.gd index ad4f7ca6..866d46c5 100644 --- a/sources/minigames/fish/fish_minigame.gd +++ b/sources/minigames/fish/fish_minigame.gd @@ -31,7 +31,7 @@ var tutorial_count: int = 0 @onready var progress_gauge: PercentMarginContainer = %ProgressionGaugePercentMarginContainer @onready var progress_gauge_goal: PercentMarginContainer = %ProgressionGaugeGoalPercentMarginContainer2 @onready var progress_gauge_internal: NinePatchRect = %ProgressionGaugeInternal -@onready var adult_block: Control = %AdultBossBlock +@onready var adult_block: AdultBlock = %AdultBlock func _fish_get_drag_data(_at_position: Vector2) -> Variant: diff --git a/sources/minigames/fish/fish_minigame.tscn b/sources/minigames/fish/fish_minigame.tscn index 7e8adecd..4616b42b 100644 --- a/sources/minigames/fish/fish_minigame.tscn +++ b/sources/minigames/fish/fish_minigame.tscn @@ -17,7 +17,7 @@ [ext_resource type="Texture2D" uid="uid://disgg14rdmp81" path="res://assets/minigames/fish/textplank.png" id="13_3p0ue"] [ext_resource type="Script" uid="uid://d5qkkg88431w" path="res://sources/utils/percent_margin_container.gd" id="14_b3ilp"] [ext_resource type="LabelSettings" uid="uid://bguqnhiblwick" path="res://resources/themes/minigames_label_settings.tres" id="17_47luc"] -[ext_resource type="PackedScene" uid="uid://b7rx6esglyd6c" path="res://sources/menus/adult_block/adult_boss_block.tscn" id="18_4v0wd"] +[ext_resource type="PackedScene" uid="uid://b7rx6esglyd6c" path="res://sources/menus/adult_block/adult_block.tscn" id="18_4v0wd"] [sub_resource type="Environment" id="Environment_5bcb7"] background_mode = 3 @@ -725,7 +725,7 @@ text = "a" label_settings = ExtResource("17_47luc") horizontal_alignment = 1 -[node name="AdultBossBlock" parent="." index="5" instance=ExtResource("18_4v0wd")] +[node name="AdultBlock" parent="." index="5" instance=ExtResource("18_4v0wd")] unique_name_in_owner = true visible = false layout_mode = 1