diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 6a67216..d7231eb 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -625,7 +625,7 @@ tracks/41/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [true] +"values": [false] } tracks/42/type = "value" tracks/42/imported = false @@ -1030,6 +1030,20 @@ tracks/18/keys = { "update": 0, "values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)] } +tracks/19/type = "method" +tracks/19/imported = false +tracks/19/enabled = true +tracks/19/path = NodePath("ScenePlayer") +tracks/19/interp = 1 +tracks/19/loop_wrap = true +tracks/19/keys = { +"times": PackedFloat32Array(138.4), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [], +"method": &"on_draeven_done" +}] +} [sub_resource type="Animation" id="Animation_1pmhi"] resource_name = "intro" @@ -1504,8 +1518,6 @@ script/source = "extends AnimationPlayer var has_stage -signal draeven_beginning - func start_soundtrack(): $Moving.play(70) $Childhood.play(70) @@ -1536,9 +1548,6 @@ func on_jui_jutsu_done(): func on_draeven_done(): get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_DRAEVEN) -func on_draeven_beginning(): - emit_signal(\"draeven_fade\") - func scene_finished(_id): play(\"RESET\") " @@ -1942,10 +1951,9 @@ auto_exposure_enabled = true auto_exposure_scale = 0.2 dof_blur_far_distance = 0.4 dof_blur_far_transition = 0.2 -dof_blur_near_enabled = true dof_blur_near_distance = 6.0 dof_blur_near_transition = 2.0 -dof_blur_amount = 0.4 +dof_blur_amount = 0.0 auto_exposure_min_sensitivity = 100.0 [sub_resource type="GDScript" id="GDScript_wb8kg"] @@ -1957,8 +1965,11 @@ func _ready(): func focus_env(): var dof_strength_tween: Tween = create_tween() dof_strength_tween.tween_property(camera_attributes, \"dof_blur_amount\", 0, 1) + await(dof_strength_tween.finished) + camera_attributes.dof_blur_near_enabled = false func focus_object(): + camera_attributes.dof_blur_near_enabled = true var dof_strength_tween: Tween = create_tween() dof_strength_tween.tween_property(camera_attributes, \"dof_blur_amount\", 0.4, 1) @@ -1966,7 +1977,7 @@ func play_scene(_id: int): focus_object() func scene_finished(_id: int): - focus_env() + pass " [sub_resource type="QuadMesh" id="QuadMesh_n875y"] @@ -2183,7 +2194,7 @@ visible = false layout_mode = 1 [node name="ScenePlayer" type="AnimationPlayer" parent="logic" groups=["animation_player"]] -autoplay = "draeven" +autoplay = "RESET" libraries = { "": SubResource("AnimationLibrary_ilekd") } @@ -2471,7 +2482,6 @@ layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 2 -scroll_vertical = 638 horizontal_scroll_mode = 0 vertical_scroll_mode = 3 @@ -2556,6 +2566,7 @@ scale = Vector2(0.4, 0.4) texture = ExtResource("12_xnele") [node name="draeven" type="CenterContainer" parent="logic/ScenePlayer"] +visible = false modulate = Color(1, 1, 1, 0) anchors_preset = 15 anchor_right = 1.0 @@ -2600,7 +2611,6 @@ layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 0 -scroll_vertical = 150 horizontal_scroll_mode = 0 vertical_scroll_mode = 3