diff --git a/Audio/SFX/door_open.wav b/Audio/SFX/door_open.wav new file mode 100644 index 0000000..54aa818 --- /dev/null +++ b/Audio/SFX/door_open.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:382fc5cf45ebd457dcc9a04c5969052506cf4eb4b1a89626ce59b5be1257dc6a +size 231468 diff --git a/Audio/SFX/door_open.wav.import b/Audio/SFX/door_open.wav.import new file mode 100644 index 0000000..acad5f6 --- /dev/null +++ b/Audio/SFX/door_open.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://darxacm0j1djh" +path="res://.godot/imported/door_open.wav-176a17466db3506bb227922a1033c673.sample" + +[deps] + +source_file="res://Audio/SFX/door_open.wav" +dest_files=["res://.godot/imported/door_open.wav-176a17466db3506bb227922a1033c673.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/Audio/sound_manager.tscn b/Audio/sound_manager.tscn index 3e3ac02..0b1bc62 100644 --- a/Audio/sound_manager.tscn +++ b/Audio/sound_manager.tscn @@ -1,11 +1,29 @@ -[gd_scene load_steps=3 format=3 uid="uid://bbybt6r6351yp"] +[gd_scene load_steps=11 format=3 uid="uid://bbybt6r6351yp"] [ext_resource type="Script" path="res://Scripts/Audio/sound_manager.gd" id="1_psrqm"] +[ext_resource type="AudioStream" uid="uid://di3fpfsl2vcyi" path="res://Audio/SFX/melee.tres" id="2_y14gs"] [ext_resource type="Script" path="res://Scripts/Audio/sound_queue.gd" id="2_y30yw"] +[ext_resource type="AudioStream" uid="uid://dmpd83t5hrd81" path="res://Audio/SFX/melee_hit.tres" id="3_b3imd"] +[ext_resource type="AudioStream" uid="uid://cvkvgyxqnksir" path="res://Audio/SFX/puff_smoke.wav" id="4_itc24"] +[ext_resource type="AudioStream" uid="uid://bp70snfsk40vy" path="res://Audio/SFX/pause.wav" id="5_hvn1j"] +[ext_resource type="AudioStream" uid="uid://01sdb5n7snib" path="res://Audio/SFX/accept.wav" id="6_g2v7g"] +[ext_resource type="AudioStream" uid="uid://drossx2nhgeue" path="res://Audio/SFX/dialog_open.wav" id="7_kuw5r"] +[ext_resource type="AudioStream" uid="uid://b72f2jvv2283j" path="res://Audio/SFX/dialog_page.wav" id="8_hhmgh"] +[ext_resource type="AudioStream" uid="uid://darxacm0j1djh" path="res://Audio/SFX/door_open.wav" id="9_rw16s"] [node name="SoundManager" type="Node"] process_mode = 3 script = ExtResource("1_psrqm") +sounds = { +"dialogue_continue": ExtResource("8_hhmgh"), +"dialogue_open": ExtResource("7_kuw5r"), +"door_open": ExtResource("9_rw16s"), +"effect_smoke": ExtResource("4_itc24"), +"melee": ExtResource("2_y14gs"), +"melee_hit": ExtResource("3_b3imd"), +"pause": ExtResource("5_hvn1j"), +"unpause": ExtResource("6_g2v7g") +} [node name="SoundQueue" type="Node" parent="."] script = ExtResource("2_y30yw") diff --git a/Cutscenes/prototype_clone_victory.tres b/Cutscenes/prototype_clone_victory.tres index 4fc21ed..b0a0f4f 100644 --- a/Cutscenes/prototype_clone_victory.tres +++ b/Cutscenes/prototype_clone_victory.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Cutscene" load_steps=33 format=3 uid="uid://ck75kipijh0fn"] +[gd_resource type="Resource" script_class="Cutscene" load_steps=35 format=3 uid="uid://ck75kipijh0fn"] [ext_resource type="Script" path="res://Scripts/Cutscenes/cutscene.gd" id="1_75ljw"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/emit_message.gd" id="1_wfaj3"] @@ -8,6 +8,7 @@ [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/cue_bgm.gd" id="4_joqmj"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/move_character.gd" id="6_aee84"] [ext_resource type="AudioStream" uid="uid://jlr3b1nye15g" path="res://Audio/BGM/olympus_combat.mp3" id="7_4jbtj"] +[ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/lookat_character.gd" id="7_gjmti"] [sub_resource type="Resource" id="Resource_jm5v6"] script = ExtResource("1_wfaj3") @@ -54,6 +55,11 @@ portrait_emotion = "normal" messages = Array[String](["Haaah... Made it..."]) textbox_direction = 1 +[sub_resource type="Resource" id="Resource_ork8h"] +script = ExtResource("7_gjmti") +character = NodePath("HiroPlayer") +lookat_target = NodePath("ReedAI") + [sub_resource type="Resource" id="Resource_5axwh"] script = ExtResource("3_0uw7j") character = 0 @@ -181,5 +187,5 @@ crossfade = true [resource] resource_name = "prototype_clone_defeated" script = ExtResource("1_75ljw") -commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_jm5v6"), SubResource("Resource_as31p"), SubResource("Resource_xcdd6"), SubResource("Resource_bagm4"), SubResource("Resource_v16hg"), SubResource("Resource_vu1m2"), SubResource("Resource_4u6io"), SubResource("Resource_5axwh"), SubResource("Resource_jdwa3"), SubResource("Resource_wsgt4"), SubResource("Resource_p2wwu"), SubResource("Resource_ben6d"), SubResource("Resource_5fw3k"), SubResource("Resource_t0ilw"), SubResource("Resource_3k148"), SubResource("Resource_f6433"), SubResource("Resource_o6ly6"), SubResource("Resource_pu4kf"), SubResource("Resource_hs1wh"), SubResource("Resource_apw73"), SubResource("Resource_yt0uq"), SubResource("Resource_v7db0"), SubResource("Resource_p8wvt"), SubResource("Resource_tjwhc")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_jm5v6"), SubResource("Resource_as31p"), SubResource("Resource_xcdd6"), SubResource("Resource_bagm4"), SubResource("Resource_v16hg"), SubResource("Resource_vu1m2"), SubResource("Resource_4u6io"), SubResource("Resource_ork8h"), SubResource("Resource_5axwh"), SubResource("Resource_jdwa3"), SubResource("Resource_wsgt4"), SubResource("Resource_p2wwu"), SubResource("Resource_ben6d"), SubResource("Resource_5fw3k"), SubResource("Resource_t0ilw"), SubResource("Resource_3k148"), SubResource("Resource_f6433"), SubResource("Resource_o6ly6"), SubResource("Resource_pu4kf"), SubResource("Resource_hs1wh"), SubResource("Resource_apw73"), SubResource("Resource_yt0uq"), SubResource("Resource_v7db0"), SubResource("Resource_p8wvt"), SubResource("Resource_tjwhc")]) auto_start_on_load = true diff --git a/Scripts/Levels/arena_level.gd b/Scripts/Levels/arena_level.gd index ec56383..2f5f7f0 100644 --- a/Scripts/Levels/arena_level.gd +++ b/Scripts/Levels/arena_level.gd @@ -84,6 +84,7 @@ func _on_cutscene_manager_issued_command(command: CutsceneCommand, manager: Cuts reed_ai.global_position = Vector2(0, 100) reed_ai.get_node("MovementCollider").disabled = true reed_ai.set_melee_box_enabled(false) + sound_manager.play_sound("door_open") manager.step() elif command.message == "fade_out": fader_animation.play("fade_out_black")