diff --git a/audio/sounds/absorb_shard.ogg b/audio/sounds/absorb_shard.ogg new file mode 100644 index 0000000..6082d1a Binary files /dev/null and b/audio/sounds/absorb_shard.ogg differ diff --git a/audio/sounds/absorb_shard.ogg.import b/audio/sounds/absorb_shard.ogg.import new file mode 100644 index 0000000..2782995 --- /dev/null +++ b/audio/sounds/absorb_shard.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/absorb_shard.ogg-eb69c32cbec975404891eab572731b58.oggstr" + +[deps] + +source_file="res://audio/sounds/absorb_shard.ogg" +dest_files=[ "res://.import/absorb_shard.ogg-eb69c32cbec975404891eab572731b58.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/shard_expel.ogg b/audio/sounds/shard_expel.ogg new file mode 100644 index 0000000..ecd54fa Binary files /dev/null and b/audio/sounds/shard_expel.ogg differ diff --git a/audio/sounds/shard_expel.ogg.import b/audio/sounds/shard_expel.ogg.import new file mode 100644 index 0000000..37983b5 --- /dev/null +++ b/audio/sounds/shard_expel.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/shard_expel.ogg-ed7f06e69f820e9cc0d8ac8352dd7410.oggstr" + +[deps] + +source_file="res://audio/sounds/shard_expel.ogg" +dest_files=[ "res://.import/shard_expel.ogg-ed7f06e69f820e9cc0d8ac8352dd7410.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/shard_float.ogg b/audio/sounds/shard_float.ogg new file mode 100644 index 0000000..155faa5 Binary files /dev/null and b/audio/sounds/shard_float.ogg differ diff --git a/audio/sounds/shard_float.ogg.import b/audio/sounds/shard_float.ogg.import new file mode 100644 index 0000000..dbbab8f --- /dev/null +++ b/audio/sounds/shard_float.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/shard_float.ogg-7af3a7d7ee37bae26e0091ca3a291b05.oggstr" + +[deps] + +source_file="res://audio/sounds/shard_float.ogg" +dest_files=[ "res://.import/shard_float.ogg-7af3a7d7ee37bae26e0091ca3a291b05.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/cutscenes/fami_cutscene.tscn b/cutscenes/fami_cutscene.tscn index 079d012..9e7c615 100644 --- a/cutscenes/fami_cutscene.tscn +++ b/cutscenes/fami_cutscene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=42 format=2] +[gd_scene load_steps=45 format=2] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=1] [ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=2] @@ -19,6 +19,9 @@ [ext_resource path="res://graphics/npc/fami_human_punch.png" type="Texture" id=17] [ext_resource path="res://graphics/npc/fami_human_transform.png" type="Texture" id=18] [ext_resource path="res://objects/enemy/boss/fami_transform.material" type="Material" id=19] +[ext_resource path="res://audio/sounds/absorb_shard.ogg" type="AudioStream" id=20] +[ext_resource path="res://audio/sounds/shard_expel.ogg" type="AudioStream" id=21] +[ext_resource path="res://audio/sounds/shard_float.ogg" type="AudioStream" id=22] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -166,7 +169,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ "Aha so you've made it this far, however your efforts are all in vain." ] +"values": [ "" ] } tracks/6/type = "value" tracks/6/path = NodePath("FamiHuman:position") @@ -184,7 +187,7 @@ tracks/6/keys = { [sub_resource type="Animation" id=2] resource_name = "cutscene" length = 93.0 -step = 0.5 +step = 0.25 tracks/0/type = "value" tracks/0/path = NodePath("Label:text") tracks/0/interp = 1 @@ -192,7 +195,7 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 4.95088, 13, 19, 28.5, 37, 46.5, 51.5, 58, 59, 78.5 ), +"times": PoolRealArray( 0.25, 5.25, 13.25, 19.25, 28.75, 37.25, 46.75, 51.75, 58.25, 59.25, 78.75 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 2, "values": [ "Aha! so you've made it this far, however your efforts are all in vain.", "You see, SG, @@ -205,7 +208,7 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0, 78.5 ), +"times": PoolRealArray( 0.25, 78.75 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ true, false ] @@ -217,7 +220,7 @@ tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0, 59, 60.5 ), +"times": PoolRealArray( 0.25, 59.25, 60.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, "values": [ Vector2( -8, 169 ), Vector2( -8, 169 ), Vector2( 72, 169 ) ] @@ -229,7 +232,7 @@ tracks/3/loop_wrap = true tracks/3/imported = false tracks/3/enabled = true tracks/3/keys = { -"times": PoolRealArray( 59, 60.5 ), +"times": PoolRealArray( 59.25, 60.75 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ "walk", "gun" ] @@ -241,7 +244,7 @@ tracks/4/loop_wrap = true tracks/4/imported = false tracks/4/enabled = true tracks/4/keys = { -"times": PoolRealArray( 0, 61.5, 63.5, 64, 69.5, 71.5, 75.5, 76 ), +"times": PoolRealArray( 0.25, 61.75, 63.75, 64.25, 69.75, 71.75, 75.75, 76.25 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 1, "values": [ "idle", "walk", "idle", "punch", "walk", "idle", "shrink", "orb" ] @@ -253,7 +256,7 @@ tracks/5/loop_wrap = true tracks/5/imported = false tracks/5/enabled = true tracks/5/keys = { -"times": PoolRealArray( 0, 61.5, 63.5, 69.5, 71.5, 75.5, 77.5, 78.5 ), +"times": PoolRealArray( 0.25, 61.75, 63.75, 69.75, 71.75, 75.75, 77.75, 78.75 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 0, "values": [ Vector2( 160, 167 ), Vector2( 160, 167 ), Vector2( 105, 167 ), Vector2( 105, 167 ), Vector2( 160, 167 ), Vector2( 160, 167 ), Vector2( 160, 167 ), Vector2( 160, 83 ) ] @@ -265,7 +268,7 @@ tracks/6/loop_wrap = true tracks/6/imported = false tracks/6/enabled = true tracks/6/keys = { -"times": PoolRealArray( 0.1, 64.5, 69.5 ), +"times": PoolRealArray( 0.5, 64.75, 69.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 1, "values": [ false, true, false ] @@ -277,7 +280,7 @@ tracks/7/loop_wrap = true tracks/7/imported = false tracks/7/enabled = true tracks/7/keys = { -"times": PoolRealArray( 0, 72.5, 75.5 ), +"times": PoolRealArray( 0.25, 72.75, 75.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 1, "values": [ false, true, false ] @@ -289,7 +292,7 @@ tracks/8/loop_wrap = true tracks/8/imported = false tracks/8/enabled = true tracks/8/keys = { -"times": PoolRealArray( 0, 74.5, 75.5 ), +"times": PoolRealArray( 0.25, 74.75, 75.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, "values": [ Color( 0.396078, 1, 1, 0 ), Color( 0.396078, 1, 1, 0 ), Color( 0.396078, 1, 1, 1 ) ] @@ -301,7 +304,7 @@ tracks/9/loop_wrap = true tracks/9/imported = false tracks/9/enabled = true tracks/9/keys = { -"times": PoolRealArray( 0, 74.5, 75.5 ), +"times": PoolRealArray( 0.25, 74.75, 75.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, "values": [ Color( 0.345098, 0.74902, 0.878431, 0 ), Color( 0.345098, 0.74902, 0.878431, 0 ), Color( 0.345098, 0.74902, 0.878431, 1 ) ] @@ -313,13 +316,49 @@ tracks/10/loop_wrap = true tracks/10/imported = false tracks/10/enabled = true tracks/10/keys = { -"times": PoolRealArray( 78.5 ), +"times": PoolRealArray( 78.75 ), "transitions": PoolRealArray( 1 ), "values": [ { "args": [ "cutscene_finished" ], "method": "emit_signal" } ] } +tracks/11/type = "value" +tracks/11/path = NodePath("ShardAbsorb:playing") +tracks/11/interp = 1 +tracks/11/loop_wrap = true +tracks/11/imported = false +tracks/11/enabled = true +tracks/11/keys = { +"times": PoolRealArray( 0, 72.75 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} +tracks/12/type = "value" +tracks/12/path = NodePath("ShardExpel:playing") +tracks/12/interp = 1 +tracks/12/loop_wrap = true +tracks/12/imported = false +tracks/12/enabled = true +tracks/12/keys = { +"times": PoolRealArray( 0, 64.75 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} +tracks/13/type = "value" +tracks/13/path = NodePath("ShardFloat:playing") +tracks/13/interp = 1 +tracks/13/loop_wrap = true +tracks/13/imported = false +tracks/13/enabled = true +tracks/13/keys = { +"times": PoolRealArray( 0, 76.5 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 12 ) @@ -367,6 +406,7 @@ shader_param/border_corners = false [node name="FamiCutscene" type="Node2D"] script = ExtResource( 10 ) +cutscene_skip = 78.75 [node name="TileMap" type="TileMap" parent="."] tile_set = ExtResource( 7 ) @@ -444,3 +484,15 @@ texture = ExtResource( 13 ) direction = Vector2( 0, 1 ) initial_velocity = 18.0 angular_velocity = 2.5 + +[node name="ShardAbsorb" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 20 ) +volume_db = -10.0 + +[node name="ShardFloat" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 22 ) +volume_db = -10.0 + +[node name="ShardExpel" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 21 ) +volume_db = -10.0