diff --git a/audio/sounds/intro_voiceover.ogg b/audio/sounds/intro_voiceover.ogg new file mode 100644 index 0000000..59d4b7f Binary files /dev/null and b/audio/sounds/intro_voiceover.ogg differ diff --git a/audio/sounds/intro_voiceover.ogg.import b/audio/sounds/intro_voiceover.ogg.import new file mode 100644 index 0000000..4dc6847 --- /dev/null +++ b/audio/sounds/intro_voiceover.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/intro_voiceover.ogg-394307c1c86e42f9b1d6a08f865fda1d.oggstr" + +[deps] + +source_file="res://audio/sounds/intro_voiceover.ogg" +dest_files=[ "res://.import/intro_voiceover.ogg-394307c1c86e42f9b1d6a08f865fda1d.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/menus/intro_story.gd b/menus/intro_story.gd index 55eba83..4327876 100644 --- a/menus/intro_story.gd +++ b/menus/intro_story.gd @@ -2,6 +2,8 @@ extends Node2D func _ready(): Fade.fade_in(0.4) + Audio.play_music(load("res://audio/music/intro.ogg")) + $VoiceOver.play() func _input(event): if Input.is_action_just_pressed("ui_accept"): diff --git a/menus/intro_story.tscn b/menus/intro_story.tscn index 4dae9bc..2446cd3 100644 --- a/menus/intro_story.tscn +++ b/menus/intro_story.tscn @@ -1,14 +1,15 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=2] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=3] [ext_resource path="res://menus/intro_story.gd" type="Script" id=4] +[ext_resource path="res://audio/sounds/intro_voiceover.ogg" type="AudioStream" id=5] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) shader_param/color_1 = Color( 0, 0, 0, 1 ) -shader_param/color_2 = Color( 0.168627, 0.168627, 0.168627, 1 ) +shader_param/color_2 = Color( 0.1188, 0.1188, 0.22, 1 ) shader_param/checker_size = Vector2( 16, 16 ) shader_param/pan_speed = Vector2( 16, 0 ) shader_param/cycle_speed = Vector2( 4, 4 ) @@ -32,7 +33,7 @@ tracks/0/keys = { [sub_resource type="Animation" id=3] resource_name = "scroll" -length = 30.0 +length = 80.0 tracks/0/type = "value" tracks/0/path = NodePath("Label:rect_position") tracks/0/interp = 1 @@ -40,10 +41,10 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 30 ), +"times": PoolRealArray( 0, 80 ), "transitions": PoolRealArray( 1, 1 ), "update": 0, -"values": [ Vector2( 8, 192 ), Vector2( 8, -528 ) ] +"values": [ Vector2( 8, 182 ), Vector2( 8, -528 ) ] } [node name="IntroStory" type="Node2D"] @@ -79,4 +80,7 @@ autoplay = "scroll" anims/RESET = SubResource( 2 ) anims/scroll = SubResource( 3 ) +[node name="VoiceOver" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) + [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"]