diff --git a/NOTICE.md b/NOTICE.md index a71ac59..73872be 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -8,11 +8,11 @@ This project uses the following external assets: | `./temp/tollbell.mp3` | https://freesound.org/people/sdroliasnick/sounds/731270/ | CC0 | | `./entities/sheep_drag.wav` | https://freesound.org/people/michaelperfect/sounds/710298/ | CC0 | | `./temp/click&pop.wav` | https://freesound.org/people/GammaGool/sounds/730488/ | CC0 | -| `./temp/pop.wav` | https://freesound.org/people/NovaSoundTechnology/sounds/727104/ | CC0 | +| `./entities/monocle_drag.wav` | https://freesound.org/people/NovaSoundTechnology/sounds/727104/ | CC0 | | `./temp/mouth_pop.wav` | https://freesound.org/people/igaopuromalte/sounds/725453/ | Attribution 4 | | `./entities/fall.ogg` | 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 | +| `./entities/imp_eat.ogg` | https://freesound.org/people/MinecraftGamerLR/sounds/728695/ | Attribution 4 | | `./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| @@ -22,7 +22,7 @@ This project uses the following external assets: | `./temp/arcade_cancel.flac` | https://freesound.org/people/plasterbrain/sounds/464912/ | CC0 | | `./temp/cancel.wav` | https://freesound.org/people/Kagateni/sounds/571510/ | CC0 | | `./temp/monster_bite.wav` | https://freesound.org/people/OGsoundFX/sounds/423010/ | Attribution 4 | -| `./temp/tank.wav` | https://freesound.org/people/JarredGibb/sounds/217273/ | CC0 | +| `./entities/imp_drag.wav` | https://freesound.org/people/JarredGibb/sounds/217273/ | CC0 | | `./temp/demon_dying.wav` | https://freesound.org/people/THE_bizniss/sounds/37823/ | Attribution 3 | | `./entities/coin.ogg` | https://freesound.org/people/forrisday/sounds/214509/ | Attribution 4 | | `./behaviours/*.svg` | https://fontawesome.com/ | CC-BY 4.0 | diff --git a/entities/imp.tscn b/entities/imp.tscn index 299010d..e58fc3e 100644 --- a/entities/imp.tscn +++ b/entities/imp.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=3 uid="uid://4d3ksr3171x4"] +[gd_scene load_steps=24 format=3 uid="uid://4d3ksr3171x4"] [ext_resource type="Script" path="res://entities/imp.gd" id="1_dixpc"] [ext_resource type="PackedScene" uid="uid://bxbjfev0lhwws" path="res://behaviours/sprite_left_right.tscn" id="2_eqcdi"] @@ -16,8 +16,9 @@ [ext_resource type="PackedScene" uid="uid://rx24bppccih7" path="res://behaviours/move_physics.tscn" id="14_p3w0g"] [ext_resource type="PackedScene" uid="uid://jg7qkbswgqjc" path="res://behaviours/eater.tscn" id="14_w2h8x"] [ext_resource type="PackedScene" uid="uid://dijcjahkddudv" path="res://behaviours/draggable.tscn" id="15_otrbh"] -[ext_resource type="AudioStream" uid="uid://bmfscpnugaejk" path="res://entities/sheep_drag.wav" id="16_0nbhd"] +[ext_resource type="AudioStream" uid="uid://d0feiq5s6fnux" path="res://entities/imp_drag.wav" id="16_0frai"] [ext_resource type="AudioStream" uid="uid://cwsg776c11xfc" path="res://entities/fall.ogg" id="17_lib0h"] +[ext_resource type="AudioStream" uid="uid://c1yuksnjdd6g2" path="res://entities/imp_eat.ogg" id="19_7la6c"] [sub_resource type="CircleShape2D" id="CircleShape2D_ide4n"] radius = 32.0 @@ -104,7 +105,7 @@ shape = SubResource("CircleShape2D_50iad") debug_color = Color(1, 1, 1, 0) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] -stream = ExtResource("16_0nbhd") +stream = ExtResource("16_0frai") [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("17_lib0h") @@ -116,6 +117,9 @@ acceptable_diets = Array[StringName]([&"Meat"]) shape = SubResource("CircleShape2D_qhk1q") debug_color = Color(1, 0, 0, 0) +[node name="EatSound" type="AudioStreamPlayer2D" parent="Eater"] +stream = ExtResource("19_7la6c") + [connection signal="timeout" from="GoldSpawner/TimerStddev" to="GoldSpawner" method="spawn"] [connection signal="ready" from="MovementSampler" to="MovementSampler" method="enable"] [connection signal="changed_direction" from="MovementWander" to="MovementWander/WanderPriority" method="priority_conditional"] @@ -140,3 +144,4 @@ debug_color = Color(1, 0, 0, 0) [connection signal="dragged" from="MovementDrag/Draggable" to="MovementDrag" method="drag"] [connection signal="dropped" from="MovementDrag/Draggable" to="MovementDrag" method="drop"] [connection signal="eaten" from="Eater" to="." method="_on_eater_eaten"] +[connection signal="eaten" from="Eater" to="Eater/EatSound" method="play" unbinds=1] diff --git a/temp/tank.wav b/entities/imp_drag.wav similarity index 100% rename from temp/tank.wav rename to entities/imp_drag.wav diff --git a/temp/tank.wav.import b/entities/imp_drag.wav.import similarity index 56% rename from temp/tank.wav.import rename to entities/imp_drag.wav.import index 824282a..8b66524 100644 --- a/temp/tank.wav.import +++ b/entities/imp_drag.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://d0feiq5s6fnux" -path="res://.godot/imported/tank.wav-76da0daecf3b365c21fcd97289993799.sample" +path="res://.godot/imported/imp_drag.wav-e4ed42c6f5f4ccfe6d180bc00d8af7df.sample" [deps] -source_file="res://temp/tank.wav" -dest_files=["res://.godot/imported/tank.wav-76da0daecf3b365c21fcd97289993799.sample"] +source_file="res://entities/imp_drag.wav" +dest_files=["res://.godot/imported/imp_drag.wav-e4ed42c6f5f4ccfe6d180bc00d8af7df.sample"] [params] diff --git a/entities/imp_eat.ogg b/entities/imp_eat.ogg new file mode 100644 index 0000000..63f7d70 --- /dev/null +++ b/entities/imp_eat.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7804f60b616a01fa2dc07371af00f1b15f726bd0fcb5be456b39c39b81497ea3 +size 16127 diff --git a/entities/imp_eat.ogg.import b/entities/imp_eat.ogg.import new file mode 100644 index 0000000..362c0af --- /dev/null +++ b/entities/imp_eat.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c1yuksnjdd6g2" +path="res://.godot/imported/imp_eat.ogg-8244e5ac229d57fa0fbf148a2e9862db.oggvorbisstr" + +[deps] + +source_file="res://entities/imp_eat.ogg" +dest_files=["res://.godot/imported/imp_eat.ogg-8244e5ac229d57fa0fbf148a2e9862db.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/entities/monocle.tscn b/entities/monocle.tscn index d430b42..8eb8379 100644 --- a/entities/monocle.tscn +++ b/entities/monocle.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=8 format=3 uid="uid://b04xhv32ypi42"] +[gd_scene load_steps=9 format=3 uid="uid://b04xhv32ypi42"] [ext_resource type="Script" path="res://entities/monocle.gd" id="1_ehpfj"] [ext_resource type="Texture2D" uid="uid://d3tb6ypb36v8e" path="res://entities/monocle.png" id="1_omrit"] [ext_resource type="PackedScene" uid="uid://rx24bppccih7" path="res://behaviours/move_physics.tscn" id="2_jgnsw"] [ext_resource type="PackedScene" uid="uid://dijcjahkddudv" path="res://behaviours/draggable.tscn" id="3_e0ni5"] +[ext_resource type="AudioStream" uid="uid://dgd1ldpffk6ql" path="res://entities/monocle_drag.wav" id="5_bs8m7"] [ext_resource type="AudioStream" uid="uid://cwsg776c11xfc" path="res://entities/fall.ogg" id="5_grwug"] [sub_resource type="CircleShape2D" id="CircleShape2D_o7chm"] @@ -34,6 +35,7 @@ shape = SubResource("CircleShape2D_juisb") debug_color = Color(1, 1, 1, 0) [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"] +stream = ExtResource("5_bs8m7") [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"] stream = ExtResource("5_grwug") diff --git a/temp/pop.wav b/entities/monocle_drag.wav similarity index 100% rename from temp/pop.wav rename to entities/monocle_drag.wav diff --git a/temp/pop.wav.import b/entities/monocle_drag.wav.import similarity index 55% rename from temp/pop.wav.import rename to entities/monocle_drag.wav.import index 82ce6ca..6e59e39 100644 --- a/temp/pop.wav.import +++ b/entities/monocle_drag.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dgd1ldpffk6ql" -path="res://.godot/imported/pop.wav-5c8ab1a460889e6b7e24366eae5d4a3a.sample" +path="res://.godot/imported/monocle_drag.wav-d899e772e1792f41cd5a6ddac30bd2f6.sample" [deps] -source_file="res://temp/pop.wav" -dest_files=["res://.godot/imported/pop.wav-5c8ab1a460889e6b7e24366eae5d4a3a.sample"] +source_file="res://entities/monocle_drag.wav" +dest_files=["res://.godot/imported/monocle_drag.wav-d899e772e1792f41cd5a6ddac30bd2f6.sample"] [params] diff --git a/temp/gore.wav b/temp/gore.wav deleted file mode 100644 index 681e56b..0000000 --- a/temp/gore.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:263e85a80630a5123045cdfed923a51248471fdf07f558383e2dff5b709cbd82 -size 966522 diff --git a/temp/gore.wav.import b/temp/gore.wav.import deleted file mode 100644 index 59719b5..0000000 --- a/temp/gore.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://dlp0oo8tbp3w1" -path="res://.godot/imported/gore.wav-c74757bf12b5b41aaaf2eb9a0f1110a0.sample" - -[deps] - -source_file="res://temp/gore.wav" -dest_files=["res://.godot/imported/gore.wav-c74757bf12b5b41aaaf2eb9a0f1110a0.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