diff --git a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd b/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd deleted file mode 100644 index 5113a45b9..000000000 --- a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-FileCopyrightText: The Threadbare Authors -# SPDX-License-Identifier: MPL-2.0 -extends AnimationPlayer - - -func _ready() -> void: - animation_finished.connect(_on_animation_finished) - - -func _on_animation_finished(_anim_name: StringName) -> void: - # Go back home. Usually Fray's End and next to the Eternal Loom: - var home_scene: String = ThreadbareProjectSettings.get_setting( - ThreadbareProjectSettings.HOME_SCENE - ) - SceneSwitcher.change_to_file_with_transition( - home_scene, "", Transitions.Effect.FADE, Transitions.Effect.FADE - ) diff --git a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd.uid b/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd.uid deleted file mode 100644 index 2a997c9d5..000000000 --- a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://k3q1kntww4eb diff --git a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_1.tscn b/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_1.tscn index b819f627a..d3e97815f 100644 --- a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_1.tscn +++ b/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_1.tscn @@ -1,6 +1,5 @@ [gd_scene format=4 uid="uid://d02db8ykyyos0"] -[ext_resource type="Script" uid="uid://k3q1kntww4eb" path="res://scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd" id="1_0crk3"] [ext_resource type="TileSet" uid="uid://oynx002hv8tl" path="res://tiles/water.tres" id="2_yewlk"] [ext_resource type="Texture2D" uid="uid://cexg7otw5enpu" path="res://assets/third_party/tiny-swords/Terrain/Water/Foam/Foam.png" id="3_3d5w8"] [ext_resource type="Texture2D" uid="uid://8mupkacbuxpr" path="res://assets/third_party/tiny-swords-non-cc0/Terrain/Decorations/Clouds/Clouds_01.png" id="3_3mcre"] @@ -50,6 +49,7 @@ [ext_resource type="Script" uid="uid://c4oww6rkbqfxc" path="res://scenes/game_elements/fx/stitch_trail/components/stitch_trail.gd" id="48_po6pk"] [ext_resource type="PackedScene" uid="uid://2rbpl811wlv1" path="res://scenes/game_elements/props/background_music/background_music.tscn" id="49_mxhwh"] [ext_resource type="AudioStream" uid="uid://bbamdm6wtjjcn" path="res://assets/first_party/music/Threadbare_Bed.ogg" id="50_4dxuy"] +[ext_resource type="Script" uid="uid://d2vp62mjrf6gn" path="res://scenes/globals/scene_switcher/scene_link.gd" id="50_mxhwh"] [sub_resource type="Animation" id="Animation_d870b"] length = 0.001 @@ -455,7 +455,6 @@ point_count = 12 root_node = NodePath("AspectRatioContainer/Wrapper/WorldRewoven") libraries/ = SubResource("AnimationLibrary_d870b") autoplay = &"cutscene" -script = ExtResource("1_0crk3") [node name="AspectRatioContainer" type="AspectRatioContainer" parent="." unique_id=767205030] anchors_preset = 15 @@ -785,3 +784,10 @@ metadata/_custom_type_script = "uid://c4oww6rkbqfxc" [node name="BackgroundMusic" parent="." unique_id=1461759951 instance=ExtResource("49_mxhwh")] stream = ExtResource("50_4dxuy") + +[node name="SceneLink" type="Node2D" parent="." unique_id=346303937] +script = ExtResource("50_mxhwh") +target = 1 +metadata/_custom_type_script = "uid://d2vp62mjrf6gn" + +[connection signal="animation_finished" from="." to="SceneLink" method="switch" unbinds=1] diff --git a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_2.tscn b/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_2.tscn index 09dae845a..77b3d57cc 100644 --- a/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_2.tscn +++ b/scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene_2.tscn @@ -1,6 +1,5 @@ [gd_scene format=4 uid="uid://ci5b3s8apl4ks"] -[ext_resource type="Script" uid="uid://k3q1kntww4eb" path="res://scenes/game_elements/fx/world_rewoven/components/world_rewoven_cutscene.gd" id="1_7d4yl"] [ext_resource type="TileSet" uid="uid://oynx002hv8tl" path="res://tiles/water.tres" id="2_dec8y"] [ext_resource type="Texture2D" uid="uid://6spbplxd35oi" path="res://assets/third_party/tiny-swords-non-cc0/Terrain/Decorations/Clouds/Clouds_03.png" id="3_h0gxs"] [ext_resource type="Texture2D" uid="uid://c3b4n67rvd358" path="res://assets/third_party/tiny-swords-non-cc0/Terrain/Decorations/Clouds/Clouds_04.png" id="4_iqiqp"] @@ -51,6 +50,7 @@ [ext_resource type="PackedScene" uid="uid://bs32ac1yj83ub" path="res://scenes/game_elements/fx/curly_trail/curly_trail.tscn" id="50_2bs3d"] [ext_resource type="Script" uid="uid://c4oww6rkbqfxc" path="res://scenes/game_elements/fx/stitch_trail/components/stitch_trail.gd" id="50_wh1pc"] [ext_resource type="PackedScene" uid="uid://2rbpl811wlv1" path="res://scenes/game_elements/props/background_music/background_music.tscn" id="51_deqoh"] +[ext_resource type="Script" uid="uid://d2vp62mjrf6gn" path="res://scenes/globals/scene_switcher/scene_link.gd" id="52_deqoh"] [ext_resource type="AudioStream" uid="uid://bbamdm6wtjjcn" path="res://assets/first_party/music/Threadbare_Bed.ogg" id="52_qsp11"] [sub_resource type="Animation" id="Animation_d870b"] @@ -510,7 +510,6 @@ point_count = 22 root_node = NodePath("AspectRatioContainer/Wrapper/WorldRewoven") libraries/ = SubResource("AnimationLibrary_d870b") autoplay = &"cutscene" -script = ExtResource("1_7d4yl") [node name="AspectRatioContainer" type="AspectRatioContainer" parent="." unique_id=854605277] anchors_preset = 15 @@ -871,3 +870,10 @@ metadata/_custom_type_script = "uid://c4oww6rkbqfxc" [node name="BackgroundMusic" parent="." unique_id=1461759951 instance=ExtResource("51_deqoh")] stream = ExtResource("52_qsp11") + +[node name="SceneLink" type="Node2D" parent="." unique_id=1116257516] +script = ExtResource("52_deqoh") +target = 1 +metadata/_custom_type_script = "uid://d2vp62mjrf6gn" + +[connection signal="animation_finished" from="." to="SceneLink" method="switch" unbinds=1]