diff --git a/Resources/Credits.tres b/Resources/Credits.tres index ce419e24..95190fdd 100644 --- a/Resources/Credits.tres +++ b/Resources/Credits.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="CreditsCollection" load_steps=20 format=3 uid="uid://cojsc1rtf41i1"] +[gd_resource type="Resource" script_class="CreditsCollection" load_steps=21 format=3 uid="uid://cojsc1rtf41i1"] [ext_resource type="Script" uid="uid://buq8eurx510ps" path="res://Scripts/Resources/CreditsCollection.cs" id="1_0bwsf"] [ext_resource type="Script" uid="uid://bc4f4ggvk3ktf" path="res://Scripts/Resources/CreditsEntry.cs" id="1_aaqha"] @@ -105,7 +105,13 @@ Name = "Alexander Nikopoulos" Contribution = "VFEZ" metadata/_custom_type_script = "uid://bc4f4ggvk3ktf" +[sub_resource type="Resource" id="Resource_n6vk1"] +script = ExtResource("1_aaqha") +Name = "Garuda1982" +Contribution = "Sounds" +metadata/_custom_type_script = "uid://bc4f4ggvk3ktf" + [resource] script = ExtResource("1_0bwsf") -Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk")]) +Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk"), SubResource("Resource_n6vk1")]) metadata/_custom_type_script = "uid://buq8eurx510ps" diff --git a/SFX/elevator.ogg b/SFX/elevator.ogg new file mode 100644 index 00000000..9f58a3f2 --- /dev/null +++ b/SFX/elevator.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2d7be5e6e636bf6b6d35554c88017202c8fdca95d3a1f67d53028beba9fd7a4 +size 84275 diff --git a/SFX/elevator.ogg.import b/SFX/elevator.ogg.import new file mode 100644 index 00000000..2a8c8043 --- /dev/null +++ b/SFX/elevator.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b0b3rcpdvfwsk" +path="res://.godot/imported/elevator.ogg-5900b7e7faadeae3d44a5aef62539cee.oggvorbisstr" + +[deps] + +source_file="res://SFX/elevator.ogg" +dest_files=["res://.godot/imported/elevator.ogg-5900b7e7faadeae3d44a5aef62539cee.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Scenes/Elevator.tscn b/Scenes/Elevator.tscn index 56a0d9f7..652afb2b 100644 --- a/Scenes/Elevator.tscn +++ b/Scenes/Elevator.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://cxjumgf8bhr3l"] +[gd_scene load_steps=11 format=3 uid="uid://cxjumgf8bhr3l"] [ext_resource type="Texture2D" uid="uid://cyq6f1n0nrgrs" path="res://Sprites/Elevator.png" id="1_0xq5m"] [ext_resource type="Script" uid="uid://b6jp6fhmwmobv" path="res://Scripts/Components/FSM/Elevator/ElevatorProxy.cs" id="1_xv5vg"] @@ -8,6 +8,7 @@ [ext_resource type="Script" uid="uid://cxxu5ed50wiev" path="res://Scripts/Components/FSM/Elevator/Top.cs" id="6_rd3yl"] [ext_resource type="Script" uid="uid://bgmehqn7g7fvj" path="res://Scripts/Components/FSM/Elevator/Ascending.cs" id="7_r4wj7"] [ext_resource type="Script" uid="uid://72sfdklqrc6d" path="res://Scripts/Components/FSM/Elevator/Descending.cs" id="8_flmvm"] +[ext_resource type="AudioStream" uid="uid://b0b3rcpdvfwsk" path="res://SFX/elevator.ogg" id="9_flmvm"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_3lpp4"] size = Vector2(20, 19) @@ -37,13 +38,18 @@ script = ExtResource("5_57077") [node name="Top" type="Node2D" parent="StateMachine"] script = ExtResource("6_rd3yl") -[node name="Ascending" type="Node2D" parent="StateMachine"] +[node name="Ascending" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("Sound")] script = ExtResource("7_r4wj7") +Sound = NodePath("../../AudioStreamPlayer2D") -[node name="Descending" type="Node2D" parent="StateMachine"] +[node name="Descending" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("Sound")] script = ExtResource("8_flmvm") +Sound = NodePath("../../AudioStreamPlayer2D") [node name="Disabled" type="Node2D" parent="StateMachine"] +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("9_flmvm") + [connection signal="area_entered" from="." to="." method="_on_area_entered"] [connection signal="area_exited" from="." to="." method="_on_area_exited"] diff --git a/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs b/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs index 6a00e94a..47af6686 100644 --- a/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs +++ b/Scripts/Components/FSM/Elevator/ElevatorMovementState.cs @@ -10,6 +10,8 @@ namespace Cirno.Scripts.Components.FSM.Elevator; public abstract partial class ElevatorMovementState : BaseState { + [Export] public AudioStreamPlayer2D Sound { get; private set; } + protected GTween Tween; //protected Node2D OldPlayerParent; @@ -25,12 +27,14 @@ public abstract partial class ElevatorMovementState : BaseState