diff --git a/NOTICE.md b/NOTICE.md index 7af921e..0ec74e5 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -13,7 +13,7 @@ This project uses the following external assets: | `./temp/puff.wav` | https://freesound.org/people/JustInvoke/sounds/446124/ | Attribution 4 | | `./temp/place.wav` | https://freesound.org/people/Planman/sounds/208111/ | CC0 | | `./temp/gore.wav` | https://freesound.org/people/MinecraftGamerLR/sounds/728695/ | Attribution 4 | -| `./temp/bones.wav` | https://freesound.org/people/cliftonmcarlson/sounds/392883/ | CC0 | +| `./entities/skull_pickup.wav` | https://freesound.org/people/cliftonmcarlson/sounds/392883/ | CC0 | | `./temp/metallic_whistle.wav` | https://freesound.org/people/furbyguy/sounds/365643/| Attribution 3| | `./temp/upgradeselect.wav` | https://freesound.org/people/TechspiredMinds/sounds/729216/| Attribution 4| | `./temp/upgrade.wav` | https://freesound.org/people/colorsCrimsonTears/sounds/607409/ | CC0 | diff --git a/entities/drop.wav b/entities/fall.wav similarity index 100% rename from entities/drop.wav rename to entities/fall.wav diff --git a/entities/drop.wav.import b/entities/fall.wav.import similarity index 57% rename from entities/drop.wav.import rename to entities/fall.wav.import index 08d956e..7d0b77e 100644 --- a/entities/drop.wav.import +++ b/entities/fall.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://buxgivpkh8dyl" -path="res://.godot/imported/drop.wav-e321e3ff0b5883beef3e60642ca137ca.sample" +path="res://.godot/imported/fall.wav-db08e68086e6fbfdfcb891d3b1804e1e.sample" [deps] -source_file="res://entities/drop.wav" -dest_files=["res://.godot/imported/drop.wav-e321e3ff0b5883beef3e60642ca137ca.sample"] +source_file="res://entities/fall.wav" +dest_files=["res://.godot/imported/fall.wav-db08e68086e6fbfdfcb891d3b1804e1e.sample"] [params] diff --git a/entities/skull.tscn b/entities/skull.tscn index 318604b..8cdf288 100644 --- a/entities/skull.tscn +++ b/entities/skull.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=7 format=3 uid="uid://b3gydtrenbw3n"] +[gd_scene load_steps=9 format=3 uid="uid://b3gydtrenbw3n"] [ext_resource type="Script" path="res://entities/skull.gd" id="1_7g8bu"] [ext_resource type="Texture2D" uid="uid://dwvvwjdexdywh" path="res://entities/skull.png" id="1_v6qk3"] [ext_resource type="PackedScene" uid="uid://dijcjahkddudv" path="res://behaviours/draggable.tscn" id="2_h0icd"] [ext_resource type="PackedScene" uid="uid://rx24bppccih7" path="res://behaviours/move_physics.tscn" id="3_83m1a"] +[ext_resource type="AudioStream" uid="uid://dq3xf4i2wpt50" path="res://entities/skull_drag.wav" id="5_duqrf"] +[ext_resource type="AudioStream" uid="uid://buxgivpkh8dyl" path="res://entities/fall.wav" id="6_b7mxf"] [sub_resource type="CircleShape2D" id="CircleShape2D_ypibs"] radius = 12.0 @@ -32,12 +34,20 @@ collision_layer = 32 shape = SubResource("CircleShape2D_1c7gd") debug_color = Color(1, 1, 1, 0) +[node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag/Draggable"] +stream = ExtResource("5_duqrf") + [node name="FallTimer" type="Timer" parent="MovementDrag"] wait_time = 0.5 one_shot = true +[node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag/FallTimer"] +stream = ExtResource("6_b7mxf") + [connection signal="dropped" from="MovementDrag" to="MovementDrag/FallTimer" method="start"] [connection signal="move" from="MovementDrag" to="." method="_on_move"] [connection signal="dragged" from="MovementDrag/Draggable" to="MovementDrag" method="drag"] +[connection signal="dragged" from="MovementDrag/Draggable" to="MovementDrag/Draggable/DragSound" method="play" unbinds=1] [connection signal="dropped" from="MovementDrag/Draggable" to="MovementDrag" method="drop"] [connection signal="timeout" from="MovementDrag/FallTimer" to="MovementDrag" method="fall"] +[connection signal="timeout" from="MovementDrag/FallTimer" to="MovementDrag/FallTimer/FallSound" method="play"] diff --git a/temp/bones.wav b/entities/skull_drag.wav similarity index 100% rename from temp/bones.wav rename to entities/skull_drag.wav diff --git a/temp/bones.wav.import b/entities/skull_drag.wav.import similarity index 55% rename from temp/bones.wav.import rename to entities/skull_drag.wav.import index 8ba7e5d..cdd80ac 100644 --- a/temp/bones.wav.import +++ b/entities/skull_drag.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dq3xf4i2wpt50" -path="res://.godot/imported/bones.wav-53a2d1735511ef1f1bf2921348b332aa.sample" +path="res://.godot/imported/skull_drag.wav-b4fa618d3799af68752c0db13a8d9e22.sample" [deps] -source_file="res://temp/bones.wav" -dest_files=["res://.godot/imported/bones.wav-53a2d1735511ef1f1bf2921348b332aa.sample"] +source_file="res://entities/skull_drag.wav" +dest_files=["res://.godot/imported/skull_drag.wav-b4fa618d3799af68752c0db13a8d9e22.sample"] [params]