diff --git a/audio/sounds/revolution2083.ogg b/audio/sounds/revolution2083.ogg new file mode 100644 index 0000000..6ef11eb Binary files /dev/null and b/audio/sounds/revolution2083.ogg differ diff --git a/audio/sounds/revolution2083.ogg.import b/audio/sounds/revolution2083.ogg.import new file mode 100644 index 0000000..5989783 --- /dev/null +++ b/audio/sounds/revolution2083.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/revolution2083.ogg-d47e8251a75748ee057f8c0968c8ab80.oggstr" + +[deps] + +source_file="res://audio/sounds/revolution2083.ogg" +dest_files=[ "res://.import/revolution2083.ogg-d47e8251a75748ee057f8c0968c8ab80.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/menus/title_screen.gd b/menus/title_screen.gd index 24d11bc..14b55a8 100644 --- a/menus/title_screen.gd +++ b/menus/title_screen.gd @@ -4,9 +4,9 @@ export var next_menu: PackedScene func _input(event): if Input.is_action_just_pressed("start"): - Fade.fade_out(0.4) - yield(Fade, "fade_finished") - SceneManager.current_scene = next_menu.instance() + Audio.play_sound(Audio.a_star,Audio.ac_collectible) + $AudioStreamPlayer.play() + $AnimationPlayer.play("activate") func _ready(): var time = OS.get_time() @@ -14,3 +14,9 @@ func _ready(): $Night.visible = true else: $Day.visible = true + + +func _on_AudioStreamPlayer_finished(): + Fade.fade_out(0.4) + yield(Fade, "fade_finished") + SceneManager.current_scene = next_menu.instance() diff --git a/menus/title_screen.tscn b/menus/title_screen.tscn index 95bcfa6..9777af0 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=22 format=2] -[ext_resource path="res://tilesets/t_grass.tres" type="TileSet" id=1] -[ext_resource path="res://shaders/wibble_border.gdshader" type="Shader" id=2] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=3] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4] [ext_resource path="res://menus/title_screen.gd" type="Script" id=5] @@ -13,6 +12,7 @@ [ext_resource path="res://shaders/color_noise.gdshader" type="Shader" id=11] [ext_resource path="res://graphics/backgrounds/moon.png" type="Texture" id=12] [ext_resource path="res://graphics/hud/title_credits.png" type="Texture" id=13] +[ext_resource path="res://audio/sounds/revolution2083.ogg" type="AudioStream" id=14] [sub_resource type="ShaderMaterial" id=7] shader = ExtResource( 8 ) @@ -42,15 +42,89 @@ shader_param/noise_intensity = 1.0 [sub_resource type="Curve" id=4] _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.130639, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.348684, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] -[sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 2 ) -shader_param/speed = Vector2( 4, 1 ) -shader_param/ammount = Vector2( 2, 8 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 1, 0 ) +[sub_resource type="ShaderMaterial" id=11] +shader = ExtResource( 1 ) shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 ) shader_param/border_corners = false +[sub_resource type="Animation" id=9] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("Logo:material:shader_param/speed") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 0, 0 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Logo:rect_size") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 256, 192 ) ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Logo:rect_rotation") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.0 ] +} + +[sub_resource type="Animation" id=10] +resource_name = "activate" +tracks/0/type = "value" +tracks/0/path = NodePath("Label:visible") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ false ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Logo:rotation_degrees") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( ), +"transitions": PoolRealArray( ), +"update": 0, +"values": [ ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Logo:scale") +tracks/2/interp = 2 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 0.5, 0.8 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 1, 1 ), Vector2( 1.25, 1.25 ), Vector2( 1, 1 ) ] +} + [sub_resource type="Animation" id=6] resource_name = "blink" length = 0.6 @@ -73,7 +147,6 @@ script = ExtResource( 5 ) next_menu = ExtResource( 6 ) [node name="Day" type="Node2D" parent="."] -visible = false [node name="ColorRect" type="ColorRect" parent="Day"] material = SubResource( 7 ) @@ -123,20 +196,10 @@ scale_amount_random = 1.0 scale_amount_curve = SubResource( 4 ) color = Color( 0.0666667, 0.0666667, 0.0666667, 1 ) -[node name="Logo" type="TextureRect" parent="."] -material = SubResource( 2 ) -anchor_right = 1.0 -anchor_bottom = 1.0 +[node name="Logo" type="Sprite" parent="."] +material = SubResource( 11 ) +position = Vector2( 128, 96 ) texture = ExtResource( 7 ) -expand = true - -[node name="TileMap" type="TileMap" parent="."] -visible = false -position = Vector2( 4, 0 ) -tile_set = ExtResource( 1 ) -cell_size = Vector2( 8, 8 ) -format = 1 -tile_data = PoolIntArray( 589832, 3, 196609, 589833, 3, 196610, 589834, 3, 3, 589836, 3, 1, 589837, 3, 196610, 589838, 3, 3, 589840, 3, 1, 589841, 3, 196610, 589842, 3, 3, 589844, 3, 196609, 589845, 3, 196610, 589846, 3, 3, 655370, 3, 65536, 655372, 3, 65536, 655374, 3, 65536, 655376, 3, 65536, 655378, 3, 65536, 655382, 3, 65536, 720904, 3, 1, 720905, 3, 196610, 720906, 3, 131075, 720908, 3, 65536, 720910, 3, 65536, 720912, 3, 65537, 720913, 3, 196610, 720914, 3, 65539, 720916, 3, 196609, 720917, 3, 196610, 720918, 3, 65539, 786440, 3, 65536, 786444, 3, 65536, 786446, 3, 65536, 786448, 3, 65536, 786450, 3, 65536, 786454, 3, 65536, 851976, 3, 131073, 851977, 3, 196610, 851978, 3, 196611, 851980, 3, 131073, 851981, 3, 196610, 851982, 3, 131075, 851984, 3, 131073, 851985, 3, 196610, 851986, 3, 131075, 851988, 3, 196609, 851989, 3, 196610, 851990, 3, 131075 ) [node name="Label" type="Label" parent="."] material = ExtResource( 4 ) @@ -153,4 +216,11 @@ texture = ExtResource( 13 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "blink" +anims/RESET = SubResource( 9 ) +anims/activate = SubResource( 10 ) anims/blink = SubResource( 6 ) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 14 ) + +[connection signal="finished" from="AudioStreamPlayer" to="." method="_on_AudioStreamPlayer_finished"]