Skip to content

Commit dd87be5

Browse files
authored
Merge pull request #1267 from endlessm/intro-dialogue-normal-speed
Intro: Play dialogue at normal speed
2 parents 106e722 + 052f084 commit dd87be5

2 files changed

Lines changed: 6 additions & 70 deletions

File tree

scenes/menus/intro/components/intro.dialogue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
~ start
44
# Wait a moment before starting the dialogue proper. In particular, this allows
55
# time for any fade-in transition from the previous scene to finish.
6-
do animation_player.play(&"delay_start")
7-
do animation_player.animation_finished
6+
if Transitions.is_running():
7+
do Transitions.finished
88
do animation_player.play(&"sketches")
9-
[speed=0.5]You know that feeling you get when you wrap yourself in your favorite blanket? Like a cozy hug from a loved one.
10-
[speed=0.5]What if I told you there is a world made of fabric, not too far away and not too near, that used to feel just like that hug?
11-
[speed=0.5]This world was made of stitches and stories, and people were happy. Until ...
9+
You know that feeling you get when you wrap yourself in your favorite blanket? Like a cozy hug from a loved one.
10+
What if I told you there is a world made of fabric, not too far away and not too near, that used to feel just like that hug?
11+
This world was made of stitches and stories, and people were happy. Until
1212
=> END

scenes/menus/intro/intro.tscn

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=16 format=3 uid="uid://dow5vc7yb5k2c"]
1+
[gd_scene load_steps=15 format=3 uid="uid://dow5vc7yb5k2c"]
22

33
[ext_resource type="PackedScene" uid="uid://2rbpl811wlv1" path="res://scenes/game_elements/props/background_music/background_music.tscn" id="1_1dipm"]
44
[ext_resource type="Script" uid="uid://x1mxt6bmei2o" path="res://scenes/ui_elements/cinematic/cinematic.gd" id="1_qeukb"]
@@ -136,69 +136,6 @@ tracks/9/keys = {
136136
"values": [Color(1, 1, 1, 1)]
137137
}
138138

139-
[sub_resource type="Animation" id="Animation_rpon1"]
140-
resource_name = "delay_start"
141-
tracks/0/type = "value"
142-
tracks/0/imported = false
143-
tracks/0/enabled = true
144-
tracks/0/path = NodePath("CanvasLayer/Control/Sketch01:visible")
145-
tracks/0/interp = 1
146-
tracks/0/loop_wrap = true
147-
tracks/0/keys = {
148-
"times": PackedFloat32Array(0),
149-
"transitions": PackedFloat32Array(1),
150-
"update": 1,
151-
"values": [false]
152-
}
153-
tracks/1/type = "value"
154-
tracks/1/imported = false
155-
tracks/1/enabled = true
156-
tracks/1/path = NodePath("CanvasLayer/Control/Sketch02:visible")
157-
tracks/1/interp = 1
158-
tracks/1/loop_wrap = true
159-
tracks/1/keys = {
160-
"times": PackedFloat32Array(0),
161-
"transitions": PackedFloat32Array(1),
162-
"update": 1,
163-
"values": [false]
164-
}
165-
tracks/2/type = "value"
166-
tracks/2/imported = false
167-
tracks/2/enabled = true
168-
tracks/2/path = NodePath("CanvasLayer/Control/Sketch03:visible")
169-
tracks/2/interp = 1
170-
tracks/2/loop_wrap = true
171-
tracks/2/keys = {
172-
"times": PackedFloat32Array(0),
173-
"transitions": PackedFloat32Array(1),
174-
"update": 1,
175-
"values": [false]
176-
}
177-
tracks/3/type = "value"
178-
tracks/3/imported = false
179-
tracks/3/enabled = true
180-
tracks/3/path = NodePath("CanvasLayer/Control/Sketch04:visible")
181-
tracks/3/interp = 1
182-
tracks/3/loop_wrap = true
183-
tracks/3/keys = {
184-
"times": PackedFloat32Array(0),
185-
"transitions": PackedFloat32Array(1),
186-
"update": 1,
187-
"values": [false]
188-
}
189-
tracks/4/type = "value"
190-
tracks/4/imported = false
191-
tracks/4/enabled = true
192-
tracks/4/path = NodePath("CanvasLayer/Control/Sketch05:visible")
193-
tracks/4/interp = 1
194-
tracks/4/loop_wrap = true
195-
tracks/4/keys = {
196-
"times": PackedFloat32Array(0),
197-
"transitions": PackedFloat32Array(1),
198-
"update": 1,
199-
"values": [false]
200-
}
201-
202139
[sub_resource type="Animation" id="Animation_5fnp7"]
203140
resource_name = "sketches"
204141
length = 13.0
@@ -327,7 +264,6 @@ tracks/9/keys = {
327264
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ir5dn"]
328265
_data = {
329266
&"RESET": SubResource("Animation_8twl8"),
330-
&"delay_start": SubResource("Animation_rpon1"),
331267
&"sketches": SubResource("Animation_5fnp7")
332268
}
333269

0 commit comments

Comments
 (0)